Package: crystalspace
Version: 2.0+dfsg-1
Tags: patch sid jessie
User: freewx-ma...@lists.alioth.debian.org
Usertags: wx3.0
Control: block 748169 by -1
We're aiming to migrate the archive to using wxwidgets3.0 instead of
wxwidgets2.8, and intend to drop wxwidgets2.8 before jessie is released.
I've successfully built crystalspace with the attached patch. I haven't
tested the patched package as there seem to be a large number of
programs installed, and I couldn't see an easy way to work out which
ones actually use wxwidgets (none of the binaries depend directly, it's
all through the crystalspace library).
Incidentally, I think this patch would also be compatible with wx2.8,
though I've not tested that.
I'm happy to NMU this change if you wish me to - just let me know.
Cheers,
Olly
diff -Nru crystalspace-2.0+dfsg/debian/changelog crystalspace-2.0+dfsg/debian/changelog
--- crystalspace-2.0+dfsg/debian/changelog 2013-05-27 19:59:29.000000000 +1200
+++ crystalspace-2.0+dfsg/debian/changelog 2014-06-14 21:03:58.000000000 +1200
@@ -1,3 +1,10 @@
+crystalspace (2.0+dfsg-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update to use wxWidgets 3.0 (new patch: wx3.0-compat.patch).
+
+ -- Olly Betts <o...@survex.com> Sat, 14 Jun 2014 21:03:37 +1200
+
crystalspace (2.0+dfsg-1) unstable; urgency=low
* Team upload.
diff -Nru crystalspace-2.0+dfsg/debian/control crystalspace-2.0+dfsg/debian/control
--- crystalspace-2.0+dfsg/debian/control 2013-05-25 23:50:58.000000000 +1200
+++ crystalspace-2.0+dfsg/debian/control 2014-03-21 11:45:57.000000000 +1300
@@ -7,7 +7,7 @@
Build-Depends: debhelper (>= 7.2.6), dpkg-dev (>= 1.16.1~), lib3ds-dev, autoconf,
libogg-dev, libjpeg-dev, libfreetype6-dev, zlib1g-dev, libode-dev
| libode0-dev, libopenal-dev, libcal3d-dev, swig, flex, bison, doxygen,
- libmng-dev, libsdl1.2-dev, libx11-dev, libcaca-dev, libwxgtk2.8-dev,
+ libmng-dev, libsdl1.2-dev, libx11-dev, libcaca-dev, libwxgtk3.0-dev,
libcegui-mk2-dev, python-dev, libcppunit-dev,
libasound-dev [ linux-any ], liblcms-dev, libcairo-dev, libcairomm-1.0-dev,
libgtk2.0-dev, jam, libgl1-mesa-dev | libgl-dev, libvorbis-dev,
diff -Nru crystalspace-2.0+dfsg/debian/patches/series crystalspace-2.0+dfsg/debian/patches/series
--- crystalspace-2.0+dfsg/debian/patches/series 2013-05-25 23:50:58.000000000 +1200
+++ crystalspace-2.0+dfsg/debian/patches/series 2014-06-14 21:05:00.000000000 +1200
@@ -3,3 +3,4 @@
sparc_defined_prev_in_CompareAndSet.diff
default_walktest_parallaxtest.diff
csstartme_startme_cfg_programs.diff
+wx3.0-compat.patch
diff -Nru crystalspace-2.0+dfsg/debian/patches/wx3.0-compat.patch crystalspace-2.0+dfsg/debian/patches/wx3.0-compat.patch
--- crystalspace-2.0+dfsg/debian/patches/wx3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200
+++ crystalspace-2.0+dfsg/debian/patches/wx3.0-compat.patch 2014-06-14 21:05:21.000000000 +1200
@@ -0,0 +1,48 @@
+Description: Fix to build with wxwidgets3.0
+Author: Olly Betts <o...@survex.com>
+Last-Update: 2014-06-14
+
+--- crystalspace-2.0+dfsg.orig/plugins/video/canvas/wxgl/GLWXDriver2D.cpp
++++ crystalspace-2.0+dfsg/plugins/video/canvas/wxgl/GLWXDriver2D.cpp
+@@ -292,7 +292,7 @@ bool csGraphics2DWX::Open()
+ {
+ Display* dpy = (Display*) wxGetDisplay ();
+ GLXContext active_GLContext = glXGetCurrentContext();
+- XVisualInfo *xvis = (XVisualInfo*)theCanvas->m_vi;
++ XVisualInfo *xvis = theCanvas->GetXVisualInfo();
+
+ Report (CS_REPORTER_SEVERITY_NOTIFY, "Video driver GL/X version %s",
+ glXIsDirect (dpy, active_GLContext) ? "(direct renderer)" :
+@@ -705,8 +705,8 @@ static bool wxCodeToCSCode(int wxkey, ut
+ MAP (MENU, CONTEXT, CONTEXT)
+ MAP (PAUSE, PAUSE, PAUSE)
+ MAP (CAPITAL, CAPSLOCK, CAPSLOCK)
+- MAP (PRIOR, PGUP, PGUP)
+- MAP (NEXT, PGDN, PGDN)
++ MAP (PAGEUP, PGUP, PGUP)
++ MAP (PAGEDOWN, PGDN, PGDN)
+ MAP (END, END, END)
+ MAP (HOME, HOME, HOME)
+ MAP (LEFT, LEFT, LEFT)
+@@ -722,10 +722,7 @@ static bool wxCodeToCSCode(int wxkey, ut
+ MAPC (NUMPAD2, PAD2, '2')
+ MAP (NUMPAD_DOWN, PAD2, DOWN)
+ MAPC (NUMPAD3, PAD3, '3')
+- MAP (NUMPAD_NEXT, PAD3, PGDN)
+-#if wxVERSION_NUMBER < 2700
+ MAP (NUMPAD_PAGEDOWN, PAD3, PGDN)
+-#endif
+ MAPC (NUMPAD4, PAD4, '4')
+ MAP (NUMPAD_LEFT, PAD4, LEFT)
+ MAPC (NUMPAD5, PAD5, '5')
+@@ -736,10 +733,7 @@ static bool wxCodeToCSCode(int wxkey, ut
+ MAPC (NUMPAD8, PAD8, '8')
+ MAP (NUMPAD_UP, PAD8, UP)
+ MAPC (NUMPAD9, PAD9, '9')
+- MAP (NUMPAD_PRIOR, PAD9, PGUP)
+-#if wxVERSION_NUMBER < 2700
+ MAP (NUMPAD_PAGEUP, PAD9, PGUP)
+-#endif
+ MAPC (MULTIPLY, PADMULT, '*')
+ MAPC (NUMPAD_MULTIPLY,PADMULT, '*')
+ MAPC (ADD, PADPLUS, '+')
