← Back to branch summary

~ubuntu-branches/debian/sid/boinc/sid

« back to all changes in this revision

Viewing changes to debian/patches/102_wxPanel_instead_wxControl_r17501.patch

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2009-07-07 12:42:18 UTC
  • mfrom: (1.1.13 upstream) (6.2.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090707124218-ulehx8tqnjbq8txj
Tags: 6.4.5+dfsg-2ubuntu1
https://launchpad.net/bugs/396665
* Merge from debian unstable (LP: #396665), remaining changes:
  - Bump build-depend on debhelper to install udev rules into
    /lib/udev/rules.d, add Breaks on udev to get correct version.
  - Provide meta package "boinc", which depends on boinc-client and
    boinc-manager.
* debian/patches:
  - 102_wxPanel_instead_wxControl_r17501.patch. Dropped. Included Upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/102_wxPanel_instead_wxControl_r17501.patch
1
 
Author: Daniel Hahler
2
 
Description: Use wxPanel instead of wxControl to fix build failure.
3
 
Change ported from upstream changeset 17501
4
 
(http://boinc.berkeley.edu/trac/changeset/17501) 
5
 
Index: boinc-6.4.5/clientgui/common/wxFlatNotebook.cpp
6
 
===================================================================
7
 
--- boinc-6.4.5.orig/clientgui/common/wxFlatNotebook.cpp        2009-05-23 19:58:14.000000000 +0200
8
 
+++ boinc-6.4.5/clientgui/common/wxFlatNotebook.cpp     2009-05-23 19:58:31.000000000 +0200
9
 
@@ -607,7 +607,7 @@
10
 
 //
11
 
 ///////////////////////////////////////////////////////////////////////////////////////////
12
 
 
13
 
-BEGIN_EVENT_TABLE(wxPageContainerBase, wxControl)
14
 
+BEGIN_EVENT_TABLE(wxPageContainerBase, wxPanel)
15
 
 EVT_PAINT(wxPageContainerBase::OnPaint)
16
 
 EVT_SIZE(wxPageContainerBase::OnSize)
17
 
 EVT_LEFT_DOWN(wxPageContainerBase::OnLeftDown)