From 19e871bbe3e503926aa02444459922840703df3a Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 25 Feb 2022 18:50:19 -0500 Subject: graphics/gimp-wideangle-plugin: Fix 15.0 build. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- .../gimp-wideangle-plugin.SlackBuild | 36 +++++++++------------- .../gimp-wideangle-plugin.info | 4 +-- 2 files changed, 17 insertions(+), 23 deletions(-) (limited to 'graphics') diff --git a/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.SlackBuild b/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.SlackBuild index 8a7bcae791..15548724a8 100644 --- a/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.SlackBuild +++ b/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.SlackBuild @@ -2,6 +2,8 @@ # Slackware build script for # Written by Michales Michaloudes korgie@gmail.com +# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gimp-wideangle-plugin @@ -20,9 +22,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 @@ -51,36 +50,31 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -mkdir $TMP/$PRGNAM-$VERSION -cp $CWD/$SRCNAM.c $TMP/$PRGNAM-$VERSION/ -cd $PRGNAM-$VERSION -SRCVERSION=$(grep "^ \* version" wideangle.c | awk '{printf $3}') +# 20220225 bkw: Look ma, no source dir! +SRC=$CWD/$SRCNAM.c + +SRCVERSION=$(grep "^ \* version" $SRC | awk '{printf $3}') if [ $SRCVERSION != $VERSION ]; then echo "Version mismatch, source = \"$SRCVERSION\"" exit 1 fi # command "stolen" from gimp-tool. +# 20220225 bkw: ...and rewritten to use pkg-config, since the old one +# didn't work any more on Slackware 15.0. GIMPPLUGINS=usr/lib${LIBDIRSUFFIX}/gimp/2.0/plug-ins/ mkdir -p $PKG/$GIMPPLUGINS -gcc $SLKCFLAGS -v \ - -I/usr/include/gimp-2.0 -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 \ - -I/usr/lib${LIBDIRSUFFIX}/glib-2.0/include -I/usr/lib${LIBDIRSUFFIX}/gtk-2.0/include \ - -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 \ - -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng14 \ - -I/usr/include/gdk-pixbuf-2.0 \ - -o $PKG/$GIMPPLUGINS/$SRCNAM wideangle.c \ - -lgimpui-2.0 -lgimpwidgets-2.0 -lgimpmodule-2.0 -lgimp-2.0 -lgimpmath-2.0 \ - -lgimpconfig-2.0 -lgimpcolor-2.0 -lgimpbase-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 \ - -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo \ - -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 \ - -lm + +gcc $SLKCFLAGS \ + $( pkg-config --cflags gimpui-2.0 gimp-2.0 gtk+-2.0 ) \ + -o $PKG/$GIMPPLUGINS/$SRCNAM $SRC \ + $( pkg-config --libs gimpui-2.0 gimp-2.0 gtk+-2.0 ) + strip --strip-unneeded $PKG/$GIMPPLUGINS/$SRCNAM mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp $CWD/wideangle.html $PKG/usr/doc/$PRGNAM-$VERSION +cp $CWD/$SRCNAM.html $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.info b/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.info index 1347d6fdf4..d7af9ace17 100644 --- a/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.info +++ b/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.info @@ -1,7 +1,7 @@ PRGNAM="gimp-wideangle-plugin" VERSION="1.0.10" -HOMEPAGE="http://members.ozemail.com.au/~hodsond/wideangle.html" -DOWNLOAD="http://members.ozemail.com.au/~hodsond/wideangle.c" +HOMEPAGE="https://slackware.uk/~urchlay/src/wideangle.html" +DOWNLOAD="https://slackware.uk/~urchlay/src/wideangle.c" MD5SUM="dd96615abbc761b4618ace94a29086c1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -- cgit v1.2.3