From a81af46590d3eb62993dab4e6eeadb7ab8beb118 Mon Sep 17 00:00:00 2001 From: B. Watson Date: Sun, 6 Mar 2022 13:20:00 -0500 Subject: system/font-manager: Fix build when webkit2gtk not installed. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- system/font-manager/README | 3 +++ system/font-manager/font-manager.SlackBuild | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/system/font-manager/README b/system/font-manager/README index ae03670104..39ced4b145 100644 --- a/system/font-manager/README +++ b/system/font-manager/README @@ -1,4 +1,7 @@ A simple font management application for GTK+ Desktop Environments. +Optional dependency: webkit2gtk, autodetected at build time. This is +required if you want Google Fonts integration. + Optional dependency: file-roller. This is a runtime dependency, not required at build time. diff --git a/system/font-manager/font-manager.SlackBuild b/system/font-manager/font-manager.SlackBuild index ca3a2932fa..f714cd8687 100644 --- a/system/font-manager/font-manager.SlackBuild +++ b/system/font-manager/font-manager.SlackBuild @@ -25,6 +25,9 @@ # 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0, # by updating to v0.8.8. +# 20220306 bkw: Modified by SlackBuilds.org again: add autodetection +# for webkit2gtk dependency. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=font-manager @@ -79,6 +82,9 @@ 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 {} \+ +WEBKIT=false +pkg-config --exists webkit2gtk-4.0 && WEBKIT=true + mkdir build cd build CFLAGS="$SLKCFLAGS" \ @@ -92,6 +98,7 @@ cd build --prefix=/usr \ --sysconfdir=/etc \ -Dthunar=true \ + -Dwebkit=$WEBKIT \ -Dstrip=true "${NINJA:=ninja}" DESTDIR=$PKG $NINJA install -- cgit v1.2.3