From d31c50870d0bee042ce660e445c9294a59a3a65b Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 30 Jun 2016 20:26:57 +0000 Subject: Slackware 14.2 Thu Jun 30 20:26:57 UTC 2016 Slackware 14.2 x86_64 stable is released! The long development cycle (the Linux community has lately been living in "interesting times", as they say) is finally behind us, and we're proud to announce the release of Slackware 14.2. The new release brings many updates and modern tools, has switched from udev to eudev (no systemd), and adds well over a hundred new packages to the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-) --- source/l/icu4c/icu4c.SlackBuild | 12 +++++---- source/l/icu4c/icu4c.closenull.patch | 48 ++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 source/l/icu4c/icu4c.closenull.patch (limited to 'source/l/icu4c') diff --git a/source/l/icu4c/icu4c.SlackBuild b/source/l/icu4c/icu4c.SlackBuild index 1465a286..823e4a04 100755 --- a/source/l/icu4c/icu4c.SlackBuild +++ b/source/l/icu4c/icu4c.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for icu4c # Copyright 2007-2013 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2012, 2013, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,12 +26,12 @@ PKGNAM=icu4c SRCVER=${SRCVER:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 2- -d . | cut -f 2 -d - | rev)} VERSION=$(echo $SRCVER | tr _ .) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; @@ -44,8 +44,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-icu4c -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -71,6 +71,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ -o -perm 400 \) -exec chmod 644 {} \; +zcat $CWD/icu4c.closenull.patch.gz | patch -p1 --verbose || exit 1 + cd source/ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/source/l/icu4c/icu4c.closenull.patch b/source/l/icu4c/icu4c.closenull.patch new file mode 100644 index 00000000..3cc0b7f6 --- /dev/null +++ b/source/l/icu4c/icu4c.closenull.patch @@ -0,0 +1,48 @@ +--- icu/source/common/unicode/localpointer.h.orig 2016-02-21 21:40:54.346007093 +0100 ++++ icu/source/common/unicode/localpointer.h 2016-02-21 21:46:25.455090792 +0100 +@@ -508,12 +508,12 @@ + : LocalPointerBase(src.ptr) { \ + src.ptr=NULL; \ + } \ +- ~LocalPointerClassName() { closeFunction(ptr); } \ ++ ~LocalPointerClassName() { if (ptr != NULL) closeFunction(ptr); } \ + LocalPointerClassName &operator=(LocalPointerClassName &&src) U_NOEXCEPT { \ + return moveFrom(src); \ + } \ + LocalPointerClassName &moveFrom(LocalPointerClassName &src) U_NOEXCEPT { \ +- closeFunction(ptr); \ ++ if (ptr != NULL) closeFunction(ptr); \ + LocalPointerBase::ptr=src.ptr; \ + src.ptr=NULL; \ + return *this; \ +@@ -527,7 +527,7 @@ + p1.swap(p2); \ + } \ + void adoptInstead(Type *p) { \ +- closeFunction(ptr); \ ++ if (ptr != NULL) closeFunction(ptr); \ + ptr=p; \ + } \ + } +@@ -536,9 +536,9 @@ + class LocalPointerClassName : public LocalPointerBase { \ + public: \ + explicit LocalPointerClassName(Type *p=NULL) : LocalPointerBase(p) {} \ +- ~LocalPointerClassName() { closeFunction(ptr); } \ ++ ~LocalPointerClassName() { if (ptr != NULL) closeFunction(ptr); } \ + LocalPointerClassName &moveFrom(LocalPointerClassName &src) U_NOEXCEPT { \ +- closeFunction(ptr); \ ++ if (ptr != NULL) closeFunction(ptr); \ + LocalPointerBase::ptr=src.ptr; \ + src.ptr=NULL; \ + return *this; \ +@@ -552,7 +552,7 @@ + p1.swap(p2); \ + } \ + void adoptInstead(Type *p) { \ +- closeFunction(ptr); \ ++ if (ptr != NULL) closeFunction(ptr); \ + ptr=p; \ + } \ + } + -- cgit v1.2.3