tags 750087 + patch
thanks
I wrote:
> I attempted to build your package with Build-Depends updated to use
> libwxgtk3.0-dev, but the build fails.
Shortly after filing the bug, I realised what cause the error was,
and that was the only error building with wx3.0. Debdiff attached
- the new patch should also work with wx2.8, as it just uses the loop to
copy argv[argc] too, so it doesn't matter what type the elements of
argv are (they're wxString in wx3.0).
I haven't actually tried running the patched package, as it's not
one I'm at all familiar with and it's past my bedtime already.
Cheers,
Olly
diff -Nru plee-the-bear-0.6.0/debian/changelog plee-the-bear-0.6.0/debian/changelog
--- plee-the-bear-0.6.0/debian/changelog 2014-01-25 09:58:55.000000000 +1300
+++ plee-the-bear-0.6.0/debian/changelog 2014-06-02 00:16:39.000000000 +1200
@@ -1,3 +1,11 @@
+plee-the-bear (0.6.0-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update to use wxWidgets 3.0 (new patch wx3.0-compat.patch)
+ (Closes: #750087)
+
+ -- Olly Betts <o...@survex.com> Mon, 02 Jun 2014 00:16:32 +1200
+
plee-the-bear (0.6.0-3) unstable; urgency=medium
* Build on all archs; do not restrict Architecture in d/control.
diff -Nru plee-the-bear-0.6.0/debian/control plee-the-bear-0.6.0/debian/control
--- plee-the-bear-0.6.0/debian/control 2014-01-25 09:59:47.000000000 +1300
+++ plee-the-bear-0.6.0/debian/control 2014-03-14 16:44:06.000000000 +1300
@@ -14,8 +14,7 @@
libclaw-graphic-dev (>= 1.7.0), libclaw-logger-dev (>= 1.7.0),
libclaw-application-dev (>= 1.7.0), libclaw-dynamic-library-dev (>= 1.7.0),
libclaw-configuration-file-dev (>= 1.7.0), libclaw-net-dev (>= 1.7.0),
- libclaw-tween-dev (>= 1.7.0), libwxgtk2.8-dev (>= 2.8), gettext (>= 0.17)
-Build-Conflicts: wx2.6-headers
+ libclaw-tween-dev (>= 1.7.0), libwxgtk3.0-dev, gettext (>= 0.17)
Standards-Version: 3.9.5
Homepage: http://plee-the-bear.sourceforge.net/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/plee-the-bear/
diff -Nru plee-the-bear-0.6.0/debian/patches/series plee-the-bear-0.6.0/debian/patches/series
--- plee-the-bear-0.6.0/debian/patches/series 2014-01-24 10:49:31.000000000 +1300
+++ plee-the-bear-0.6.0/debian/patches/series 2014-06-01 23:58:15.000000000 +1200
@@ -3,3 +3,4 @@
ptb-filesystem-v3.diff
ptb-signals-v2.diff
full-path-menu-icon.diff
+wx3.0-compat.patch
diff -Nru plee-the-bear-0.6.0/debian/patches/wx3.0-compat.patch plee-the-bear-0.6.0/debian/patches/wx3.0-compat.patch
--- plee-the-bear-0.6.0/debian/patches/wx3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200
+++ plee-the-bear-0.6.0/debian/patches/wx3.0-compat.patch 2014-06-02 00:24:03.000000000 +1200
@@ -0,0 +1,19 @@
+Description: Fix to build with wxwidgets3.0
+Author: Olly Betts <o...@survex.com>
+Last-Update: 2014-06-01
+
+--- plee-the-bear-0.6.0.orig/bear-factory/bear-editor/src/bf/code/base_editor_application.cpp
++++ plee-the-bear-0.6.0/bear-factory/bear-editor/src/bf/code/base_editor_application.cpp
+@@ -271,11 +271,10 @@ bool bf::base_editor_application::find_a
+
+ if ( index != 0 )
+ {
+- for ( int i=index; (i+1 != argc); ++i )
++ for ( int i=index; (i != argc); ++i )
+ argv[i] = argv[i+1];
+
+ --argc;
+- argv[argc] = NULL;
+ }
+
+ return index != 0;
