r15115 - in packages/trunk/jugglemaster/debian: . patches

[Helmut Grohne]

Author: helmut-guest
Date: 2014-05-27 20:01:27 +0000 (Tue, 27 May 2014)
New Revision: 15115

Added:
   packages/trunk/jugglemaster/debian/patches/include-header-for-memset.patch
   packages/trunk/jugglemaster/debian/patches/wx3.0-compat.patch
Modified:
   packages/trunk/jugglemaster/debian/changelog
   packages/trunk/jugglemaster/debian/control
   packages/trunk/jugglemaster/debian/patches/series
Log:
apply patch for wxWidgets 3.0 by Olly Betts

Modified: packages/trunk/jugglemaster/debian/changelog
===================================================================
--- packages/trunk/jugglemaster/debian/changelog	2014-05-27 20:01:24 UTC (rev 15114)
+++ packages/trunk/jugglemaster/debian/changelog	2014-05-27 20:01:27 UTC (rev 15115)
@@ -12,6 +12,12 @@
   [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
+  [ Olly Betts ]
+  * Update to use wxWidgets 3.0 (new patch wx3.0-compat.patch). (Closes:
+    #749495).
+  * Fix warning due to not including <string.h> (new patch
+    include-header-for-memset.patch).
+
  -- Helmut Grohne <helmut at subdivi.de>  Sat, 06 Jul 2013 16:23:00 +0200
 
 jugglemaster (0.4-6.3) unstable; urgency=medium

Modified: packages/trunk/jugglemaster/debian/control
===================================================================
--- packages/trunk/jugglemaster/debian/control	2014-05-27 20:01:24 UTC (rev 15114)
+++ packages/trunk/jugglemaster/debian/control	2014-05-27 20:01:27 UTC (rev 15115)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7.0.50~),
  libaa1-dev,
  libavcodec-dev,
- libwxgtk2.8-dev
+ libwxgtk3.0-dev
 Standards-Version: 3.9.4
 Homepage: http://icculus.org/jugglemaster/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/jugglemaster/

Added: packages/trunk/jugglemaster/debian/patches/include-header-for-memset.patch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/include-header-for-memset.patch	                        (rev 0)
+++ packages/trunk/jugglemaster/debian/patches/include-header-for-memset.patch	2014-05-27 20:01:27 UTC (rev 15115)
@@ -0,0 +1,15 @@
+Description: Include <string.h> for memset()
+ Fixes a compiler warning.
+Author: Olly Betts <olly at survex.com>
+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 ).

Modified: packages/trunk/jugglemaster/debian/patches/series
===================================================================
--- packages/trunk/jugglemaster/debian/patches/series	2014-05-27 20:01:24 UTC (rev 15114)
+++ packages/trunk/jugglemaster/debian/patches/series	2014-05-27 20:01:27 UTC (rev 15115)
@@ -12,3 +12,5 @@
 libav9.patch
 loadavg.patch
 libav10.patch
+include-header-for-memset.patch
+wx3.0-compat.patch

Added: packages/trunk/jugglemaster/debian/patches/wx3.0-compat.patch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/wx3.0-compat.patch	                        (rev 0)
+++ packages/trunk/jugglemaster/debian/patches/wx3.0-compat.patch	2014-05-27 20:01:27 UTC (rev 15115)
@@ -0,0 +1,47 @@
+Description: Fix to build with wxwidgets3.0
+Author: Olly Betts <olly at survex.com>
+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();