diff options
Diffstat (limited to 'system/yelp')
| -rw-r--r-- | system/yelp/README | 7 | ||||
| -rw-r--r-- | system/yelp/yelp.SlackBuild | 16 | ||||
| -rw-r--r-- | system/yelp/yelp.info | 6 |
3 files changed, 16 insertions, 13 deletions
diff --git a/system/yelp/README b/system/yelp/README index 6daeb04e7b..ea91a18c09 100644 --- a/system/yelp/README +++ b/system/yelp/README @@ -2,6 +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. Since this depends on webkit2gtk (with 4.0 API), yelp cannot -be used with (or even installed on the same system as) software that -requires webkit2gtk4.1. +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 + diff --git a/system/yelp/yelp.SlackBuild b/system/yelp/yelp.SlackBuild index e0a3832aec..9fa5cadab7 100644 --- a/system/yelp/yelp.SlackBuild +++ b/system/yelp/yelp.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for yelp -# Copyright 2014-2022 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2014-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=yelp -VERSION=${VERSION:-42.1} +VERSION=${VERSION:-42.2} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -79,6 +76,11 @@ 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 +if $(pkg-config --exists webkit2gtk-4.1); then + WKIT2="4-1" +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -90,7 +92,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-static=no \ --disable-schemas-compile \ - --with-webkit2gtk-4-0 \ + --with-webkit2gtk-$WKIT2 \ --build=$ARCH-slackware-linux make @@ -100,7 +102,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING* ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING* ChangeLog NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild rm -f $PKG/usr/lib*/*.la diff --git a/system/yelp/yelp.info b/system/yelp/yelp.info index 853a702122..872a5ae246 100644 --- a/system/yelp/yelp.info +++ b/system/yelp/yelp.info @@ -1,8 +1,8 @@ PRGNAM="yelp" -VERSION="42.1" +VERSION="42.2" HOMEPAGE="http://projects.gnome.org/yelp/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp/42/yelp-42.1.tar.xz" -MD5SUM="6dc39a17c910e87e7a240fb6a8d9b5bf" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp/42/yelp-42.2.tar.xz" +MD5SUM="3792122c4ab90725716cd88e9274f0f6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yelp-tools webkit2gtk libhandy" |