[SCM] BOINC packaging branch, master, updated. upstream/7.0.27+dfsg-431-g52ad10f

Steffen Moeller moeller at debian.org
Sun May 6 22:14:18 UTC 2012


The following commit has been merged in the master branch:
commit d5ccc5d57ad104da99bfabee9a6197e1f246a107
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon May 7 00:13:11 2012 +0200

    Attempt to address the menu line problem

diff --git a/debian/patches/series b/debian/patches/series
index 7d30d89..4f4352c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 # patches to get Debian going
+wxWidgets_observations.patch
 texfont_removal.patch
 libnotify-0.7.patch
 # undisputed patches above
diff --git a/debian/patches/wxWidgets_observations.patch b/debian/patches/wxWidgets_observations.patch
new file mode 100644
index 0000000..652c48b
--- /dev/null
+++ b/debian/patches/wxWidgets_observations.patch
@@ -0,0 +1,26 @@
+Index: boinc/clientgui/BOINCGUIApp.cpp
+===================================================================
+--- boinc.orig/clientgui/BOINCGUIApp.cpp	2012-04-29 16:07:21.000000000 +0200
++++ boinc/clientgui/BOINCGUIApp.cpp	2012-04-29 16:14:32.000000000 +0200
+@@ -108,7 +108,7 @@
+ #endif
+ 
+ 
+-bool CBOINCGUIApp::OnInit() {
++virtual bool CBOINCGUIApp::OnInit() {
+     // Initialize globals
+ #ifdef SANDBOX
+     g_use_sandbox = true;
+Index: boinc/clientgui/BOINCGUIApp.h
+===================================================================
+--- boinc.orig/clientgui/BOINCGUIApp.h	2012-04-29 16:07:21.000000000 +0200
++++ boinc/clientgui/BOINCGUIApp.h	2012-04-29 16:11:23.000000000 +0200
+@@ -117,7 +117,7 @@
+ 
+ public:
+ 
+-    bool                OnInit();
++    virtual bool        OnInit();
+ 
+     wxLocale*           GetLocale()                 { return m_pLocale; }
+     CSkinManager*       GetSkinManager()            { return m_pSkinManager; }

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list