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/imlib | |
parent | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff) | |
download | current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.xz |
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 '')
-rw-r--r-- | source/l/imlib/imlib.mitshm.render.diff | 92 | ||||
-rw-r--r-- | source/l/imlib/slack-desc | 19 | ||||
-rwxr-xr-x | source/l/sbc/sbc.SlackBuild (renamed from source/l/imlib/imlib.SlackBuild) | 82 |
3 files changed, 38 insertions, 155 deletions
diff --git a/source/l/imlib/imlib.mitshm.render.diff b/source/l/imlib/imlib.mitshm.render.diff deleted file mode 100644 index f1c0ef111..000000000 --- a/source/l/imlib/imlib.mitshm.render.diff +++ /dev/null @@ -1,92 +0,0 @@ -diff -up -ru imlib-1.9.15.orig/gdk_imlib/misc.c imlib-1.9.15/gdk_imlib/misc.c ---- imlib-1.9.15.orig/gdk_imlib/misc.c 2002-03-04 18:06:32.000000000 +0100 -+++ imlib-1.9.15/gdk_imlib/misc.c 2007-10-28 14:00:04.000000000 +0100 -@@ -674,6 +674,10 @@ gdk_imlib_init_params(GdkImlibInitParams - visual = gdk_rgb_get_visual(); - id->x.visual = GDK_VISUAL_XVISUAL(visual); /* the visual type */ - id->x.depth = visual->depth; /* the depth of the screen in bpp */ -+ -+ id->x.shm = 0; -+ id->x.shmp = 0; -+ id->max_shm = 0; - #ifdef HAVE_SHM - if (XShmQueryExtension(id->x.disp)) - { -@@ -689,17 +693,14 @@ gdk_imlib_init_params(GdkImlibInitParams - id->x.last_xim = NULL; - id->x.last_sxim = NULL; - id->max_shm = 0x7fffffff; -- if (XShmPixmapFormat(id->x.disp) == ZPixmap) -+ if ((XShmPixmapFormat(id->x.disp) == ZPixmap) && -+ (pm == True)) - id->x.shmp = 1; - } - } - } -- else - #endif -- { -- id->x.shm = 0; -- id->x.shmp = 0; -- } -+ - id->cache.on_image = 0; - id->cache.size_image = 0; - id->cache.num_image = 0; -@@ -935,8 +936,8 @@ gdk_imlib_init_params(GdkImlibInitParams - } - if (p->flags & PARAMS_SHAREDPIXMAPS) - { -- if (id->x.shm) -- id->x.shmp = p->sharedpixmaps; -+ if (!p->sharedpixmaps) -+ id->x.shmp = 0; - } - if (p->flags & PARAMS_PALETTEOVERRIDE) - override = p->paletteoverride; -diff -up -ru imlib-1.9.15.orig/Imlib/misc.c imlib-1.9.15/Imlib/misc.c ---- imlib-1.9.15.orig/Imlib/misc.c 2004-09-21 02:22:59.000000000 +0200 -+++ imlib-1.9.15/Imlib/misc.c 2007-10-28 14:00:23.000000000 +0100 -@@ -675,6 +675,10 @@ Imlib_init_with_params(Display * disp, I - id->x.root = DefaultRootWindow(disp); /* the root window id */ - id->x.visual = DefaultVisual(disp, id->x.screen); /* the visual type */ - id->x.depth = DefaultDepth(disp, id->x.screen); /* the depth of the screen in bpp */ -+ -+ id->x.shm = 0; -+ id->x.shmp = 0; -+ id->max_shm = 0; - #ifdef HAVE_SHM - if (XShmQueryExtension(id->x.disp)) - { -@@ -690,17 +694,14 @@ Imlib_init_with_params(Display * disp, I - id->x.last_xim = NULL; - id->x.last_sxim = NULL; - id->max_shm = 0x7fffffff; -- if (XShmPixmapFormat(id->x.disp) == ZPixmap) -+ if ((XShmPixmapFormat(id->x.disp) == ZPixmap && -+ (pm == True))) - id->x.shmp = 1; - } - } - } -- else - #endif -- { -- id->x.shm = 0; -- id->x.shmp = 0; -- } -+ - id->cache.on_image = 0; - id->cache.size_image = 0; - id->cache.num_image = 0; -@@ -952,8 +953,8 @@ Imlib_init_with_params(Display * disp, I - } - if (p->flags & PARAMS_SHAREDPIXMAPS) - { -- if (id->x.shm) -- id->x.shmp = p->sharedpixmaps; -+ if (!p->sharedpixmaps) -+ id->x.shmp = 0; - } - if (p->flags & PARAMS_PALETTEOVERRIDE) - override = p->paletteoverride; diff --git a/source/l/imlib/slack-desc b/source/l/imlib/slack-desc deleted file mode 100644 index 7f0645514..000000000 --- a/source/l/imlib/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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------------------------------------------------------| -imlib: imlib (image loading and rendering library) -imlib: -imlib: Imlib is a display depth-independent image loading and rendering -imlib: library. Imlib is designed to simplify and speed up the process of -imlib: loading images and obtaining X Window System drawables. Imlib -imlib: provides many simple manipulation routines which can be used for -imlib: common operations. -imlib: -imlib: -imlib: -imlib: diff --git a/source/l/imlib/imlib.SlackBuild b/source/l/sbc/sbc.SlackBuild index d9f2cca3d..bf5a0e874 100755 --- a/source/l/imlib/imlib.SlackBuild +++ b/source/l/sbc/sbc.SlackBuild @@ -1,6 +1,8 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Slackware build script for sbc + +# Copyright 2015 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -9,7 +11,7 @@ # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, @@ -20,26 +22,28 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +PKGNAM=sbc +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} -VERSION=1.9.15 -NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-7} +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" @@ -49,58 +53,48 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-imlib - rm -rf $PKG -mkdir -p $TMP $PKG/usr - +mkdir -p $TMP $PKG cd $TMP -rm -rf imlib-$VERSION -tar xvf $CWD/imlib-$VERSION.tar.?z* || exit 1 -cd imlib-$VERSION -zcat $CWD/imlib.mitshm.render.diff.gz | patch -p1 --verbose || exit 1 - +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . -find . -perm 666 -exec chmod 644 {} \; -find . -perm 664 -exec chmod 644 {} \; -find . -perm 600 -exec chmod 644 {} \; -find . -perm 444 -exec chmod 644 {} \; -find . -perm 400 -exec chmod 644 {} \; -find . -perm 440 -exec chmod 644 {} \; -find . -perm 777 -exec chmod 755 {} \; -find . -perm 775 -exec chmod 755 {} \; -find . -perm 511 -exec chmod 755 {} \; -find . -perm 711 -exec chmod 755 {} \; -find . -perm 555 -exec chmod 755 {} \; +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -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} \ --sysconfdir=/etc \ + --localstatedir=/var \ --mandir=/usr/man \ - --build=${ARCH}-slackware-linux + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$ARCH-slackware-linux \ + --disable-static \ + --disable-tester || exit 1 make $NUMJOBS || make || 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 +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -gzip -9 $PKG/usr/man/man1/* +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -mkdir -p $PKG/usr/doc/imlib-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README \ - doc \ - $PKG/usr/doc/imlib-$VERSION -rm -f $PKG/usr/doc/imlib-$VERSION/doc/Makefile* + AUTHORS COPYING* NEWS README* TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/imlib-$VERSION-$ARCH-$BUILD.txz - +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz |