aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2021-12-03 18:10:45 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2021-12-03 18:12:12 +0700
commit9c13a57c83b32db8d02d2a25946c78d42d8ee162 (patch)
tree2bf1dfe439e38ef2686fa37852cf0a13fc6b5b25
parent62525afa6055596a2b6c9ad7ad2a3940a87e9273 (diff)
academic/xiphos: Fix build on current.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--academic/xiphos/xiphos-glibc.patch8
-rw-r--r--academic/xiphos/xiphos.SlackBuild6
-rw-r--r--academic/xiphos/xiphos.info2
3 files changed, 13 insertions, 3 deletions
diff --git a/academic/xiphos/xiphos-glibc.patch b/academic/xiphos/xiphos-glibc.patch
new file mode 100644
index 000000000000..9a89b0d1fba2
--- /dev/null
+++ b/academic/xiphos/xiphos-glibc.patch
@@ -0,0 +1,8 @@
+--- cmake/config.h.cmake.in-orig 2021-04-15 19:28:57.468140150 +0300
++++ cmake/config.h.cmake.in 2021-04-15 20:45:57.816551253 +0300
+@@ -65,3 +65,5 @@
+
+
+ #endif
++
++#define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_2_26)
diff --git a/academic/xiphos/xiphos.SlackBuild b/academic/xiphos/xiphos.SlackBuild
index e7f907c745c5..ea6030fa7002 100644
--- a/academic/xiphos/xiphos.SlackBuild
+++ b/academic/xiphos/xiphos.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=xiphos
VERSION=${VERSION:-4.2.1}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -89,7 +89,9 @@ export PATH=/opt/cmake-202x/bin:$PATH
# patch navbar_versekey.gtkbuilder to work with gtk shipped with slackware 14.2
# patch won't be needed for slackware 15
-sed -i "s/3.20/3.14/g" ui/navbar_versekey.gtkbuilder
+#sed -i "s/3.20/3.14/g" ui/navbar_versekey.gtkbuilder
+
+patch -p0 < $CWD/xiphos-glibc.patch
mkdir -p build
cd build
diff --git a/academic/xiphos/xiphos.info b/academic/xiphos/xiphos.info
index 46582994ec40..2e531b0cacd5 100644
--- a/academic/xiphos/xiphos.info
+++ b/academic/xiphos/xiphos.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/crosswire/xiphos/releases/download/4.2.1/xiphos-4.2
MD5SUM="77d8a99c063433bea3006954710b2fd5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="sword webkitgtk3 biblesync rarian gtkhtml libminizip appstream-glib yelp"
+REQUIRES="sword webkit2gtk biblesync rarian gtkhtml libminizip appstream-glib yelp"
MAINTAINER="Tim Dickson"
EMAIL="dickson.tim@googlemail.com"