diff --git a/srcpkgs/xchm/patches/xchm-1.23-wx3.0-compat.patch b/srcpkgs/xchm/patches/xchm-1.23-wx3.0-compat.patch new file mode 100644 index 00000000000..18d7385f52c --- /dev/null +++ b/srcpkgs/xchm/patches/xchm-1.23-wx3.0-compat.patch @@ -0,0 +1,32 @@ +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 +Last-Update: 2014-03-07 + +--- src/chmframe.cpp ++++ 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(); + } + diff --git a/srcpkgs/xchm/template b/srcpkgs/xchm/template index bff28bda73c..673af183c81 100644 --- a/srcpkgs/xchm/template +++ b/srcpkgs/xchm/template @@ -1,9 +1,10 @@ # Template file for 'xchm' pkgname=xchm version=1.23 -revision=1 +revision=2 build_style=gnu-configure -makedepends="libchmlib-devel wxGTK-devel" +configure_args="--with-wx-config=wx-config-3.0" +makedepends="libchmlib-devel wxWidgets-devel" short_desc="The CHM viewer for Unix" maintainer="Christian Neukirchen " license="GPL-2"