Package: delaboratory
Version: 0.8-1
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 (a tiny patch to
the upstream Makefile to turn off wxWidgets' debug mode was all that was
required), 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 delaboratory-0.8/debian/changelog delaboratory-0.8/debian/changelog
--- delaboratory-0.8/debian/changelog	2013-12-25 23:08:39.000000000 +1300
+++ delaboratory-0.8/debian/changelog	2014-03-26 13:28:29.000000000 +1300
@@ -1,3 +1,11 @@
+delaboratory (0.8-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update to use wxWidgets 3.0.
+  * Fix typo in package description.
+
+ -- Olly Betts <o...@survex.com>  Wed, 26 Mar 2014 13:27:49 +1300
+
 delaboratory (0.8-1) unstable; urgency=low
 
   * Initial upload (closes: #733068).
diff -Nru delaboratory-0.8/debian/control delaboratory-0.8/debian/control
--- delaboratory-0.8/debian/control	2013-12-25 23:50:01.000000000 +1300
+++ delaboratory-0.8/debian/control	2014-03-26 13:28:07.000000000 +1300
@@ -2,7 +2,7 @@
 Section: graphics
 Priority: extra
 Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
-Build-Depends: debhelper (>= 9), libtiff-dev, libwxgtk2.8-dev, libxml2-dev
+Build-Depends: debhelper (>= 9), libtiff-dev, libwxgtk3.0-dev, libxml2-dev
 Standards-Version: 3.9.5
 Homepage: http://code.google.com/p/delaboratory/
 
@@ -31,4 +31,4 @@
   - histograms and color matrices
   - many blend modes (multiply, screen, overlay, inverted overlay, dodge,
     burn, add, grain extract, grain merge, sub, difference, darken, lighten),
-    color/luminocity blending for RGB and CMYK
+    color/luminosity blending for RGB and CMYK
diff -Nru delaboratory-0.8/debian/patches/series delaboratory-0.8/debian/patches/series
--- delaboratory-0.8/debian/patches/series	2013-12-25 23:47:23.000000000 +1300
+++ delaboratory-0.8/debian/patches/series	2014-03-26 13:37:33.000000000 +1300
@@ -1,2 +1,3 @@
 dont_force_CPU.patch
 install_destdir_support.patch
+wx3.0-compat.patch
diff -Nru delaboratory-0.8/debian/patches/wx3.0-compat.patch delaboratory-0.8/debian/patches/wx3.0-compat.patch
--- delaboratory-0.8/debian/patches/wx3.0-compat.patch	1970-01-01 12:00:00.000000000 +1200
+++ delaboratory-0.8/debian/patches/wx3.0-compat.patch	2014-03-26 13:40:04.000000000 +1300
@@ -0,0 +1,21 @@
+Description: Need to build with -DNDEBUG to avoid assertions
+ Upstream now defaults to enabling their "WXDEBUG" checks for incorrect API
+ usage.  These assertions can be disabled by defined NDEBUG when building the
+ application - e.g. by adding -DNDEBUG to CPPFLAGS, which means such assertions
+ will be handled as they would have been by a default build of 2.8 (such as
+ that in wxgtk2.8-0).  This change also means the wx-using code is compiled
+ with optimisation on.
+Author: Olly Betts <o...@survex.com>
+Last-Update: 2014-03-26
+
+--- delaboratory-0.8.orig/Makefile
++++ delaboratory-0.8/Makefile
+@@ -57,7 +57,7 @@ CXXFLAGS_WX+=-Wno-long-long -Wno-variadi
+ INCLUDES=-I gui_wx -I layers -I algorithms -I core -I properties
+ 
+ CXXFLAGS += ${INCLUDES}
+-CXXFLAGS_WX += ${INCLUDES}
++CXXFLAGS_WX += ${CXXFLAGS}
+ 
+ SOURCES_TMP = ${addsuffix .cc, ${FILES}}
+ SOURCES = ${addprefix gui_wx/, ${SOURCES_TMP}}

Attachment: signature.asc
Description: Digital signature

Reply via email to