diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-04-15 19:46:20 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-04-16 08:59:45 +0200 |
| commit | 2d85d745858f2e3fb6274f4478edb0b8cd1c1948 (patch) | |
| tree | a45898cd8a83883d2594150865eafc0e04e3fd97 /source | |
| parent | 952bf293b96cb781eeeeb8e74c53c84126cf0449 (diff) | |
| download | current-2d85d745858f2e3fb6274f4478edb0b8cd1c1948.tar.gz | |
Mon Apr 15 19:46:20 UTC 201920190415194620
ap/nano-4.1-x86_64-1.txz: Upgraded.
l/giflib-5.1.9-x86_64-2.txz: Rebuilt.
Restore GifQuantizeBuffer and other deprecated functions to the shared
library. Thanks to Skaendo.
l/glib2-2.60.1-x86_64-1.txz: Upgraded.
l/orc-0.4.29-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
| -rw-r--r-- | source/l/giflib/giflib.GifQuantizeBuffer.diff | 13 | ||||
| -rwxr-xr-x | source/l/giflib/giflib.SlackBuild | 8 | ||||
| -rwxr-xr-x | source/l/orc/orc.SlackBuild | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/source/l/giflib/giflib.GifQuantizeBuffer.diff b/source/l/giflib/giflib.GifQuantizeBuffer.diff new file mode 100644 index 00000000..e79b4278 --- /dev/null +++ b/source/l/giflib/giflib.GifQuantizeBuffer.diff @@ -0,0 +1,13 @@ +--- ./Makefile.orig 2019-03-28 13:57:23.000000000 -0500 ++++ ./Makefile 2019-04-15 13:39:08.565931109 -0500 +@@ -67,8 +67,8 @@ + + $(UTILS):: libgif.a libutil.a + +-libgif.so: $(OBJECTS) $(HEADERS) +- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) ++libgif.so: $(OBJECTS) $(HEADERS) $(UOBJECTS) ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) $(UOBJECTS) + + libgif.a: $(OBJECTS) $(HEADERS) + $(AR) rcs libgif.a $(OBJECTS) diff --git a/source/l/giflib/giflib.SlackBuild b/source/l/giflib/giflib.SlackBuild index c5d628f5..06c0183d 100755 --- a/source/l/giflib/giflib.SlackBuild +++ b/source/l/giflib/giflib.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=giflib VERSION=${VERSION:-$(echo giflib-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -76,6 +76,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Include deprecated functions (including GifQuantizeBuffer) into the libgif.so +# to fix older packages that require those functions. Really, when functions +# were removed from the shared library this should have merited a shared +# library .soname version bump. +zcat $CWD/giflib.GifQuantizeBuffer.diff.gz | patch -p1 --verbose || exit 1 + make PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} MANDIR=/usr/man $NUMJOBS || make || exit 1 make PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} MANDIR=/usr/man install DESTDIR=$PKG || exit 1 diff --git a/source/l/orc/orc.SlackBuild b/source/l/orc/orc.SlackBuild index 40954638..acc812ea 100755 --- a/source/l/orc/orc.SlackBuild +++ b/source/l/orc/orc.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=orc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} |