Package: wxhexeditor
Version: 0.22+repack-2
Severity: normal
Tags: patch
User: freewx-ma...@lists.alioth.debian.org
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 did some simple
testing.  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 wxhexeditor-0.22+repack/debian/changelog wxhexeditor-0.22+repack/debian/changelog
--- wxhexeditor-0.22+repack/debian/changelog	2013-12-30 01:43:21.000000000 +1300
+++ wxhexeditor-0.22+repack/debian/changelog	2014-04-10 13:40:20.000000000 +1200
@@ -1,3 +1,10 @@
+wxhexeditor (0.22+repack-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update to use wxWidgets 3.0.
+
+ -- Olly Betts <o...@survex.com>  Thu, 10 Apr 2014 13:40:16 +1200
+
 wxhexeditor (0.22+repack-2) unstable; urgency=low
 
   * Apply patch from upstream bug tracker fixing hex input.
diff -Nru wxhexeditor-0.22+repack/debian/control wxhexeditor-0.22+repack/debian/control
--- wxhexeditor-0.22+repack/debian/control	2013-05-12 05:44:43.000000000 +1200
+++ wxhexeditor-0.22+repack/debian/control	2014-03-18 15:05:21.000000000 +1300
@@ -2,8 +2,8 @@
 Section: editors
 Priority: optional
 Maintainer: Andrew Shadura <andre...@debian.org>
-Build-Depends: debhelper (>= 9), wx2.8-headers,
- libwxbase2.8-dev, libwxgtk2.8-dev, wx-common,
+Build-Depends: debhelper (>= 9),
+ libwxgtk3.0-dev,
  libmhash-dev, libdisasm-dev
 Standards-Version: 3.9.4
 Homepage: http://sourceforge.net/projects/wxhexeditor
diff -Nru wxhexeditor-0.22+repack/debian/patches/07-use-proper-opts.patch wxhexeditor-0.22+repack/debian/patches/07-use-proper-opts.patch
--- wxhexeditor-0.22+repack/debian/patches/07-use-proper-opts.patch	2013-12-30 01:41:29.000000000 +1300
+++ wxhexeditor-0.22+repack/debian/patches/07-use-proper-opts.patch	2014-04-10 13:44:39.000000000 +1200
@@ -4,7 +4,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -1,10 +1,6 @@
+@@ -1,10 +1,10 @@
  WXCONFIG = wx-config
 -CC = `$(WXCONFIG) --cc`
 -CXX = `$(WXCONFIG) --cxx`
@@ -12,12 +12,16 @@
 -CXXFLAGS = -O2
 -WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -O2 -c ${OPTFLAGS}
 -WXLDFLAGS = `$(WXCONFIG) --libs`
-+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD
-+WXLDFLAGS = -Wl,--as-needed `$(WXCONFIG) --libs`
++# Define NDEBUG to disable wxWidgets 3.0 debug mode to avoid a lot of assertion
++# failed dialogs.  While it would be better to actually fix the causes of
++# these, if NDEBUG is defined, then these conditions are handled quietly, just
++# like wxWidgets 2.8 did by default.
++WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -DNDEBUG
++WXLDFLAGS = -Wl,--as-needed `$(WXCONFIG) --libs std,aui`
  RC = `$(WXCONFIG) --rescomp`
  #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
  RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;`
-@@ -51,7 +47,7 @@
+@@ -51,7 +51,7 @@
  	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) $(WXLDFLAGS) -o $@
  
  .cpp.o: $(LIBS)

Attachment: signature.asc
Description: Digital signature

Reply via email to