[SCM] BOINC packaging branch, master, updated. upstream/7.0.58+dfsg-681-ga9723af
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Wed Mar 27 16:08:20 UTC 2013
The following commit has been merged in the master branch:
commit a9723af88af701e496522730254e267c58be9317
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Wed Mar 27 17:07:54 2013 +0100
Upstream accepted and reviewed my patch in commit d85be7944d8ff07ad38d1ec4348aa2e3268ddb28
diff --git a/debian/patches/Fix-arch-detection.patch b/debian/patches/Fix-arch-detection.patch
index 0dd93b0..01d20a9 100644
--- a/debian/patches/Fix-arch-detection.patch
+++ b/debian/patches/Fix-arch-detection.patch
@@ -1,12 +1,13 @@
---- boinc-7.0.58+dfsg.orig/clientgui/DlgAbout.cpp
-+++ boinc-7.0.58+dfsg/clientgui/DlgAbout.cpp
-@@ -80,10 +80,14 @@ bool CDlgAbout::Create(wxWindow* parent,
+--- a/clientgui/DlgAbout.cpp
++++ b/clientgui/DlgAbout.cpp
+@@ -78,12 +78,14 @@
+ m_AboutBOINCLogoCtrl = NULL;
+ m_AboutBOINCSloganCtrl = NULL;
m_AboutBOINCURLCtrl = NULL;
- #if defined(_WIN64) && defined(_M_X64)
+-#if defined(_WIN64) && defined(_M_X64)
++#if defined(__x86_64__) || defined(__x86_64) || defined(_M_AMD64)
m_strVersion.Printf(wxT("%s (x64)"), wxT(BOINC_VERSION_STRING));
-+#elif defined(__x86_64__) || defined(_M_X64)
-+ m_strVersion.Printf(wxT("%s (x64)"), wxT(BOINC_VERSION_STRING));
-+#elif defined(__i386) || defined(_M_IX86)
++#elif defined(__i386__) || defined(__i386) || defined(_M_IX86)
+ m_strVersion.Printf(wxT("%s (x86)"), wxT(BOINC_VERSION_STRING));
#elif defined(__ppc__)
m_strVersion.Printf(wxT("%s (PowerPC)"), wxT(BOINC_VERSION_STRING));
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list