Commit 7c2a4a86 authored by Kartik Mistry's avatar Kartik Mistry 🇮🇳

Update to build with libwxgtk3.0-dev. Thanks to Olly Betts <olly@survex.com> for patch.

parent ec84c6e9
xchm (2:1.23-1) unstable; urgency=low
* New upstream release.
* debian/patches/wx3.0-compat.patch:
+ Update to build with libwxgtk3.0-dev. Thanks to Olly Betts
<olly@survex.com> for patch.
* debian/control:
+ Updated Standards-Version to 3.9.5
+ Added VCS-* fields.
......@@ -9,7 +12,7 @@ xchm (2:1.23-1) unstable; urgency=low
* debian/rules:
+ Do not clean config.sub/config.guess files.
-- Kartik Mistry <kartik@debian.org> Thu, 26 Dec 2013 16:49:50 +0530
-- Kartik Mistry <kartik@debian.org> Fri, 07 Mar 2014 10:09:00 +0530
xchm (2:1.21-1) unstable; urgency=low
......
......@@ -6,8 +6,7 @@ Build-Depends: autotools-dev,
debhelper (>= 7.0.50~),
dpkg-dev (>= 1.16.1~),
libchm-dev (>= 2:0.40a),
libwxgtk2.8-dev
Build-Conflicts: libwxbase2.6-dev, libwxgtk2.6-dev
libwxgtk3.0-dev
Standards-Version: 3.9.5
Homepage: http://xchm.sourceforge.net/
Vcs-Git: git://anonscm.debian.org/collab-maint/xchm.git
......
wx3.0-compat.patch
Description: Fix code to compile with wxwidgets 3.0
Drops support for wx < 2.7, which is just not relevant now. And in fact
configure.ac checks for at least 2.8.0.
Author: Olly Betts <olly@survex.com>
Last-Update: 2014-03-07
--- xchm-1.23.orig/src/chmframe.cpp
+++ xchm-1.23/src/chmframe.cpp
@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
enu.EnumerateFacenames();
_normalFonts = new wxArrayString;
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
*_normalFonts = enu.GetFacenames();
-#else
- *_normalFonts = *enu.GetFacenames();
-#endif
_normalFonts->Sort();
}
@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
_fixedFonts = new wxArrayString;
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
*_fixedFonts = enu.GetFacenames();
-#else
- *_fixedFonts = *enu.GetFacenames();
-#endif
_fixedFonts->Sort();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment