diff options
| author | Tim Dickson <dickson.tim@googlemail.com> | 2024-07-25 12:23:18 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-07-26 12:03:38 +0700 |
| commit | 24729b4b1b59df86f213318833eed725d3ec4c78 (patch) | |
| tree | 11befa3ceb246716f7769908c06a740998c71275 | |
| parent | 3e54546fdcbec79a3166d4ad39f3417f2e3ee22c (diff) | |
system/yelp: add webkit2gtk4.1 support
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/yelp/README | 7 | ||||
| -rw-r--r-- | system/yelp/yelp.SlackBuild | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/system/yelp/README b/system/yelp/README index 6daeb04e7b7e3..ea91a18c095b1 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 f12b8946e58c9..9fa5cadab7c3d 100644 --- a/system/yelp/yelp.SlackBuild +++ b/system/yelp/yelp.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=yelp VERSION=${VERSION:-42.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,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 \ @@ -87,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 |