diff options
author | Eric Hameleers <alien@slackware.com> | 2015-09-13 13:04:59 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2015-09-13 13:04:59 +0200 |
commit | 8425a13987c3657bc59791715befd8fe9cbc8c6c (patch) | |
tree | d3939947ab304d80ab9287f17343d3b9964071bf /deps/libproxy | |
parent | 53dc81e7545cf436bfdd0c4ac1e63723e2f2086a (diff) | |
download | ktown-8425a13987c3657bc59791715befd8fe9cbc8c6c.tar.gz ktown-8425a13987c3657bc59791715befd8fe9cbc8c6c.tar.xz |
Updated 'deps' for KDE 5_15.09_02
LoginKit: removed. It was causing a minute-long delay on logout and
display of the 'Leave' menu.
ConsoleKit2 offers a systemd-logind API as well.
ConsoleKit2: rebuilt with patches to make it work correctly
on x86_64 (lib64).
libproxy: added a rebuilt version of Slackware's package with KDE4 support
removed, which prevents crashes in Qt5/KF5 applications which
use libproxy (such as OwnCloud).
Diffstat (limited to '')
-rwxr-xr-x | deps/libproxy/libproxy.SlackBuild (renamed from deps/LoginKit/LoginKit.SlackBuild) | 90 | ||||
-rw-r--r-- | deps/libproxy/libproxy.url | 1 | ||||
-rw-r--r-- | deps/libproxy/slack-desc | 19 |
3 files changed, 54 insertions, 56 deletions
diff --git a/deps/LoginKit/LoginKit.SlackBuild b/deps/libproxy/libproxy.SlackBuild index a1d747c..9af3191 100755 --- a/deps/LoginKit/LoginKit.SlackBuild +++ b/deps/libproxy/libproxy.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2015 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011 Robby Workman Northport, AL, USA +# Copyright 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,45 +21,35 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PKGNAM=LoginKit -VERSION=${VERSION:-f363547_20150221git} -BUILD=${BUILD:-1} +PKGNAM=libproxy +VERSION=${VERSION:-0.4.11} +BUILD=${BUILD:-2} -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then - case "$(uname -m)" in + case "$( uname -m )" in i?86) ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || AR -CH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; esac - export ARCH fi +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" - SLKLDFLAGS="" LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS="" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" - SLKLDFLAGS="" LIBDIRSUFFIX="" fi @@ -67,10 +57,8 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 cd $PKGNAM-$VERSION || exit 1 - -# Fix ownerships and permissions: chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -78,48 +66,38 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Compile and install: -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" -make LIB_DIR=/usr/lib${LIBDIRSUFFIX} || exit 1 -make install DESTDIR=$PKG LIB_DIR=$DESTDIR/usr/lib${LIBDIRSUFFIX} +cmake . \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMODULE_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX}/libproxy/${VERSION}/modules \ + -DPERL_VENDORINSTALL=yes \ + -DWITH_KDE4=OFF \ + || 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 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 -# Compress and link manpages, if any: -if [ -d $PKG/usr/man ]; then - ( cd $PKG/usr/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING README doc/* \ - $PKG/usr/doc/$PKGNAM-$VERSION + AUTHORS COPYING* INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog touch -r ChangeLog $DOCSDIR/ChangeLog fi -# Add a package description: mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/libproxy/libproxy.url b/deps/libproxy/libproxy.url new file mode 100644 index 0000000..3897ae5 --- /dev/null +++ b/deps/libproxy/libproxy.url @@ -0,0 +1 @@ +http://code.google.com/p/libproxy/ diff --git a/deps/libproxy/slack-desc b/deps/libproxy/slack-desc new file mode 100644 index 0000000..05b109e --- /dev/null +++ b/deps/libproxy/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# 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 +# customary to leave one space after the ':'. + + |-----handy-ruler-----------------------------------------------------| +libproxy: libproxy (proxy configuration library) +libproxy: +libproxy: libproxy exists to answer the question: Given a network resource, +libproxy: how do I reach it? It handles all the details, enabling you to get +libproxy: back to programming. Just ask libproxy what proxy to use: you get +libproxy: simple code and your users get correct, consistent behavior and +libproxy: broad infrastructure compatibility. +libproxy: +libproxy: Homepage: http://code.google.com/p/libproxy/ +libproxy: +libproxy: |