diff options
| -rw-r--r-- | system/yelp/README | 6 | ||||
| -rw-r--r-- | system/yelp/yelp.SlackBuild | 43 | ||||
| -rw-r--r-- | system/yelp/yelp.info | 6 |
3 files changed, 31 insertions, 24 deletions
diff --git a/system/yelp/README b/system/yelp/README index ea91a18c09..e80033b91f 100644 --- a/system/yelp/README +++ b/system/yelp/README @@ -2,7 +2,7 @@ yelp allows you to view documentation regarding GNOME and other components through a variety of formats Conflict warning: webkit2gtk and webkit2gtk4.1 conflict with each -other. If this is build with webkit2gtk4.1 instead of webkit2gtk, -any software that uses it and it's deps must also be built with -webkit2gtk4.1/soup3 instead of webkit2gtk/soup2 +other. If this is build with webkit2gtk4.1 instead of webkit2gtk +(default), any software that uses it and it's deps must also be +built with webkit2gtk4.1/soup3 instead of webkit2gtk/soup2. diff --git a/system/yelp/yelp.SlackBuild b/system/yelp/yelp.SlackBuild index 9fa5cadab7..6c800a9ac3 100644 --- a/system/yelp/yelp.SlackBuild +++ b/system/yelp/yelp.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for yelp -# Copyright 2014-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2014-2025 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=yelp -VERSION=${VERSION:-42.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-42.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,24 +76,31 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -WKIT2="4-0" #handle either webkit2gtk or webkit2gtk4.1 +WKIT2="" #handle either webkit2gtk or webkit2gtk4.1 if $(pkg-config --exists webkit2gtk-4.1); then - WKIT2="4-1" + WKIT2="webkit2gtk-4-0=false" +elif $(pkg-config --exists webkit2gtk-4.0); then + WKIT2="webkit2gtk-4-0=true" fi -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-static=no \ - --disable-schemas-compile \ - --with-webkit2gtk-$WKIT2 \ - --build=$ARCH-slackware-linux +mkdir build +cd build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson .. \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc \ + -D$WKIT2 \ + -Dstrip=true + "${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install +cd .. + make make install DESTDIR=$PKG diff --git a/system/yelp/yelp.info b/system/yelp/yelp.info index 872a5ae246..6745481532 100644 --- a/system/yelp/yelp.info +++ b/system/yelp/yelp.info @@ -1,8 +1,8 @@ PRGNAM="yelp" -VERSION="42.2" +VERSION="42.3" HOMEPAGE="http://projects.gnome.org/yelp/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp/42/yelp-42.2.tar.xz" -MD5SUM="3792122c4ab90725716cd88e9274f0f6" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp/42/yelp-42.3.tar.xz" +MD5SUM="55f5edc7e1d52797a8fba23540fa72c1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yelp-tools webkit2gtk libhandy" |