Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77testing.git;a=commitdiff;h=7fcddb6f6cc7ec615cc90b4b2c5e8dbdc981374e
commit 7fcddb6f6cc7ec615cc90b4b2c5e8dbdc981374e Author: James Buren <[email protected]> Date: Wed Jun 18 04:28:29 2014 -0500 xchm-1.23-3-x86_64 * wxgtk -> wxwidget diff --git a/source/xapps-extra/xchm/FrugalBuild b/source/xapps-extra/xchm/FrugalBuild index 8135aa7..0ca6dcd 100644 --- a/source/xapps-extra/xchm/FrugalBuild +++ b/source/xapps-extra/xchm/FrugalBuild @@ -1,16 +1,20 @@ # Compiling Time: 0.51 SBU # Maintainer: Miklos Vajna <[email protected]> +options+=('asneeded') + pkgname=xchm -pkgver=1.20 -pkgrel=2 +pkgver=1.23 +pkgrel=3 pkgdesc="A cross-platform GUI front-end to chmlib." -depends=('chmlib' 'wxgtk>=2.8.12-3') +depends=('chmlib' 'wxwidget>=3.0.0-5') groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') Finclude sourceforge -sha1sums=('a2a28246f16adcd679f6302686839f8920c87ede') +source=($source wxwidget-compatible.patch) +sha1sums=('d0de589775164ee8123b25082c54587f0cc72e1d' + '6495ec5c427a6a2b3c872b3f98e184cba5f92dd6') export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" # optimization OK diff --git a/source/xapps-extra/xchm/wxwidget-compatible.patch b/source/xapps-extra/xchm/wxwidget-compatible.patch new file mode 100644 index 0000000..5dc3b08 --- /dev/null +++ b/source/xapps-extra/xchm/wxwidget-compatible.patch @@ -0,0 +1,20 @@ +--- xchm-1.23/src/chmframe.cpp~ 2013-08-30 10:31:38.000000000 +0200 ++++ xchm-1.23/src/chmframe.cpp 2014-01-18 16:36:29.792122290 +0100 +@@ -265,7 +265,7 @@ + enu.EnumerateFacenames(); + _normalFonts = new wxArrayString; + +-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 ++#if (wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7) || (wxMAJOR_VERSION == 3) + *_normalFonts = enu.GetFacenames(); + #else + *_normalFonts = *enu.GetFacenames(); +@@ -278,7 +278,7 @@ + enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE); + _fixedFonts = new wxArrayString; + +-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 ++#if (wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7) || (wxMAJOR_VERSION == 3) + *_fixedFonts = enu.GetFacenames(); + #else + *_fixedFonts = *enu.GetFacenames(); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
