xchm: update to 1.27.

This commit is contained in:
Piotr Wójcik 2019-03-13 18:17:40 +01:00 committed by maxice8
parent 3425942c68
commit a5078061c5
3 changed files with 20 additions and 38 deletions

View File

@ -1,32 +0,0 @@
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
--- 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();
}

View File

@ -0,0 +1,14 @@
--- configure
+++ configure
@@ -5669,7 +5669,7 @@ if test "${with_xmlrpc_dir+set}" = set; then :
fi
-if test -n $XMLRPCDIR ; then
+if test -n "$XMLRPCDIR" ; then
CFLAGS="-I$XMLRPCDIR/include -I$XMLRPCDIR/include/xmlrpcpp $CFLAGS"
CXXFLAGS="-I$XMLRPCDIR/include -I$XMLRPCDIR/include/xmlrpcpp $CXXFLAGS"
CPPFLAGS="-I$XMLRPCDIR/include -I$XMLRPCDIR/include/xmlrpcpp $CPPFLAGS"
--
2.21.0

View File

@ -1,13 +1,13 @@
# Template file for 'xchm'
pkgname=xchm
version=1.23
revision=8
version=1.27
revision=1
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
makedepends="libchmlib-devel wxWidgets-gtk3-devel"
short_desc="The CHM viewer for Unix"
short_desc="CHM viewer for Unix"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://xchm.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=8f8f5c60954f340e50f1613913eaca6ff489c10ca36b2570b360d8ccba77c062
homepage="https://github.com/rzvncj/xCHM"
distfiles="https://github.com/rzvncj/xCHM/releases/download/${version}/xchm-${version}.tar.gz"
checksum=12989099d242282c43c709bf917da386e57c947f2d8f7dcfd1d0d728b6999650