summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-05-17 19:12:54 +0000
committerEric Hameleers <alien@slackware.com>2021-05-18 08:59:55 +0200
commit9a7688d56afb84a4619a088de98ba78ac5f996b5 (patch)
tree09b28d8ce805faa027c0bf5063734185ea483ff7 /extra
parentaf7419df40001d15bac45ff746d05b9f659146c5 (diff)
downloadcurrent-9a7688d56afb84a4619a088de98ba78ac5f996b5.tar.gz
Mon May 17 19:12:54 UTC 202120210517191254
l/libusb-compat-0.1.7-x86_64-1.txz: Upgraded. xap/mozilla-thunderbird-78.10.2-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/thunderbird/78.10.2/releasenotes/ (* Security fix *) extra/fltk/fltk-1.3.6-x86_64-1.txz: Upgraded.
Diffstat (limited to 'extra')
-rwxr-xr-xextra/source/fltk/fltk.SlackBuild18
-rw-r--r--extra/source/fltk/fltk.fltk-config.in.diff20
2 files changed, 22 insertions, 16 deletions
diff --git a/extra/source/fltk/fltk.SlackBuild b/extra/source/fltk/fltk.SlackBuild
index bad81b3c..76d0aa5b 100755
--- a/extra/source/fltk/fltk.SlackBuild
+++ b/extra/source/fltk/fltk.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2015, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2015, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=fltk
-VERSION=$(basename $(echo $PKGNAM-*.tar.lz | cut -f 2- -d -) -source.tar.lz)
+SRCNAM=fltk-release
+VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
@@ -80,9 +81,9 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-${VERSION}-source.tar.lz || exit 1
-cd $PKGNAM-$VERSION || exit 1
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-${VERSION}.tar.lz || exit 1
+cd $SRCNAM-$VERSION || exit 1
zcat $CWD/fltk.fltk-config.in.diff.gz | patch -p1 --verbose || exit 1
@@ -94,6 +95,13 @@ find . \
-exec chmod 644 {} \+
# Configure:
+if [ ! -r configure ]; then
+ if [ -x ./autogen.sh ]; then
+ NOCONFIGURE=1 ./autogen.sh
+ else
+ autoreconf -vif
+ fi
+fi
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/extra/source/fltk/fltk.fltk-config.in.diff b/extra/source/fltk/fltk.fltk-config.in.diff
index 1125f61b..1751e13d 100644
--- a/extra/source/fltk/fltk.fltk-config.in.diff
+++ b/extra/source/fltk/fltk.fltk-config.in.diff
@@ -1,8 +1,7 @@
-diff -Naur fltk-1.3.3-orig/fltk-config.in fltk-1.3.3/fltk-config.in
---- fltk-1.3.3-orig/fltk-config.in 2014-12-31 15:43:07.203519633 -0500
-+++ fltk-1.3.3/fltk-config.in 2014-12-31 15:49:01.636277725 -0500
-@@ -54,21 +54,6 @@
- bindir="$selfdir/fluid"
+--- ./fltk-config.in.orig 2021-05-15 05:22:19.000000000 -0500
++++ ./fltk-config.in 2021-05-17 13:13:05.020746498 -0500
+@@ -53,21 +53,6 @@
+ if test -f "$selfdir/FL/Fl_Window.H"; then
includedir="$selfdir"
libdir="$selfdir/lib"
-
@@ -23,7 +22,7 @@ diff -Naur fltk-1.3.3-orig/fltk-config.in fltk-1.3.3/fltk-config.in
fi
if test -d $includedir/FL/images; then
-@@ -76,11 +61,6 @@
+@@ -75,11 +60,6 @@
CXXFLAGS="-I$includedir/FL/images $CXXFLAGS"
fi
@@ -35,7 +34,7 @@ diff -Naur fltk-1.3.3-orig/fltk-config.in fltk-1.3.3/fltk-config.in
# libraries to link with:
LIBNAME="@LIBNAME@"
DSONAME="@DSONAME@"
-@@ -230,25 +210,20 @@
+@@ -233,25 +213,20 @@
fi
# Calculate needed libraries
@@ -47,8 +46,8 @@ diff -Naur fltk-1.3.3-orig/fltk-config.in fltk-1.3.3/fltk-config.in
- LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
fi
if test x$use_gl = xyes; then
- LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
-- LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
+ LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIBS@ $LDLIBS"
+- LDSTATIC="$libdir/libfltk_gl.a @GLLIBS@ $LDSTATIC"
fi
if test x$use_images = xyes; then
LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
@@ -61,7 +60,7 @@ diff -Naur fltk-1.3.3-orig/fltk-config.in fltk-1.3.3/fltk-config.in
fi
LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
-@@ -359,26 +334,26 @@
+@@ -369,26 +344,26 @@
fi
if test "$echo_libs" = "yes"; then
@@ -95,4 +94,3 @@ diff -Naur fltk-1.3.3-orig/fltk-config.in fltk-1.3.3/fltk-config.in
fi
done
fi
-