Package: kicad
Version: 0.20140224+bzr4027-3
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 built and done some limited testing (I've no idea how to use kicad,
but I clicked or opened everything I could see) with the attached patch
to update it to build against wxwidgets3.0, and it all looks good.

I'm actually a little surprised to discover kicad is still using
wxwidgets 2.8, as https://bugs.debian.org/712303 claimed that a newer
kicad needed a newer wx to have working printing, but a newer kicad got
packaged still using 2.8.  That may mean that updating to wx 3.0 will
fix problems with kicad's printing.

I'm happy to NMU this change if you wish me to - just let me know.

Cheers,
    Olly
diff -Nru kicad-0.20140224+bzr4027/debian/changelog kicad-0.20140224+bzr4027/debian/changelog
--- kicad-0.20140224+bzr4027/debian/changelog	2014-03-07 23:49:51.000000000 +1300
+++ kicad-0.20140224+bzr4027/debian/changelog	2014-03-12 21:00:43.000000000 +1300
@@ -1,3 +1,10 @@
+kicad (0.20140224+bzr4027-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update to use wxWidgets 3.0.
+
+ -- Olly Betts <o...@survex.com>  Wed, 12 Mar 2014 21:00:22 +1300
+
 kicad (0.20140224+bzr4027-3) unstable; urgency=medium
 
   * taken in account Samuel Thibault's hint. Closes: #740999
diff -Nru kicad-0.20140224+bzr4027/debian/control kicad-0.20140224+bzr4027/debian/control
--- kicad-0.20140224+bzr4027/debian/control	2014-03-07 01:25:52.000000000 +1300
+++ kicad-0.20140224+bzr4027/debian/control	2014-03-12 21:00:17.000000000 +1300
@@ -6,7 +6,7 @@
  Daniel J. Priem <danielpr...@flexserv.de>
 Build-Depends: debhelper (>= 9), quilt, libx11-dev,
  libglu1-mesa-dev, libgl1-mesa-dev, mesa-common-dev,
- libwxbase2.8-dev, libwxgtk2.8-dev, libboost-dev,
+ libwxgtk3.0-dev, libboost-dev,
  cmake (>= 2.6.0), imagemagick
 Standards-Version: 3.9.5
 Homepage: http://www.kicad-pcb.org
diff -Nru kicad-0.20140224+bzr4027/debian/patches/series kicad-0.20140224+bzr4027/debian/patches/series
--- kicad-0.20140224+bzr4027/debian/patches/series	2013-08-07 21:25:00.000000000 +1200
+++ kicad-0.20140224+bzr4027/debian/patches/series	2014-03-12 21:47:10.000000000 +1300
@@ -2,3 +2,4 @@
 getting_started.patch
 fix_common.h
 fix-bashism.patch
+wx3.0-compat.patch
diff -Nru kicad-0.20140224+bzr4027/debian/patches/wx3.0-compat.patch kicad-0.20140224+bzr4027/debian/patches/wx3.0-compat.patch
--- kicad-0.20140224+bzr4027/debian/patches/wx3.0-compat.patch	1970-01-01 12:00:00.000000000 +1200
+++ kicad-0.20140224+bzr4027/debian/patches/wx3.0-compat.patch	2014-03-12 22:02:33.000000000 +1300
@@ -0,0 +1,16 @@
+Description: Fix to build with wxWidgets 3.0
+ Should also work with wxWidgets 2.8.
+Author: Olly Betts <o...@survex.com>
+Last-Update: 2014-03-12
+
+--- a/common/edaappl.cpp
++++ b/common/edaappl.cpp
+@@ -451,7 +451,7 @@
+ 
+     // Linux and Unix
+ #elif defined(__UNIX__)
+-    m_BinDir = wxStandardPaths().GetExecutablePath();
++    m_BinDir = wxStandardPaths::Get().GetExecutablePath();
+ #else
+     m_BinDir = argv[0];
+ #endif // __UNIX__
diff -Nru kicad-0.20140224+bzr4027/debian/rules kicad-0.20140224+bzr4027/debian/rules
--- kicad-0.20140224+bzr4027/debian/rules	2014-03-07 23:50:28.000000000 +1300
+++ kicad-0.20140224+bzr4027/debian/rules	2014-03-12 23:23:20.000000000 +1300
@@ -6,6 +6,8 @@
 PKGDIR    = debian/kicad
 TMPPKGDIR = debian/tmp
 
+CXXFLAGS += -DNDEBUG
+
 %:
 	dh $@ --parallel
 

Attachment: signature.asc
Description: Digital signature

Reply via email to