diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2016-06-30 20:26:57 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:31:18 +0200 |
commit | d31c50870d0bee042ce660e445c9294a59a3a65b (patch) | |
tree | 6bfc0de3c95267b401b620c2c67859557dc60f97 /source/l/qca | |
parent | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff) | |
download | current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz |
Slackware 14.2slackware-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! :-)
Diffstat (limited to 'source/l/qca')
-rw-r--r-- | source/l/qca/0011-use-_DEFAULT_SOURCE-instead-of-_BSD_SOURCE.patch | 27 | ||||
-rwxr-xr-x | source/l/qca/qca.SlackBuild | 42 | ||||
-rw-r--r-- | source/l/qca/qca.info | 2 |
3 files changed, 54 insertions, 17 deletions
diff --git a/source/l/qca/0011-use-_DEFAULT_SOURCE-instead-of-_BSD_SOURCE.patch b/source/l/qca/0011-use-_DEFAULT_SOURCE-instead-of-_BSD_SOURCE.patch new file mode 100644 index 00000000..f6514c74 --- /dev/null +++ b/source/l/qca/0011-use-_DEFAULT_SOURCE-instead-of-_BSD_SOURCE.patch @@ -0,0 +1,27 @@ +From 1ff36f4030287f1c263eb344d84cd4a43b1546d2 Mon Sep 17 00:00:00 2001 +From: Rex Dieter <rdieter@math.unl.edu> +Date: Thu, 19 Nov 2015 13:23:16 -0600 +Subject: [PATCH 11/11] use _DEFAULT_SOURCE instead of _BSD_SOURCE + +the former is used in other kde software in general, and +the latter is generally deprecated on modern glibc's +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dbce082..051ae6d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,7 +115,7 @@ endif (WIN32) + + if (CMAKE_COMPILER_IS_GNUCXX) + if (CMAKE_SYSTEM_NAME MATCHES Linux) +- add_definitions (-D_BSD_SOURCE) ++ add_definitions (-D_DEFAULT_SOURCE) + # on arm -Wcast-align throws many internal qt warning + if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align") +-- +2.5.0 + diff --git a/source/l/qca/qca.SlackBuild b/source/l/qca/qca.SlackBuild index 49367ffc..2adbe7e9 100755 --- a/source/l/qca/qca.SlackBuild +++ b/source/l/qca/qca.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,14 +24,14 @@ # No additional license terms and no copyright claim PKGNAM=qca -VERSION=2.0.2 -BUILD=${BUILD:-1} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j6} # Automatically determine architecture for build & packaging: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac @@ -41,8 +41,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} -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" @@ -56,7 +56,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -65,20 +65,32 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} +zcat $CWD/0011-use-_DEFAULT_SOURCE-instead-of-_BSD_SOURCE.patch.gz | patch -p1 --verbose || exit 1 + +mkdir build +cd build + +cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DQCA_MAN_INSTALL_DIR=/usr/man \ + -DQCA_FEATURE_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX}/qt/mkspecs/features/ \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SHARED_LINKER_FLAGS="-lstdc++" \ + -DLIB_SUFFIX="${LIBDIRSUFFIX}" \ + -DQT4_BUILD:BOOL=ON \ + .. || exit 1 make $NUMJOBS || make || exit 1 -make install INSTALL_ROOT=$PKG || exit 1 +make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mv $PKG/usr/share/man $PKG/usr/ -gzip -9 $PKG/usr/man/man?/*.1 +gzip -9 $PKG/usr/man/man?/*.? + +cd .. mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ diff --git a/source/l/qca/qca.info b/source/l/qca/qca.info deleted file mode 100644 index 81e40d37..00000000 --- a/source/l/qca/qca.info +++ /dev/null @@ -1,2 +0,0 @@ -HOMEPAGE="http://delta.affinix.com/qca/" -DOWNLOAD="http://delta.affinix.com/download/qca/2.0/qca-2.0.1.tar.bz2" |