Browse Source

xap/xchm: Upgraded to xchm-1.23.

slackware-14.2
Damien Goutte-Gattat 8 years ago
parent
commit
f34b87f28c
  1. 1
      xap/xchm/xchm-1.20.tar.gz.sha1
  2. 21
      xap/xchm/xchm-1.23-wxwidgets-3.0.diff
  3. 1
      xap/xchm/xchm-1.23.tar.gz.sha1
  4. 7
      xap/xchm/xchm.SlackBuild

1
xap/xchm/xchm-1.20.tar.gz.sha1

@ -1 +0,0 @@
a2a28246f16adcd679f6302686839f8920c87ede xchm-1.20.tar.gz

21
xap/xchm/xchm-1.23-wxwidgets-3.0.diff

@ -0,0 +1,21 @@
diff -Naur xchm-1.23.orig/src/chmframe.cpp xchm-1.23/src/chmframe.cpp
--- xchm-1.23.orig/src/chmframe.cpp 2013-08-30 10:31:38.000000000 +0200
+++ xchm-1.23/src/chmframe.cpp 2013-12-26 23:34:59.412522347 +0100
@@ -265,7 +265,7 @@
enu.EnumerateFacenames();
_normalFonts = new wxArrayString;
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+#if wxMAJOR_VERSION == 3 || (wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7)
*_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 == 3 || (wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7)
*_fixedFonts = enu.GetFacenames();
#else
*_fixedFonts = *enu.GetFacenames();

1
xap/xchm/xchm-1.23.tar.gz.sha1

@ -0,0 +1 @@
d0de589775164ee8123b25082c54587f0cc72e1d xchm-1.23.tar.gz

7
xap/xchm/xchm.SlackBuild

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2008,2010,2011 Damien Goutte-Gattat
# Copyright (C) 2008,2010,2011,2013 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -28,7 +28,7 @@
# Source package infos
NAMESRC=${NAMESRC:-xchm}
VERSION=${VERSION:-1.20}
VERSION=${VERSION:-1.23}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
WGET=${WGET:-http://downloads.sourceforge.net/xchm/$ARCHIVE}
@ -83,6 +83,7 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
patch -p 1 < $CWD/xchm-1.23-wxwidgets-3.0.diff
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
./configure \
@ -94,7 +95,7 @@ make install-strip DESTDIR=$PKG
# Install the documentation
mkdir -p $PKG/usr/doc/$NAME
install -m 644 ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README{,.xmlrpc} \
install -m 644 AUTHORS COPYING ChangeLog NEWS README{,.xmlrpc} \
$PKG/usr/doc/$NAME
# Copy slack-desc and desktop files

Loading…
Cancel
Save