← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to debian/patches/wx3.patch

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-11-28 10:47:24 UTC
  • mfrom: (3.5.28 sid)
  • Revision ID: package-import@ubuntu.com-20131128104724-hfhg91k3c0e2hplc
Tags: 1:16.b.2-dfsg-2ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - d/patches/fix-pointer-conversion.patch: Remove implicit integer to
    pointer conversion.
  - d/control: Drop libwxgtk3.0-dev build dependency. Wx isn't in main,
    and not supposed to.
  - d/control: Drop erlang-wx binary and associated dependencies from
    other erlang-* packages.
  - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds.
  - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling
    Java source code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/wx3.patch
 
1
Author: Sergei Golovan
 
2
Description: Patch removes the second argument from wxItemContainer::Set call
 
3
 effectively replacing wxClientData_Void type by wxClientData_None. This fixes
 
4
 setting items list with wxWidgets 3.0.
 
5
Last-Modified: Thu, 21 Nov 2013 11:42:23 +0400
 
6
Forwarded: yes
 
7
 
 
8
--- erlang-16.b.2-dfsg.orig/lib/wx/c_src/gen/wxe_funcs.cpp
 
9
+++ erlang-16.b.2-dfsg/lib/wx/c_src/gen/wxe_funcs.cpp
 
10
@@ -15137,7 +15137,7 @@
 
11
  }
 
12
  bp += (8-((0+ itemsASz) & 7 )) & 7;
 
13
  if(!This) throw wxe_badarg(0);
 
14
- This->Set(items,(void **) NULL);
 
15
+ This->Set(items);
 
16
  break;
 
17
 }
 
18
 case wxListBox_HitTest: { // wxListBox::HitTest