diff options
Diffstat (limited to '')
| -rwxr-xr-x | source/xap/blueman/blueman.SlackBuild | 7 | ||||
| -rw-r--r-- | source/xap/xgames/spider.gcc10.diff | 11 | ||||
| -rwxr-xr-x | source/xap/xgames/xgames.SlackBuild | 35 | ||||
| -rw-r--r-- | source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch | 13 | ||||
| -rwxr-xr-x | source/xap/xscreensaver/xscreensaver.SlackBuild | 6 | ||||
| -rw-r--r-- | source/xap/xsnow/slack-desc | 19 | ||||
| -rwxr-xr-x | source/xap/xsnow/xsnow.SlackBuild (renamed from extra/source/pure-alsa-system/xfce4-mixer/xfce4-mixer.SlackBuild) | 114 | ||||
| -rw-r--r-- | source/xap/xsnow/xsnow.url | 1 |
8 files changed, 128 insertions, 78 deletions
diff --git a/source/xap/blueman/blueman.SlackBuild b/source/xap/blueman/blueman.SlackBuild index e7d9c8c89..cfe25a438 100755 --- a/source/xap/blueman/blueman.SlackBuild +++ b/source/xap/blueman/blueman.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=blueman VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -123,6 +123,11 @@ sed -i "s,#!/usr/bin/env python3,#!/usr/bin/python${PYTHON3VER},g" module/_bluem make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Move the dbus config file to the system directory +mkdir -p $PKG/usr/share/dbus-1/system.d/ +mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/ +rmdir --parents $PKG/etc/dbus-1/system.d/ + 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 diff --git a/source/xap/xgames/spider.gcc10.diff b/source/xap/xgames/spider.gcc10.diff new file mode 100644 index 000000000..cbde66d64 --- /dev/null +++ b/source/xap/xgames/spider.gcc10.diff @@ -0,0 +1,11 @@ +--- ./Makefile.orig 2020-12-24 15:54:29.538553593 -0600 ++++ ./Makefile 2020-12-24 15:56:23.320547299 -0600 +@@ -295,7 +295,7 @@ + + ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) +- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) ++ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -fcommon + LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) + LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS) + LDPOSTLIB = diff --git a/source/xap/xgames/xgames.SlackBuild b/source/xap/xgames/xgames.SlackBuild index f688a41ce..6931b8dcd 100755 --- a/source/xap/xgames/xgames.SlackBuild +++ b/source/xap/xgames/xgames.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xgames VERSION=0.3 -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -53,10 +53,11 @@ mkdir -p $TMP $PKG # Build spider: cd $TMP -tar xvf $CWD/spider.tar.gz || exit 1 +tar xvf $CWD/spider.tar.lz || exit 1 cd spider || exit 1 zcat $CWD/spider.diff.gz | patch -p1 --verbose || exit 1 xmkmf +zcat $CWD/spider.gcc10.diff.gz | patch -p1 --verbose || exit 1 make $NUMJOBS || make || exit 1 mkdir -p $PKG/usr/bin cat spider > $PKG/usr/bin/spider @@ -67,7 +68,7 @@ cp -a README* $PKG/usr/doc/xgames-$VERSION/spider # Build maze: cd $TMP -tar xvf $CWD/maze.tar.gz || exit 1 +tar xvf $CWD/maze.tar.lz || exit 1 cd maze || exit 1 zcat $CWD/maze.diff.gz | patch -p1 || exit 1 xmkmf @@ -79,7 +80,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/maze # Build xcolormap: cd $TMP -tar xvf $CWD/xcolormap.tar.gz || exit 1 +tar xvf $CWD/xcolormap.tar.lz || exit 1 cd xcolormap || exit 1 zcat $CWD/xcolormap.diff.gz | patch -p1 || exit 1 make $NUMJOBS || make || exit 1 @@ -89,7 +90,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xcolormap # Build xcuckoo: cd $TMP -tar xvf $CWD/xcuckoo-1.1.tar.gz || exit 1 +tar xvf $CWD/xcuckoo-1.1.tar.lz || exit 1 cd xcuckoo || exit 1 zcat $CWD/xcuckoo.diff.gz | patch -p1 --verbose || exit 1 xmkmf @@ -101,7 +102,7 @@ cp -a CHANGES $PKG/usr/doc/xgames-$VERSION/xcuckoo # Build xlander: cd $TMP -tar xvf $CWD/xlander.tar.gz || exit 1 +tar xvf $CWD/xlander.tar.lz || exit 1 cd xlander || exit 1 zcat $CWD/xlander.fixes.diff.gz | patch -p1 || exit 1 zcat $CWD/xlander-2009-07-18.diff.gz | patch -p1 || exit 1 @@ -114,7 +115,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xlander # Build xminesweep: cd $TMP -tar xvf $CWD/xminesweep3.0.tar.gz || exit 1 +tar xvf $CWD/xminesweep3.0.tar.lz || exit 1 cd xminesweep3.0 || exit 1 xmkmf make $NUMJOBS || make || exit 1 @@ -125,7 +126,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xminesweep # Build xneko: cd $TMP -tar xvf $CWD/xneko.tar.gz || exit 1 +tar xvf $CWD/xneko.tar.lz || exit 1 cd xneko || exit 1 xmkmf make $NUMJOBS || make || exit 1 @@ -136,7 +137,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xneko # Build xroach: cd $TMP -tar xvf $CWD/xroach.tar.gz || exit 1 +tar xvf $CWD/xroach.tar.lz || exit 1 cd xroach || exit 1 xmkmf make $NUMJOBS || make || exit 1 @@ -145,24 +146,13 @@ cat xroach.man | gzip -9c > $PKG/usr/man/man6/xroach.6.gz mkdir -p $PKG/usr/doc/xgames-$VERSION/xroach cp -a README.linux $PKG/usr/doc/xgames-$VERSION/xroach -# Build xsnow: -cd $TMP -tar xvf $CWD/xsnow-1.42.tar.gz || exit 1 -cd xsnow-1.42 || exit 1 -xmkmf -make $NUMJOBS || make || exit 1 -cat xsnow > $PKG/usr/bin/xsnow -cat xsnow.man | gzip -9c > $PKG/usr/man/man6/xsnow.6.gz -mkdir -p $PKG/usr/doc/xgames-$VERSION/xsnow -cp -a README $PKG/usr/doc/xgames-$VERSION/xsnow - # Fix everything up: chmod 755 $PKG/usr/bin/* strip $PKG/usr/bin/* ( cd $PKG/usr/doc - find . -type f -exec chown root.root {} \+ - find . -type f -exec chmod 644 {} \+ + find . -type f -exec chown root.root {} \; + find . -type f -exec chmod 644 {} \; ) mkdir -p $PKG/install @@ -170,4 +160,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/xgames-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch b/source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch new file mode 100644 index 000000000..8a1a0ab9f --- /dev/null +++ b/source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch @@ -0,0 +1,13 @@ +diff -Nur xscreensaver-5.45.orig/driver/screensaver-properties.desktop.in xscreensaver-5.45/driver/screensaver-properties.desktop.in +--- xscreensaver-5.45.orig/driver/screensaver-properties.desktop.in 2009-10-06 21:26:41.000000000 -0500 ++++ xscreensaver-5.45/driver/screensaver-properties.desktop.in 2020-12-15 20:12:13.223955366 -0600 +@@ -2,7 +2,7 @@ + Exec=xscreensaver-demo + Icon=xscreensaver + Terminal=false +-_Name=Screensaver +-_Comment=Change screensaver properties ++_Name=XScreenSaver ++_Comment=Change XScreenSaver properties + Type=Application + Categories=Settings;DesktopSettings;Security;X-XFCE; diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild index cb9c10cdb..46fef08e2 100755 --- a/source/xap/xscreensaver/xscreensaver.SlackBuild +++ b/source/xap/xscreensaver/xscreensaver.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xscreensaver VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -91,6 +91,10 @@ zcat $CWD/xscreensaver.electricsheep.diff.gz | patch -p1 --verbose --backup --su # helpful to distributions. zcat $CWD/xscreensaver.no.expiration.date.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +# Make the description of the xscreensaver settings be clearly for xscreensaver +# as opposed to a generic "screensaver" settings +zcat $CWD/clarify-desc-in-xfce-settings.patch.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/xap/xsnow/slack-desc b/source/xap/xsnow/slack-desc new file mode 100644 index 000000000..9e126a9af --- /dev/null +++ b/source/xap/xsnow/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------------------------------------------------------| +xsnow: xsnow (let it snow on your desktop) +xsnow: +xsnow: XSnow brings snow, trees, reindeer, Santa, and birds to your desktop. +xsnow: +xsnow: Homepage: http://ratrabbit.nl/ratrabbit/xsnow/ +xsnow: +xsnow: +xsnow: +xsnow: +xsnow: +xsnow: diff --git a/extra/source/pure-alsa-system/xfce4-mixer/xfce4-mixer.SlackBuild b/source/xap/xsnow/xsnow.SlackBuild index e9aced1c8..59e6639ee 100755 --- a/extra/source/pure-alsa-system/xfce4-mixer/xfce4-mixer.SlackBuild +++ b/source/xap/xsnow/xsnow.SlackBuild @@ -1,9 +1,6 @@ #!/bin/bash -# Slackware build script for xfce4-mixer - -# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA -# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -12,7 +9,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, @@ -25,101 +22,112 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=xfce4-mixer +PKGNAM=xsnow VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2_alsa} +BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then - case "$( uname -m )" in + case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; + 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 -NUMJOBS=${NUMJOBS:-" -j7 "} +# 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 -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM +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 -mtune=i686" + 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 -# 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 +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 {} \+ - -zcat $CWD/0001-Make-Unique-support-optional.patch | patch -p1 --verbose || exit 1 -zcat $CWD/0001-Use-datadir-xfce4-mixer-as-MIXER_DATADIR.patch | patch -p1 --verbose || exit 1 -zcat $CWD/0001-icons-Makefile.am-Remove-unnecessary-gtk-update-icon.patch | patch -p1 --verbose || exit 1 - -xdt-autogen - + \( -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 {} \+ + +# Configure, build, and install: +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/xfce \ + --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-debug \ - --disable-unique \ + --mandir=/usr/man \ + --with-x \ --build=$ARCH-slackware-linux || exit 1 +make $NUMJOBS gamesdir=/usr/bin || make gamesdir=/usr/bin || exit 1 +make install gamesdir=/usr/bin DESTDIR=$PKG || 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 -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +# 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 -gzip -9 $PKG/usr/man/man?/*.? +# 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 -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS COPYING* HACKING INSTALL NEWS README* THANKS TODO \ - $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 + AUTHORS* ChangeLog Changes COPYING* NEWS* README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xap/xsnow/xsnow.url b/source/xap/xsnow/xsnow.url new file mode 100644 index 000000000..2f6285fcc --- /dev/null +++ b/source/xap/xsnow/xsnow.url @@ -0,0 +1 @@ +https://sourceforge.net/projects/xsnow/files/ |