summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-12-12 20:40:15 +0000
committer Eric Hameleers <alien@slackware.com>2019-12-13 08:59:49 +0100
commit7c3a378a752b9139754ea89ab8e730baf6b271ad (patch)
tree7348debc5dda76df4c97abc5ba1a8d2250d31f53 /source/x
parente37e24f7e55a4939e41cb59ed0ca29b1dccc2fec (diff)
downloadcurrent-7c3a378a752b9139754ea89ab8e730baf6b271ad.tar.gz
current-7c3a378a752b9139754ea89ab8e730baf6b271ad.tar.xz
Thu Dec 12 20:40:15 UTC 201920191212204015
ap/hplip-3.19.12-x86_64-1.txz: Upgraded. ap/pamixer-1.4-x86_64-4.txz: Rebuilt. Recompiled against boost-1.72.0. ap/vim-8.2.0000-x86_64-1.txz: Upgraded. d/bison-3.5-x86_64-1.txz: Upgraded. kde/calligra-2.9.11-x86_64-33.txz: Rebuilt. Recompiled against boost-1.72.0. l/akonadi-1.13.0-x86_64-14.txz: Rebuilt. Recompiled against boost-1.72.0. l/boost-1.72.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/libssh-0.9.3-x86_64-1.txz: Upgraded. This fixes a security issue (low impact according to upstream): Unsanitized location in scp could lead to unwanted command execution. In addition, the 0.9.3 release benefited from a security audit sponsored by the Mozilla Open Source Support program. The audit results were used to improve the overall security and code quality of libssh. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-14889 (* Security fix *) n/libqmi-1.24.2-x86_64-1.txz: Upgraded. x/compiz-0.8.16.1-x86_64-1.txz: Upgraded. x/mesa-19.3.0-x86_64-1.txz: Upgraded. xap/vim-gvim-8.2.0000-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x')
-rwxr-xr-xsource/x/compiz/compiz.SlackBuild139
-rw-r--r--source/x/compiz/slack-desc (renamed from source/x/x11/slack-desc/compiz)8
-rw-r--r--source/x/x11/build/compiz1
-rw-r--r--source/x/x11/configure/compiz16
-rw-r--r--source/x/x11/modularize1
5 files changed, 143 insertions, 22 deletions
diff --git a/source/x/compiz/compiz.SlackBuild b/source/x/compiz/compiz.SlackBuild
new file mode 100755
index 000000000..cecda99a4
--- /dev/null
+++ b/source/x/compiz/compiz.SlackBuild
@@ -0,0 +1,139 @@
+#!/bin/bash
+
+# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 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
+# 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,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=compiz
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i586 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m) ;;
+ esac
+ export ARCH
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+ LIBDIRSUFFIX=""
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \+
+
+if [ ! -r configure ]; then
+ NOCONFIGURE=1 ./autogen.sh
+fi
+
+# Configure, build, and install:
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --mandir=/usr/man \
+ --disable-static \
+ --with-gtk=3.0 \
+ --build=$ARCH-slackware-linux || exit 1
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress manual pages:
+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
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ COPYING* README* TODO NEWS ChangeLog \
+ $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/${PKGNAM}-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+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/source/x/x11/slack-desc/compiz b/source/x/compiz/slack-desc
index c81aae0e9..81cae13d0 100644
--- a/source/x/x11/slack-desc/compiz
+++ b/source/x/compiz/slack-desc
@@ -8,12 +8,12 @@
|-----handy-ruler------------------------------------------------------|
compiz: compiz (OpenGL window and compositing manager)
compiz:
-compiz: Compiz is an OpenGL compositing manager that use
+compiz: Compiz is an OpenGL compositing manager that uses
compiz: GLX_EXT_texture_from_pixmap for binding redirected top-level windows
-compiz: to texture objects. It has a flexible plug-in system and it is designed
-compiz: to run well on most graphics hardware.
-compiz:
+compiz: to texture objects. It has a flexible plug-in system and it is
+compiz: designed to run well on most graphics hardware.
compiz:
+compiz: Homepage: https://github.com/compiz-reloaded/compiz
compiz:
compiz:
compiz:
diff --git a/source/x/x11/build/compiz b/source/x/x11/build/compiz
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/source/x/x11/build/compiz
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/source/x/x11/configure/compiz b/source/x/x11/configure/compiz
deleted file mode 100644
index 8a960f3dc..000000000
--- a/source/x/x11/configure/compiz
+++ /dev/null
@@ -1,16 +0,0 @@
-# Use ./autogen.sh for git, or ./configure for releases:
-CFLAGS=$SLKCFLAGS \
-CXXFLAGS=$SLKCFLAGS \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --infodir=/usr/info \
- --mandir=/usr/man \
- --disable-static \
- --disable-gconf \
- --disable-kde \
- --disable-kde4 \
- --enable-librsvg \
- --build=$ARCH-slackware-linux
diff --git a/source/x/x11/modularize b/source/x/x11/modularize
index f9a11d8bf..4f7ebec0f 100644
--- a/source/x/x11/modularize
+++ b/source/x/x11/modularize
@@ -6,7 +6,6 @@ bdftopcf
beforelight
bigreqsproto
bitmap
-compiz
compositeproto
damageproto
dmxproto