Dear maintainer,
I've uploaded an NMU for chipw (versioned as 2.0.6-1.2). This includes
David's patch, and also some changes Luke had committed to the packaging
repo (but not uploaded in a package) before my previous NMU for the
wx2.8 transition.
Cheers,
Olly
diff -Nru chipw-2.0.6/debian/changelog chipw-2.0.6/debian/changelog
--- chipw-2.0.6/debian/changelog 2011-12-17 02:50:53.000000000 +1300
+++ chipw-2.0.6/debian/changelog 2014-06-07 00:56:57.000000000 +1200
@@ -1,3 +1,17 @@
+chipw (2.0.6-1.2) unstable; urgency=low
+
+ [ Luke Faraone ]
+ * Update maintainer address and unset DMUA.
+ * Update copyright information, upstream switched to GPLv3
+
+ [ Olly Betts ]
+ * Non-maintainer upload.
+ * Update to build with wxwidgets3.0 - thanks to Deivi San for the patch.
+ (Closes: #748634)
+ * "Standards-Version: 3.9.5" - no changes required.
+
+ -- Olly Betts <o...@survex.com> Sat, 07 Jun 2014 00:47:34 +1200
+
chipw (2.0.6-1.1) unstable; urgency=low
* Non-maintainer upload at maintainer's request.
diff -Nru chipw-2.0.6/debian/control chipw-2.0.6/debian/control
--- chipw-2.0.6/debian/control 2011-12-17 02:47:25.000000000 +1300
+++ chipw-2.0.6/debian/control 2014-06-07 00:48:37.000000000 +1200
@@ -1,10 +1,9 @@
Source: chipw
Section: games
Priority: optional
-Maintainer: Luke Faraone <l...@faraone.cc>
-Build-Depends: cdbs, debhelper (>= 7), libwxgtk2.8-dev
-DM-Upload-Allowed: yes
-Standards-Version: 3.9.0
+Maintainer: Luke Faraone <lfara...@debian.org>
+Build-Depends: cdbs, debhelper (>= 7), libwxgtk3.0-dev
+Standards-Version: 3.9.5
Homepage: http://www.microstupidity.com/chipw/
Vcs-Bzr: http://bzr.debian.org/collab-maint/chipw/
Vcs-Browser: http://bzr.debian.org/loggerhead/collab-maint/chipw/
diff -Nru chipw-2.0.6/debian/copyright chipw-2.0.6/debian/copyright
--- chipw-2.0.6/debian/copyright 2010-07-15 14:30:25.000000000 +1200
+++ chipw-2.0.6/debian/copyright 2014-06-07 00:49:08.000000000 +1200
@@ -3,11 +3,11 @@
Source: http://www.microstupidity.com/chipw/
Copyright: © 2008-2009 Christopher Elsby <glar...@glarbex.com>
-License: GPL-2
+License: GPL-3
This program is free software; you can redistribute it
and/or modify it under the terms of version 2 of the GNU General
Public License as published by the Free Software Foundation; either
- version 2 of the License, any later version.
+ version 3 of the License, any later version.
.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
@@ -15,14 +15,12 @@
PURPOSE. See the GNU General Public License for more
details.
.
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
Files: tilesets/*
Copyright: Placed into the public domain by Anders Kaseorg and
diff -Nru chipw-2.0.6/debian/patches/1000-wx3.0-compat.patch chipw-2.0.6/debian/patches/1000-wx3.0-compat.patch
--- chipw-2.0.6/debian/patches/1000-wx3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200
+++ chipw-2.0.6/debian/patches/1000-wx3.0-compat.patch 2014-06-07 00:54:31.000000000 +1200
@@ -0,0 +1,124 @@
+Description: Fixes to work with wxwidgets 3.0
+ Preserves compatibility with wxwidgets 2.8.
+Author: David <deiv...@yahoo.es>
+Last-Update: 2014-06-06
+
+diff -Nru --from-file orig/chipw-2.0.6/ orig/chipw-2.0.6/src/leveleditview.cpp chipw-2.0.6/src/leveleditview.cpp
+--- orig/chipw-2.0.6/src/leveleditview.cpp 2011-12-15 16:40:24.000000000 +0100
++++ chipw-2.0.6/src/leveleditview.cpp 2014-06-03 19:27:04.847603711 +0200
+@@ -210,10 +210,15 @@
+ void LevelEditView::OnChangeFilename() {
+ if(GetDocument() != NULL && GetFrame() != NULL) {
+ wxString name;
+- GetDocument()->GetPrintableName(name);
+ wxString title = wxT("Chip's Workshop");
+- if(name)
++#if wxCHECK_VERSION(2,8,5)
++ name=GetDocument()->GetUserReadableName();
++ title += wxT(" - ") + name;
++#else
++ GetDocument()->GetPrintableName(name);
++ if(!name.empty())
+ title += wxT(" - ") + name;
++#endif
+ if(level != NULL && !level->title.empty())
+ title += wxT(" (") + wxString(level->title.c_str(), wxConvISO8859_1) + wxT(")");
+ if(GetFrame()->IsKindOf(CLASSINFO(wxTopLevelWindow)))
+@@ -343,7 +348,7 @@
+ std::string title = level->title;
+ {
+ const wxWX2MBbuf str = dlg.title.mb_str(wxConvISO8859_1);
+- if(str != NULL)
++ if((const void *) str != NULL)
+ title = str;
+ else
+ wxLogError(wxT("Failed to set level title."));
+@@ -351,7 +356,7 @@
+ std::string psw = level->psw;
+ {
+ const wxWX2MBbuf str = dlg.psw.mb_str(wxConvISO8859_1);
+- if(str != NULL)
++ if((const void *) str != NULL)
+ psw = str;
+ else
+ wxLogError(wxT("Failed to set level password."));
+@@ -369,7 +374,7 @@
+ std::string hint = level->hint;
+ {
+ const wxWX2MBbuf str = dlg.hint.mb_str(wxConvISO8859_1);
+- if(str != NULL)
++ if ((const void *) str != NULL)
+ hint = str;
+ else
+ wxLogError(wxT("Failed to set level hint."));
+@@ -827,7 +832,11 @@
+ wxRegion region(x1, y1, selw * GetTileW(), selh * GetTileH());
+ region.Xor(x2, y2, w * GetTileW(), h * GetTileH());
+ wxDC* dc = NewClientDC();
++#if wxCHECK_VERSION(2,8,11)
++ dc->SetDeviceClippingRegion(region);
++#else
+ dc->SetClippingRegion(region);
++#endif
+ DrawSelection(dc, 0, 0, 32, 32);
+ delete dc;
+ }
+@@ -896,7 +905,11 @@
+
+ void LevelEditView::DrawSelection(wxDC* dc, wxUint32 x, wxUint32 y, wxUint32 w, wxUint32 h) {
+ if(x < 32 && y < 32 && w > 0 && h > 0) {
++#if wxCHECK_VERSION(2,9,0)
++ wxRasterOperationMode origfunc = dc->GetLogicalFunction();
++#else
+ int origfunc = dc->GetLogicalFunction();
++#endif
+ dc->SetLogicalFunction(wxINVERT);
+ dc->SetPen(*wxTRANSPARENT_PEN);
+ dc->SetBrush(*wxBLACK_BRUSH);
+@@ -963,7 +976,11 @@
+ continue;
+ }
+ if(tilelist != NULL && tilelist->IsSelected(tileselgrid[x + TILESEL_WIDTH * y])) {
+- int origfunc = dc->GetLogicalFunction();
++#if wxCHECK_VERSION(2,9,0)
++ wxRasterOperationMode origfunc = dc->GetLogicalFunction();
++#else
++ int origfunc = dc->GetLogicalFunction();
++#endif
+ dc->SetLogicalFunction(wxINVERT);
+ dc->SetPen(*wxTRANSPARENT_PEN);
+ dc->SetBrush(*wxBLACK_BRUSH);
+diff -Nru --from-file orig/chipw-2.0.6/ orig/chipw-2.0.6/src/listmenumgr.cpp chipw-2.0.6/src/listmenumgr.cpp
+--- orig/chipw-2.0.6/src/listmenumgr.cpp 2011-12-15 16:40:24.000000000 +0100
++++ chipw-2.0.6/src/listmenumgr.cpp 2014-06-03 18:15:16.851527122 +0200
+@@ -81,7 +81,12 @@
+ wxMenuItem* item = *itemit;
+ if(item == NULL)
+ continue;
+- item->SetText(GetItemLabel(i, newitems, emptytext));
++
++#if wxCHECK_VERSION(2,8,5)
++ item->SetItemLabel(GetItemLabel(i, newitems, emptytext));
++#else
++ item->SetText(GetItemLabel(i,newitems,emptytext));
++#endif
+ item->Enable((unsigned int) i < newitems.size());
+ }
+ // Add items if the length has increased.
+diff -Nru --from-file orig/chipw-2.0.6/ orig/chipw-2.0.6/src/tileset.cpp chipw-2.0.6/src/tileset.cpp
+--- orig/chipw-2.0.6/src/tileset.cpp 2011-12-15 16:40:24.000000000 +0100
++++ chipw-2.0.6/src/tileset.cpp 2014-06-03 00:46:18.469299483 +0200
+@@ -210,11 +210,11 @@
+ if(!CheckMaxSize(size, size))
+ return false;
+ // Avoiding alpha simplifies the code, and it doesn't seem to work well in wxWidgets anyway.
+- if(!img.ConvertAlphaToMask()) {
++ if(img.HasAlpha() && !img.ConvertAlphaToMask()) {
+ wxLogError(wxT("Failed to generate image mask."));
+ return false;
+ }
+- if(CheckOk(img2) && !img2.ConvertAlphaToMask()) {
++ if(CheckOk(img2) && img2.HasAlpha() && !img2.ConvertAlphaToMask()) {
+ wxLogError(wxT("Failed to generate secondary image mask."));
+ return false;
+ }
diff -Nru chipw-2.0.6/debian/patches/series chipw-2.0.6/debian/patches/series
--- chipw-2.0.6/debian/patches/series 1970-01-01 12:00:00.000000000 +1200
+++ chipw-2.0.6/debian/patches/series 2014-05-19 16:52:17.000000000 +1200
@@ -0,0 +1 @@
+1000-wx3.0-compat.patch
