summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-12-24 20:43:23 +0000
committerEric Hameleers <alien@slackware.com>2021-12-25 08:59:54 +0100
commit2ee34a926d67cdb7c4f2ecdcf48481c0312038e5 (patch)
tree037b08ba1843c576b58b6c1b7131f38df617abff /source
parentc7ed5adb53f2476f31c6568643e14a9c6e4fcf93 (diff)
downloadcurrent-2ee34a926d67cdb7c4f2ecdcf48481c0312038e5.tar.gz
Fri Dec 24 20:43:23 UTC 202120211224204323
Merry Christmas, everyone! :-) See you again on Sunday or Monday. xap/pan-0.149-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/xap/pan/pan.SlackBuild7
-rw-r--r--source/xap/pan/pan.enchant2.diff31
2 files changed, 15 insertions, 23 deletions
diff --git a/source/xap/pan/pan.SlackBuild b/source/xap/pan/pan.SlackBuild
index dc71077a..4a719249 100755
--- a/source/xap/pan/pan.SlackBuild
+++ b/source/xap/pan/pan.SlackBuild
@@ -63,9 +63,9 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf ${PKGNAM}-v${VERSION}
-tar xvf $CWD/${PKGNAM}-v$VERSION.tar.?z || exit 1
-cd ${PKGNAM}-v$VERSION || exit 1
+rm -rf ${PKGNAM}-*${VERSION}
+tar xvf $CWD/${PKGNAM}-*$VERSION.tar.?z || exit 1
+cd ${PKGNAM}-*$VERSION || exit 1
# Make sure ownerships and permissions are sane:
chown -R root:root .
@@ -77,6 +77,7 @@ find . \
# Build with enchant-2:
zcat $CWD/pan.enchant2.diff.gz | patch -p1 --verbose || exit 1
+autoreconf -vif
# Configure:
if [ ! -r configure ]; then
diff --git a/source/xap/pan/pan.enchant2.diff b/source/xap/pan/pan.enchant2.diff
index 6acf9b6f..bf072cb5 100644
--- a/source/xap/pan/pan.enchant2.diff
+++ b/source/xap/pan/pan.enchant2.diff
@@ -1,31 +1,22 @@
---- ./configure.ac.orig 2021-09-16 11:17:07.000000000 -0500
-+++ ./configure.ac 2021-09-20 12:51:27.786023975 -0500
-@@ -159,7 +159,7 @@
- AC_DEFINE(HAVE_GTK,[1],[GTK+ 3 support])]
- )
- if test "x$want_gtkspell" = "xyes" ; then
-- PKG_CHECK_MODULES([GTKSPELL], [gtkspell3-3.0 >= $GTKSPELL3_REQUIRED enchant >= $ENCHANT_REQUIRED],
-+ PKG_CHECK_MODULES([GTKSPELL], [gtkspell3-3.0 >= $GTKSPELL3_REQUIRED enchant-2 >= $ENCHANT_REQUIRED],
- [
- gtkspell_msg=yes
- AC_DEFINE(HAVE_GTKSPELL,[1],[GtkSpell support for spellchecking])
-@@ -172,7 +172,7 @@
+--- ./configure.ac.orig 2021-12-23 10:08:38.000000000 -0600
++++ ./configure.ac 2021-12-23 15:09:47.761728536 -0600
+@@ -173,7 +173,7 @@
fi
else
if test "x$want_gtkspell" = "xyes" ; then
- PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0 >= $GTKSPELL_REQUIRED enchant >= $ENCHANT_REQUIRED],
-+ PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0 >= $GTKSPELL_REQUIRED enchant-2 >= $ENCHANT_REQUIRED],
++ PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0 >= $GTKSPELL_REQUIRED enchant-2 >= $ENCHANT2_REQUIRED],
[
gtkspell_msg=yes
AC_DEFINE(HAVE_GTKSPELL,[1],[GtkSpell support for spellchecking])
---- ./pan/gui/group-prefs-dialog.cc.orig 2021-09-20 12:51:27.786023975 -0500
-+++ ./pan/gui/group-prefs-dialog.cc 2021-09-20 12:52:45.976025724 -0500
-@@ -22,7 +22,7 @@
- #include <glib.h>
- #include "gtk-compat.h"
- #ifdef HAVE_GTKSPELL
+--- ./pan/gui/group-prefs-dialog.cc.orig 2021-12-06 18:08:37.000000000 -0600
++++ ./pan/gui/group-prefs-dialog.cc 2021-12-23 15:10:34.748725937 -0600
+@@ -25,7 +25,7 @@
+ #if GTKSPELL_VERSION == 3
+ #include <enchant-2/enchant.h>
+ #else
-#include <enchant/enchant.h>
+#include <enchant-2/enchant.h>
#endif
+ #endif
#include <pan/general/debug.h>
- #include <pan/general/macros.h>