Package: jugglemaster
Version: 0.4-6.3
Severity: normal
Tags: patch
User: [email protected]
Usertags: wx3.0
Dear maintainer,
We're aiming to migrate the archive to using wxwidgets3.0 instead of
wxwidgets2.8.
I've rebuilt your package using the attached patch, and done some
testing, and everything looks good to me.
I'm happy to NMU this change if you wish me to - just let me know.
Cheers,
Olly
diff -Nru jugglemaster-0.4/debian/changelog jugglemaster-0.4/debian/changelog
--- jugglemaster-0.4/debian/changelog 2014-03-15 22:05:17.000000000 +1300
+++ jugglemaster-0.4/debian/changelog 2014-05-27 23:24:27.000000000 +1200
@@ -1,3 +1,12 @@
+jugglemaster (0.4-6.4) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update to use wxWidgets 3.0 (new patch wx3.0-compat.patch).
+ * Fix warning due to not including <string.h> (new patch
+ include-header-for-memset.patch).
+
+ -- Olly Betts <[email protected]> Tue, 27 May 2014 23:01:08 +1200
+
jugglemaster (0.4-6.3) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru jugglemaster-0.4/debian/control jugglemaster-0.4/debian/control
--- jugglemaster-0.4/debian/control 2011-11-11 16:18:51.000000000 +1300
+++ jugglemaster-0.4/debian/control 2014-05-27 23:01:20.000000000 +1200
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 7.0.50~),
libaa1-dev,
libavcodec-dev,
- libwxgtk2.8-dev
+ libwxgtk3.0-dev
Standards-Version: 3.9.2
Homepage: http://icculus.org/jugglemaster/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/jugglemaster/
diff -Nru jugglemaster-0.4/debian/patches/include-header-for-memset.patch jugglemaster-0.4/debian/patches/include-header-for-memset.patch
--- jugglemaster-0.4/debian/patches/include-header-for-memset.patch 1970-01-01 12:00:00.000000000 +1200
+++ jugglemaster-0.4/debian/patches/include-header-for-memset.patch 2014-05-27 23:23:18.000000000 +1200
@@ -0,0 +1,15 @@
+Description: Include <string.h> for memset()
+ Fixes a compiler warning.
+Author: Olly Betts <[email protected]>
+Last-Update: 2014-05-27
+
+--- jugglemaster-0.4.orig/src/aajm/aa_drawline.c
++++ jugglemaster-0.4/src/aajm/aa_drawline.c
+@@ -15,6 +15,7 @@
+
+ #include "./aa_drawline.h"
+
++#include <string.h>
+
+ /*
+ * Draws a line in octant 0 or 3 ( |xlen| >= ylen ).
diff -Nru jugglemaster-0.4/debian/patches/series jugglemaster-0.4/debian/patches/series
--- jugglemaster-0.4/debian/patches/series 2014-03-15 22:02:50.000000000 +1300
+++ jugglemaster-0.4/debian/patches/series 2014-05-27 23:22:13.000000000 +1200
@@ -12,3 +12,5 @@
libav9.patch
loadavg.patch
libav10.patch
+include-header-for-memset.patch
+wx3.0-compat.patch
diff -Nru jugglemaster-0.4/debian/patches/wx3.0-compat.patch jugglemaster-0.4/debian/patches/wx3.0-compat.patch
--- jugglemaster-0.4/debian/patches/wx3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200
+++ jugglemaster-0.4/debian/patches/wx3.0-compat.patch 2014-05-28 00:04:43.000000000 +1200
@@ -0,0 +1,47 @@
+Description: Fix to build with wxwidgets3.0
+Author: Olly Betts <[email protected]>
+Last-Update: 2014-05-27
+
+--- a/src/jmdlx/jmdlx.h
++++ b/src/jmdlx/jmdlx.h
+@@ -92,11 +92,11 @@
+
+ static const wxCmdLineEntryDesc cmdLineDesc[] =
+ {
+- { wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("help") },
+- { wxCMD_LINE_OPTION, wxT("p"), wxT("pattern"), wxT("named pattern"), wxCMD_LINE_VAL_STRING},
+- { wxCMD_LINE_OPTION, wxT("s"), wxT("style"), wxT("style"), wxCMD_LINE_VAL_STRING },
+- { wxCMD_LINE_OPTION, wxT("m"), wxT("semaphore"), wxT("semaphore"), wxCMD_LINE_VAL_STRING },
+- { wxCMD_LINE_PARAM, NULL, NULL, wxT("siteswap"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL},
++ { wxCMD_LINE_SWITCH, "h", "help", "help" },
++ { wxCMD_LINE_OPTION, "p", "pattern", "named pattern", wxCMD_LINE_VAL_STRING},
++ { wxCMD_LINE_OPTION, "s", "style", "style", wxCMD_LINE_VAL_STRING },
++ { wxCMD_LINE_OPTION, "m", "semaphore", "semaphore", wxCMD_LINE_VAL_STRING },
++ { wxCMD_LINE_PARAM, NULL, NULL, "siteswap", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL},
+ { wxCMD_LINE_NONE }
+ };
+
+--- a/src/jmdlx/print.cpp
++++ b/src/jmdlx/print.cpp
+@@ -235,7 +235,7 @@
+ wxFileDialog filedialog(this, _("Choose a File to Print to"),
+ lastpath, wxT(""),
+ wxT("All Files|*"),
+- wxSAVE);
++ wxFD_SAVE);
+
+ if(filedialog.ShowModal() != wxID_OK) return;
+
+--- a/src/jmdlx/jmdlx.cpp
++++ b/src/jmdlx/jmdlx.cpp
+@@ -114,7 +114,9 @@
+ JMFrame::JMFrame(wxWindow* parent, wxWindowID id, const wxString& title,
+ const wxPoint& pos, const wxSize& size) :
+ wxFrame(parent,id,title,pos,size) {
+- SetIcon(wxIcon(wxT("IDI_WIZICON")));
++ // This icon doesn't seem to be defined anywhere, and setting it results in a
++ // wx log message.
++ // SetIcon(wxIcon(wxT("IDI_WIZICON")));
+
+ fileMenu = new wxMenu();
+ optionsMenu = new wxMenu();
