From 758643bd51547c485f177b5984744c5bd7856896 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Wed, 24 Apr 2024 14:36:23 +0200 Subject: libraries/libfm: Switch to gtk+3 by default. Signed-off-by: Matteo Bernardini Signed-off-by: Willy Sudiarto Raharjo --- libraries/libfm/README | 8 ++++---- libraries/libfm/libfm.SlackBuild | 25 ++++++++++--------------- 2 files changed, 14 insertions(+), 19 deletions(-) (limited to 'libraries/libfm') diff --git a/libraries/libfm/README b/libraries/libfm/README index 4b3684e8a7..d8dc092950 100644 --- a/libraries/libfm/README +++ b/libraries/libfm/README @@ -3,9 +3,9 @@ giving a convenient higher-level API. You can choose which version of gtk the library will build against: - GTK=2 link with gtk+2 (default) - GTK=3 link with gtk+3 - GTK=0 don't link against gtk at all + GTK3=yes link with gtk+3 (default) + GTK3=no link with gtk+2 + GTK3=- don't link against gtk at all Pass the script the parameter you prefer, like - GTK=3 ./libfm.SlackBuild + GTK3=no ./libfm.SlackBuild diff --git a/libraries/libfm/libfm.SlackBuild b/libraries/libfm/libfm.SlackBuild index 0be4336787..99a22733f4 100644 --- a/libraries/libfm/libfm.SlackBuild +++ b/libraries/libfm/libfm.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libfm # Copyright 2010 Chris Abela -# Copyright 2013-2021 Matteo Bernardini , Pisa, Italy +# Copyright 2013-2024 Matteo Bernardini , Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libfm VERSION=${VERSION:-1.3.2} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,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 @@ -65,13 +62,10 @@ else LIBDIRSUFFIX="" fi -# Enable custom actions if we have vala available -if [ -h /usr/bin/vapigen ]; then actions=""; else actions="--disable-actions"; fi - -case "$GTK" in - 3) gtk="--with-gtk=3 --enable-gtk-doc" ;; - 0) gtk="--without-gtk" ;; - *) gtk="--with-gtk=2 --enable-gtk-doc" ;; +case "${GTK3:-yes}" in + "no") gtk="--with-gtk=2 --enable-gtk-doc" ;; + "-") gtk="--without-gtk" ;; + *) gtk="--with-gtk=3 --enable-gtk-doc" ;; esac set -e @@ -102,7 +96,6 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-static=no \ --enable-udisks \ $gtk \ - $actions \ --build=$ARCH-slackware-linux make @@ -117,8 +110,10 @@ make install-strip DESTDIR=$PKG cd $PKG/usr/lib$LIBDIRSUFFIX rm -f libfm-extra.so* pkgconfig/libfm-extra.pc libfm-extra.la ) -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +if [ -d $PKG/usr/man ]; then + find $PKG/usr/man -type f -exec gzip -9 {} \; + for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +fi # add handlers for terminal and archiver from LXDE components to the default config sed -i -e 's|\[ui\]|terminal=lxterminal -e %s\narchiver=file-roller %s\n\n[ui]|' \ -- cgit v1.2.3-65-gdbad