summaryrefslogtreecommitdiff
path: root/source/l/gdk-pixbuf2
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/gdk-pixbuf2')
-rwxr-xr-xsource/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild22
-rw-r--r--source/l/gdk-pixbuf2/slack-desc8
-rw-r--r--source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders16
3 files changed, 26 insertions, 20 deletions
diff --git a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
index 505469de..9587f2bd 100755
--- a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
+++ b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA
-# Copyright 2010, 2011 Patrick Volkerding, Sebeka, Minnesota, USA
+# Copyright 2010, 2011, 2018 Patrick Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=gdk-pixbuf
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -35,9 +37,16 @@ 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 "${PKGNAM}2-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -83,11 +92,14 @@ CXXFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PKGNAM-$VERSION \
--enable-introspection \
--with-x11 \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
# We need to have separate 32-bit and 64-bit binaries
# for places where we have two copies of the GTK+ package installed.
# (we might have x86_64 and i486 packages on the same system, for example.)
diff --git a/source/l/gdk-pixbuf2/slack-desc b/source/l/gdk-pixbuf2/slack-desc
index 2fed0a6a..2fcd4ce5 100644
--- a/source/l/gdk-pixbuf2/slack-desc
+++ b/source/l/gdk-pixbuf2/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
@@ -12,7 +12,7 @@ gdk-pixbuf2: The gdk-pixbuf library provides a number of features:
gdk-pixbuf2: - GdkPixbuf structure for representing images.
gdk-pixbuf2: - Image loading facilities, both synchronous and progressive.
gdk-pixbuf2: - Rendering of a GdkPixbuf into various formats:
-gdk-pixbuf2: drawables (windows, pixmaps), GdkRGB buffers.
+gdk-pixbuf2: drawables (windows, pixmaps), GdkRGB buffers.
gdk-pixbuf2: - Fast scaling and compositing of pixbufs.
gdk-pixbuf2: - Simple animation loading (ie. animated gifs).
gdk-pixbuf2:
diff --git a/source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders b/source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders
index 5848db83..4bfda6f3 100644
--- a/source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders
+++ b/source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders
@@ -20,18 +20,12 @@ case "$host" in
fi
/usr/bin/gdk-pixbuf-query-loaders-64 --update-cache
# Check for x86_64 multilib:
- if ls -d /etc/gtk-2.0/i?86* 1> /dev/null 2> /dev/null ; then
- for d in $(ls -d /etc/pango/i?86*); do
- mlhost=$(basename $d)
- break
- done
- if [ -x /usr/bin/gdk-pixbuf-query-loaders-32 ]; then
- if [ "$1" = "--verbose" ]; then
- echo "Updating gdk-pixbuf.loaders for ${mlhost}:"
- echo " /usr/bin/gdk-pixbuf-query-loaders-32 --update-cache"
- fi
- /usr/bin/gdk-pixbuf-query-loaders-32 --update-cache
+ if [ -x /usr/bin/gdk-pixbuf-query-loaders-32 ]; then
+ if [ "$1" = "--verbose" ]; then
+ echo "Updating gdk-pixbuf.loaders for 32-bit:"
+ echo " /usr/bin/gdk-pixbuf-query-loaders-32 --update-cache"
fi
+ /usr/bin/gdk-pixbuf-query-loaders-32 --update-cache
fi
else
if [ "$1" = "--verbose" ]; then