diff options
Diffstat (limited to 'source/xfce')
61 files changed, 938 insertions, 404 deletions
diff --git a/source/xfce/FTBFSlog b/source/xfce/FTBFSlog index 522490bf7..50cdd0dbe 100644 --- a/source/xfce/FTBFSlog +++ b/source/xfce/FTBFSlog @@ -1,2 +1,2 @@ -Thu Feb 1 01:00:13 UTC 2018 +Sat Dec 5 23:01:14 UTC 2020 All packages tested and found to compile properly. diff --git a/source/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch b/source/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch new file mode 100644 index 000000000..631d059d3 --- /dev/null +++ b/source/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch @@ -0,0 +1,28 @@ +From 32a8e4d331fb06f58f0369e8c3422e2efc8ef56e Mon Sep 17 00:00:00 2001 +From: Nico Kaiser <nico.kaiser@boerse-go.de> +Date: Mon, 27 Apr 2020 18:43:06 +0200 +Subject: [PATCH 1/2] Fix GTK3 dark colors + +--- + light/gtk-3.0/_colors.scss | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/light/gtk-3.0/_colors.scss b/light/gtk-3.0/_colors.scss +index d53071c..5d8a4af 100644 +--- a/light/gtk-3.0/_colors.scss ++++ b/light/gtk-3.0/_colors.scss +@@ -2,9 +2,9 @@ + // it gets @if ed depending on $variant + + +-$base_color: if($variant == 'light', #fcfcfc, #292929); ++$base_color: if($variant == 'light', #fcfcfc, #2d2e30); + $text_color: if($variant == 'light', #212121, white); +-$bg_color: if($variant == 'light', #cecece, #393f3f); ++$bg_color: if($variant == 'light', #cecece, #3b3e3f); + $fg_color: if($variant == 'light', #3c3c3c, #eeeeec); + + $selected_fg_color: #ffffff; +-- +2.29.2 + diff --git a/source/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch b/source/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch new file mode 100644 index 000000000..fbf091c9e --- /dev/null +++ b/source/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch @@ -0,0 +1,25 @@ +From 55c7a77386e440523b4b9bdc27dd4d553f2f8c52 Mon Sep 17 00:00:00 2001 +From: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> +Date: Mon, 8 Jun 2020 23:30:11 +0200 +Subject: [PATCH 2/2] Fix Thunar CSD when not focused (Fixes #274) + +--- + light/gtk-3.0/_xfce.scss | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/light/gtk-3.0/_xfce.scss b/light/gtk-3.0/_xfce.scss +index 5ea4a2b..6c92174 100644 +--- a/light/gtk-3.0/_xfce.scss ++++ b/light/gtk-3.0/_xfce.scss +@@ -149,7 +149,7 @@ wnck-pager { + + /* Thunar's sidebar top border */ + .thunar { +- :backdrop { color: $insensitive_fg_color; } ++ grid :backdrop { color: $insensitive_fg_color; } + toolbar { + border-bottom: none; + +-- +2.29.2 + diff --git a/source/xfce/orage/orage.SlackBuild b/source/xfce/Greybird/Greybird.SlackBuild index 530d269eb..1383c1bcf 100755 --- a/source/xfce/orage/orage.SlackBuild +++ b/source/xfce/Greybird/Greybird.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/bash +#!/bin/sh -# Slackware build script for orage +# Slackware build script for Greybird (Gtk Theme) -# Copyright 2010-2014 Robby Workman, Northport, Alabama, USA +# Copyright 2019 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,17 +24,13 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=orage -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +PKGNAM=Greybird +VERSION=${VERSION:-3.22.12} +BUILD=${BUILD:-1} -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +ARCH=noarch # 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 @@ -44,11 +40,6 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -58,16 +49,27 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +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.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -76,54 +78,40 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/orage.libical3.diff.gz | patch -p1 --verbose || exit 1 +# Include a couple of patches from git: +zcat $CWD/0001-Fix-GTK3-dark-colors.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch.gz | patch -p1 --verbose || exit 1 -# Yes, libical's pkgconfig file is incomplete, it seems -CFLAGS="$SLKCFLAGS -I/usr/include/libical" \ -CXXFLAGS="$SLKCFLAGS -I/usr/include/libical" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-debug \ - --build=$ARCH-slackware-linux || exit 1 + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. -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 -# 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 - mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING* INSTALL NEWS README* 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 +cp -a LICENSE* README.md $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/xfce/Greybird/slack-desc b/source/xfce/Greybird/slack-desc new file mode 100644 index 000000000..8e400d271 --- /dev/null +++ b/source/xfce/Greybird/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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +Greybird: Greybird (Desktop theme suite for Xfce) +Greybird: +Greybird: Greybird theme is a desktop theme suite for Xfce. +Greybird: +Greybird: Homepage: https://github.com/shimmerproject/Greybird +Greybird: +Greybird: +Greybird: +Greybird: +Greybird: +Greybird: diff --git a/source/xfce/elementary-xfce/README b/source/xfce/elementary-xfce/README new file mode 100644 index 000000000..b92d43f3b --- /dev/null +++ b/source/xfce/elementary-xfce/README @@ -0,0 +1,5 @@ +This is an icon-theme maintained with Xfce in mind, but it supports other +desktops like Gnome3 as well. It's a fork of the upstream elementary-project, +which took place because the team decided to drop a lot of desktop-specific +symlinks. This icon-theme is supposed to keep everything working, but +we'll still pull new icons from upstream and integrate them occasionally. diff --git a/source/xfce/elementary-xfce/doinst.sh b/source/xfce/elementary-xfce/doinst.sh new file mode 100644 index 000000000..320b5363d --- /dev/null +++ b/source/xfce/elementary-xfce/doinst.sh @@ -0,0 +1,24 @@ +if [ -e usr/share/icons/elementary-xfce/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/elementary-xfce>/dev/null 2>&1 + fi +fi + +if [ -e usr/share/icons/elementary-xfce-dark/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/elementary-xfce-dark>/dev/null 2>&1 + fi +fi + +if [ -e usr/share/icons/elementary-xfce-darker/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/elementary-xfce-darker>/dev/null 2>&1 + fi +fi + +if [ -e usr/share/icons/elementary-xfce-darkest/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/elementary-xfce-darkest>/dev/null 2>&1 + fi +fi + diff --git a/source/xfce/elementary-xfce/elementary-xfce.SlackBuild b/source/xfce/elementary-xfce/elementary-xfce.SlackBuild new file mode 100755 index 000000000..b998b3600 --- /dev/null +++ b/source/xfce/elementary-xfce/elementary-xfce.SlackBuild @@ -0,0 +1,123 @@ +#!/bin/sh + +# Slackware build script for elementary-xfce + +# Copyright 2019 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2020 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=elementary-xfce +VERSION=${VERSION:-0.15.1} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + 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 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 + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG $TMP/package-optipng +mkdir -p $TMP $PKG +cd $TMP + +# First build a local copy of optipng +rm -rf $(basename $CWD/optipng-*.tar.lz .tar.lz) +tar xvf $CWD/optipng-*.tar.lz || exit 1 +cd optipng-* +./configure || exit 1 +make $NUMJOBS -C src/optipng || exit 1 +mkdir $TMP/package-optipng +cp src/optipng/optipng $TMP/package-optipng || exit 1 + +# Now build elementary-xfce icon theme +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.lz +cd $PKGNAM-$VERSION +chown -R root:root . +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 \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$ARCH-slackware-linux \ + || exit 1 + +sed -i "s,xargs optipng,xargs $TMP/package-optipng/optipng,g" Makefile + +make $NUMJOBS || exit 1 +make install DESTDIR=$PKG || exit 1 + +rm -f $PKG/usr/share/icons/*/{AUTHORS,CONTRIBUTORS,LICENSE} + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS CONTRIBUTORS LICENSE README.md \ + $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/xfce/elementary-xfce/slack-desc b/source/xfce/elementary-xfce/slack-desc new file mode 100644 index 000000000..db787e611 --- /dev/null +++ b/source/xfce/elementary-xfce/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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +elementary-xfce: elementary-xfce (elementary-xfce icon theme) +elementary-xfce: +elementary-xfce: Elementary icons forked, extended, and maintained for Xfce. +elementary-xfce: +elementary-xfce: Homepage: https://github.com/shimmerproject/elementary-xfce +elementary-xfce: +elementary-xfce: +elementary-xfce: +elementary-xfce: +elementary-xfce: +elementary-xfce: diff --git a/source/xfce/exo/exo.SlackBuild b/source/xfce/exo/exo.SlackBuild index 00f254a87..f87ce2bbf 100755 --- a/source/xfce/exo/exo.SlackBuild +++ b/source/xfce/exo/exo.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2013, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2013, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=exo VERSION=${VERSION:-$(echo $PKGNAM-*.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: MARCH=$( uname -m ) @@ -73,7 +73,7 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 -find . -exec touch {} \+ +#find . -exec touch {} \; chown -R root:root . find . \ @@ -123,7 +123,7 @@ if [ -d $PKG/usr/man ]; then fi # We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; # Add a documentation directory. Not all of these files are expected to be # present, but listing them ensures that documentation that might appear and diff --git a/source/xfce/exo/exo.url b/source/xfce/exo/exo.url index 174a28eff..63b021c28 100644 --- a/source/xfce/exo/exo.url +++ b/source/xfce/exo/exo.url @@ -1 +1 @@ -http://archive.xfce.org:/src/xfce/exo/0.12/exo-0.12.11.tar.bz2 +http://archive.xfce.org:/src/xfce/exo/0.12/exo-0.12.5.tar.bz2 diff --git a/source/xfce/garcon/garcon.SlackBuild b/source/xfce/garcon/garcon.SlackBuild index ff9503882..39ea7ce6e 100755 --- a/source/xfce/garcon/garcon.SlackBuild +++ b/source/xfce/garcon/garcon.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=garcon VERSION=${VERSION:-$(echo $PKGNAM-*.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: MARCH=$( uname -m ) @@ -125,7 +125,7 @@ if [ -d $PKG/usr/man ]; then fi # We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; # Add a documentation directory. Not all of these files are expected to be # present, but listing them ensures that documentation that might appear and diff --git a/source/xfce/garcon/garcon.url b/source/xfce/garcon/garcon.url index 369d7a860..9980ede87 100644 --- a/source/xfce/garcon/garcon.url +++ b/source/xfce/garcon/garcon.url @@ -1 +1 @@ -http://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.4.tar.bz2 +https://github.com/xfce-mirror/garcon/releases diff --git a/source/xfce/gtk-xfce-engine/slack-desc b/source/xfce/gtk-xfce-engine/slack-desc deleted file mode 100644 index 74b8d7918..000000000 --- a/source/xfce/gtk-xfce-engine/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------------------------------------------------------| -gtk-xfce-engine: gtk-xfce-engine (Xfce Gtk+ engines) -gtk-xfce-engine: -gtk-xfce-engine: The GTK-Xfce-Engine package contains several GTK+-2/3 themes and the -gtk-xfce-engine: applications and libraries needed to display them. This is useful for -gtk-xfce-engine: customizing the appearance of your Xfce desktop. -gtk-xfce-engine: -gtk-xfce-engine: -gtk-xfce-engine: -gtk-xfce-engine: -gtk-xfce-engine: -gtk-xfce-engine: diff --git a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild index 45a1833d9..8626f95ae 100755 --- a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild +++ b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libxfce4ui VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -126,7 +126,7 @@ if [ -d $PKG/usr/man ]; then fi # We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; # Add a documentation directory. Not all of these files are expected to be # present, but listing them ensures that documentation that might appear and diff --git a/source/xfce/libxfce4util/libxfce4util.SlackBuild b/source/xfce/libxfce4util/libxfce4util.SlackBuild index eb6951c4c..1feb12f5d 100755 --- a/source/xfce/libxfce4util/libxfce4util.SlackBuild +++ b/source/xfce/libxfce4util/libxfce4util.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libxfce4util VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -124,7 +124,7 @@ if [ -d $PKG/usr/man ]; then fi # We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; # Add a documentation directory. Not all of these files are expected to be # present, but listing them ensures that documentation that might appear and diff --git a/source/xfce/mousepad/doinst.sh b/source/xfce/mousepad/doinst.sh new file mode 100644 index 000000000..6fb128315 --- /dev/null +++ b/source/xfce/mousepad/doinst.sh @@ -0,0 +1,16 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi + diff --git a/source/xfce/mousepad/mousepad.SlackBuild b/source/xfce/mousepad/mousepad.SlackBuild new file mode 100755 index 000000000..a12c17b18 --- /dev/null +++ b/source/xfce/mousepad/mousepad.SlackBuild @@ -0,0 +1,123 @@ +#!/bin/bash + +# Copyright 2020 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=mousepad +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 {} \+ + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --enable-gtk3 \ + --enable-dbus \ + --build=$ARCH-slackware-linux || exit 1 +# --disable-schemas-compile \ + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# 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 man 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 \ + AUTHORS COPYING* NEWS README THANKS TODO \ + $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/xfce/mousepad/mousepad.url b/source/xfce/mousepad/mousepad.url new file mode 100644 index 000000000..797da6cce --- /dev/null +++ b/source/xfce/mousepad/mousepad.url @@ -0,0 +1 @@ +https://archive.xfce.org/src/apps/mousepad/0.4/mousepad-0.4.2.tar.bz2 diff --git a/source/xfce/mousepad/slack-desc b/source/xfce/mousepad/slack-desc new file mode 100644 index 000000000..c4d5db24b --- /dev/null +++ b/source/xfce/mousepad/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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +mousepad: mousepad (simple text editor) +mousepad: +mousepad: Mousepad is a simple, fast and easy-to-use text editor +mousepad: for the Xfce desktop environment, based on the Leafpad text editor. +mousepad: +mousepad: Mousepad includes complete support for UTF-8 text, +mousepad: the usual cut/copy/paste functionality, font selection support, etc. +mousepad: +mousepad: Homepage: https://gitlab.xfce.org/apps/mousepad/ +mosuepad: +mousepad: diff --git a/source/xfce/orage/orage.libical3.diff b/source/xfce/orage/orage.libical3.diff deleted file mode 100644 index af962b367..000000000 --- a/source/xfce/orage/orage.libical3.diff +++ /dev/null @@ -1,59 +0,0 @@ -diff -up orage-4.12.1/src/ical-code.c.libical-3.0 orage-4.12.1/src/ical-code.c ---- orage-4.12.1/src/ical-code.c.libical-3.0 2017-11-14 08:41:30.917375493 +0100 -+++ orage-4.12.1/src/ical-code.c 2017-11-14 08:41:56.823375135 +0100 -@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_curr - && (strcmp(g_par.local_timezone, "floating") != 0)) - ctime = icaltime_current_time_with_zone(local_icaltimezone); - else { / * use floating time * / -- ctime.is_utc = 0; - ctime.is_date = 0; - ctime.is_daylight = 0; - ctime.zone = NULL; -@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_a - * when counting alarm time. */ - if (rel == ICAL_RELATED_START) { - per.stime.is_date = 0; -- per.stime.is_utc = 1; - per.stime.is_daylight = 0; - per.stime.zone = utc_icaltimezone; - per.stime.hour = 0; -@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_a - } - else { - per.etime.is_date = 0; -- per.etime.is_utc = 1; - per.etime.is_daylight = 0; - per.etime.zone = utc_icaltimezone; - per.etime.hour = 0; -@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_al - /* HACK: convert to UTC time so that we can use time arithmetic - * when counting alarm time. */ - start_time.is_date = 0; -- start_time.is_utc = 1; - start_time.is_daylight = 0; - start_time.zone = utc_icaltimezone; - start_time.hour = 0; -@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigg - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } -@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop n - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } -@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } diff --git a/source/xfce/orage/slack-desc b/source/xfce/orage/slack-desc deleted file mode 100644 index 5023eae5b..000000000 --- a/source/xfce/orage/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------------------------------------------------------| -orage: orage (Xfce's calendar) -orage: -orage: Orage is a time-managing application for the Xfce desktop environment. -orage: -orage: -orage: -orage: -orage: -orage: -orage: -orage: diff --git a/source/xfce/thunar-volman/slack-desc b/source/xfce/thunar-volman/slack-desc index 1b8871397..4cfee665b 100644 --- a/source/xfce/thunar-volman/slack-desc +++ b/source/xfce/thunar-volman/slack-desc @@ -5,15 +5,15 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------| + |-----handy-ruler------------------------------------------------------| thunar-volman: thunar-volman (Thunar Volume Manager Plugin) -thunar-volman: -thunar-volman: thunar-volman is an extension for the Thunar File Manager, -thunar-volman: which enables automatic management of removable drives and -thunar-volman: media. -thunar-volman: -thunar-volman: -thunar-volman: -thunar-volman: -thunar-volman: -thunar-volman: +thunar-volman: +thunar-volman: thunar-volman is an extension for the Thunar File Manager, which +thunar-volman: enables automatic management of removable drives and media. +thunar-volman: +thunar-volman: +thunar-volman: +thunar-volman: +thunar-volman: +thunar-volman: +thunar-volman: diff --git a/source/xfce/thunar-volman/thunar-volman.SlackBuild b/source/xfce/thunar-volman/thunar-volman.SlackBuild index b00f2bf68..dc0734658 100755 --- a/source/xfce/thunar-volman/thunar-volman.SlackBuild +++ b/source/xfce/thunar-volman/thunar-volman.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=thunar-volman VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/xfce/thunar-volman/thunar-volman.url b/source/xfce/thunar-volman/thunar-volman.url deleted file mode 100644 index 51224d39c..000000000 --- a/source/xfce/thunar-volman/thunar-volman.url +++ /dev/null @@ -1 +0,0 @@ -http://archive.xfce.org/src/xfce/thunar-volman/0.9/thunar-volman-0.9.5.tar.bz2 diff --git a/source/xfce/thunar/thunar.SlackBuild b/source/xfce/thunar/thunar.SlackBuild index 7d46bc4fe..a0d457936 100755 --- a/source/xfce/thunar/thunar.SlackBuild +++ b/source/xfce/thunar/thunar.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=thunar VERSION=${VERSION:-$(echo $PKGNAM-*.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: MARCH=$( uname -m ) diff --git a/source/xfce/thunar/thunar.url b/source/xfce/thunar/thunar.url index cbc5614ff..4cc136db0 100644 --- a/source/xfce/thunar/thunar.url +++ b/source/xfce/thunar/thunar.url @@ -1 +1 @@ -http://archive.xfce.org/src/xfce/thunar/1.8/thunar-1.8.16.tar.bz2 +https://archive.xfce.org/src/xfce/thunar/1.8/thunar-1.8.13.tar.bz2 diff --git a/source/xfce/tumbler/tumbler.SlackBuild b/source/xfce/tumbler/tumbler.SlackBuild index e717911e7..7659fb893 100755 --- a/source/xfce/tumbler/tumbler.SlackBuild +++ b/source/xfce/tumbler/tumbler.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2013, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2013, 2015, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tumbler VERSION=${VERSION:-$(echo $PKGNAM-*.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: MARCH=$( uname -m ) @@ -125,7 +125,7 @@ if [ -d $PKG/usr/man ]; then fi # We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; # Add a documentation directory. Not all of these files are expected to be # present, but listing them ensures that documentation that might appear and diff --git a/source/xfce/tumbler/tumbler.url b/source/xfce/tumbler/tumbler.url index e4acc3764..8cc2fe2bb 100644 --- a/source/xfce/tumbler/tumbler.url +++ b/source/xfce/tumbler/tumbler.url @@ -1 +1 @@ -http://archive.xfce.org/src/xfce/tumbler/0.2/tumbler-0.2.9.tar.bz2 +http://archive.xfce.org/src/apps/tumbler/0.2/tumbler-0.2.3.tar.bz2 diff --git a/source/xfce/xfce-build-all.sh b/source/xfce/xfce-build-all.sh deleted file mode 100755 index 4db2edf96..000000000 --- a/source/xfce/xfce-build-all.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh - -# Copyright 2012, 2015, 2016, 2018 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. - -# Set to 1 if you'd like to install/upgrade package as they are built. -# This is recommended. -INST=1 - -TMP=${TMP:-/tmp} - -for package in \ - xfce4-dev-tools \ - libxfce4util \ - xfconf \ - libxfce4ui \ - exo \ - garcon \ - gtk-xfce-engine \ - xfce4-panel \ - thunar \ - thunar-volman \ - tumbler \ - xfce4-appfinder \ - xfce4-power-manager \ - xfce4-settings \ - xfdesktop \ - xfwm4 \ - xfce4-session \ - xfce4-terminal \ - xfce4-notifyd \ - orage \ - xfce4-pulseaudio-plugin \ - xfce4-clipman-plugin \ - xfce4-screenshooter \ - xfce4-systemload-plugin \ - xfce4-taskmanager \ - xfce4-weather-plugin \ - ; do - cd $package || exit 1 - ./${package}.SlackBuild || ( touch /tmp/${package}.failed ; exit 1 ) || exit 1 - if [ "$INST" = "1" ]; then - PACKAGE="$(ls -t $TMP/$(ls ${package}*.xz | rev | cut -f2- -d - | rev)-*txz | head -n 1)" - if [ -f $PACKAGE ]; then - upgradepkg --install-new --reinstall $PACKAGE - else - echo "Error: package to upgrade "$PACKAGE" not found in $TMP" - exit 1 - fi - fi - cd .. -done diff --git a/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild b/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild index 47af2d4ec..26ffc4e4f 100755 --- a/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild +++ b/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-appfinder VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -118,7 +118,7 @@ if [ -d $PKG/usr/man ]; then fi # We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; # Add a documentation directory. Not all of these files are expected to be # present, but listing them ensures that documentation that might appear and diff --git a/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild b/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild index 4a57e00c8..e2f0f2d31 100755 --- a/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild +++ b/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-dev-tools VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -118,7 +118,7 @@ if [ -d $PKG/usr/man ]; then fi # We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; # Add a documentation directory. Not all of these files are expected to be # present, but listing them ensures that documentation that might appear and diff --git a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild index a70a52a7e..df8dda2d8 100755 --- a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild +++ b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for Xfce4-notifyd # Copyright 2008 Frank Caraballo <fecaraballo{at}gmail{dot}com> -# Copyright 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -83,7 +83,7 @@ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/xfce \ + --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --enable-debug=no \ diff --git a/source/xfce/xfce4-panel-profiles/doinst.sh b/source/xfce/xfce4-panel-profiles/doinst.sh new file mode 100644 index 000000000..4e8ba7071 --- /dev/null +++ b/source/xfce/xfce4-panel-profiles/doinst.sh @@ -0,0 +1,4 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + diff --git a/source/xfce/xfce4-panel-profiles/slack-desc b/source/xfce/xfce4-panel-profiles/slack-desc new file mode 100644 index 000000000..15d98b284 --- /dev/null +++ b/source/xfce/xfce4-panel-profiles/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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +xfce4-panel-profiles: xfce4-panel-profiles (simple app to manage Xfce panel layouts) +xfce4-panel-profiles: +xfce4-panel-profiles: xfce4-panel-profiles (formerly known as xfpanel-switch) is a simple +xfce4-panel-profiles: application to manage Xfce panel layouts. +xfce4-panel-profiles: +xfce4-panel-profiles: With the modular Xfce Panel, a multitude of panel layouts can be +xfce4-panel-profiles: created. This tool makes it possible to backup, restore, import, +xfce4-panel-profiles: and export these panel layouts. +xfce4-panel-profiles: +xfce4-panel-profiles: Homepage: https://git.xfce.org/apps/xfce4-panel-profiles +xfce4-panel-profiles: diff --git a/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild b/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild index 979c88b66..d2326d423 100755 --- a/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild +++ b/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2019, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,19 +22,17 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=gtk-xfce-engine -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +PKGNAM=xfce4-panel-profiles +VERSION=${VERSION:-$(echo xfce4-panel-profiles-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + *) export ARCH=$( uname -m ) ;; esac fi @@ -46,8 +44,6 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -62,16 +58,17 @@ else LIBDIRSUFFIX="" fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM +PKG=$TMP/package-xfce4-panel-profiles rm -rf $PKG -mkdir -p $TMP $PKG - +mkdir -p $TMP $PKG/usr cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 +rm -rf xfce4-panel-profiles-$VERSION +tar xvf $CWD/xfce4-panel-profiles-$VERSION.tar.?z* || exit 1 +cd xfce4-panel-profiles-$VERSION || exit 1 chown -R root:root . find . \ @@ -80,29 +77,20 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Configure: +# Configure, build, and install: CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-static \ - --disable-debug \ - --build=$ARCH-slackware-linux || exit 1 - -# Build and install: -make $NUMJOBS || make || exit 1 +CXXFLAGS="$SLKCFLAGS" \ +./configure --prefix=/usr --python=python3 || exit 1 +make $NUMJOBS || exit 1 make install DESTDIR=$PKG || exit 1 -# Strip binaries: -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) +# Relocate man pages: +mv $PKG/usr/share/man $PKG/usr -# Compress and if needed symlink the man pages: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# 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 @@ -117,18 +105,11 @@ if [ -d $PKG/usr/man ]; then ) fi -# We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ - -# Add a documentation directory. Not all of these files are expected to be -# present, but listing them ensures that documentation that might appear and -# disappear from version to version will not be missed. -mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +rm -rf $PKG/usr/share/doc +mkdir -p $PKG/usr/doc/xfce4-panel-profiles-$VERSION cp -a \ - AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ - NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ - $PKG/usr/doc/${PKGNAM}-$VERSION - + AUTHORS COPYING* NEWS README* TODO \ + $PKG/usr/doc/xfce4-panel-profiles-$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 @@ -139,6 +120,8 @@ fi 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 +/sbin/makepkg -l y -c n --prepend $TMP/xfce4-panel-profiles-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/xfce/xfce4-panel/xfce4-panel.SlackBuild b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild index da610a9bf..e737f273a 100755 --- a/source/xfce/xfce4-panel/xfce4-panel.SlackBuild +++ b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-panel VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -93,7 +93,6 @@ CFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PKGNAM-$VERSION \ --disable-static \ --disable-debug \ - --enable-gtk3 \ --build=$ARCH-slackware-linux || exit 1 # Build and install: @@ -125,7 +124,7 @@ if [ -d $PKG/usr/man ]; then fi # We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; # Add a documentation directory. Not all of these files are expected to be # present, but listing them ensures that documentation that might appear and diff --git a/source/xfce/xfce4-power-manager/slack-desc b/source/xfce/xfce4-power-manager/slack-desc index 1d3144dc9..0d33da790 100644 --- a/source/xfce/xfce4-power-manager/slack-desc +++ b/source/xfce/xfce4-power-manager/slack-desc @@ -5,11 +5,11 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------| + |-----handy-ruler------------------------------------------------------| xfce4-power-manager: xfce4-power-manager (Power Management Daemon for Xfce) xfce4-power-manager: -xfce4-power-manager: xfce4-power-manager makes power management functions (such as -xfce4-power-manager: suspend and hibernate) easy inside the Xfce Desktop Environment. +xfce4-power-manager: xfce4-power-manager makes power management functions (such as suspend +xfce4-power-manager: and hibernate) easy inside the Xfce Desktop Environment. xfce4-power-manager: xfce4-power-manager: xfce4-power-manager: diff --git a/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild b/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild index 12b55a2a6..b2a764548 100755 --- a/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild +++ b/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for xfce4-power-manager # Copyright 2006-2012 Robby Workman Northport, Alabama, USA -# Copyright 2009, 2010, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-power-manager VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url index b5524c521..4376b0a53 100644 --- a/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url +++ b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url @@ -1 +1 @@ -http://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.2.tar.bz2 +http://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.0.tar.bz2 diff --git a/source/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch b/source/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch new file mode 100644 index 000000000..8db50475b --- /dev/null +++ b/source/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch @@ -0,0 +1,33 @@ +From f596f888a2b6e6598b9d0e4f0200b60e7f9eef64 Mon Sep 17 00:00:00 2001 +From: Shawn Anastasio <shawn@anastas.io> +Date: Sun, 6 Sep 2020 19:33:12 +0000 +Subject: [PATCH] Catch gs_listener_dbus_init failures + +In cases where the dbus connection fails, gs_listener_dbus_init +will fail and return FALSE. Previously, this status code was not +checked in the gs_listener constructor, resulting in a silent failure +that eventually resulted in a Segmentation Fault when the listener's +system_connection pointer gets used. + +Add a g_assert to ensure gs_listener_dbus_init succeeds, or bail out +gracefully on failures. +--- + src/gs-listener-dbus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c +index 6307324..7aebe00 100644 +--- a/src/gs-listener-dbus.c ++++ b/src/gs-listener-dbus.c +@@ -2196,7 +2196,7 @@ gs_listener_init (GSListener *listener) { + #endif + listener->priv->prefs = gs_prefs_new(); + +- gs_listener_dbus_init (listener); ++ g_assert (gs_listener_dbus_init (listener)); + + init_session_id (listener); + +-- +2.29.2 + diff --git a/source/xfce/xfce4-screensaver/slack-desc b/source/xfce/xfce4-screensaver/slack-desc new file mode 100644 index 000000000..4c5817e73 --- /dev/null +++ b/source/xfce/xfce4-screensaver/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------------------------------------------------------| +xfce4-screensaver: xfce4-screensaver (screen saver and locker for Xfce) +xfce4-screensaver: +xfce4-screensaver: xfce4-screensaver is a screen saver and locker that aims to have +xfce4-screensaver: simple, sane, secure defaults and be well integrated with the desktop. +xfce4-screensaver: +xfce4-screensaver: This project is a port of MATE Screensaver. It has been tightly +xfce4-screensaver: integrated with the Xfce desktop, utilizing Xfce libraries and the +xfce4-screensaver: Xfconf configuration backend. +xfce4-screensaver: +xfce4-screensaver: +xfce4-screensaver: diff --git a/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild new file mode 100755 index 000000000..22165e39f --- /dev/null +++ b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild @@ -0,0 +1,147 @@ +#!/bin/bash + +# Slackware build script for xfce4-screensaver + +# Copyright 2019 Robby Workman, Tuscaloosa, Alabama, 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=xfce4-screensaver +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*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; + esac +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) "} + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +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 {} \+ + +# Revert this one: https://gitlab.xfce.org/apps/xfce4-screensaver/-/issues/66 +zcat $CWD/0001-Catch-gs_listener_dbus_init-failures.patch.gz | patch -p1 -R || exit 1 + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --enable-shared=yes \ + --enable-static=no \ + --enable-debug=no \ + --enable-pam \ + --with-mit-ext \ + --enable-locking \ + --build=$ARCH-slackware-linux || 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 || true + +# 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 + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +if [ -d $PKG/usr/share/doc/xfce4-screensaver ]; then # --docdir was ignored + mv $PKG/usr/share/doc/xfce4-screensaver/* $PKG/usr/doc/$PKGNAM-$VERSION + ( cd $PKG/usr/share ; rmdir -p doc/xfce4-screensaver ) +fi + +# 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 +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/xfce/xfce4-screenshooter/xfce4-screenshooter.url b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url index fedac3cb4..4ac1f3abb 100644 --- a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url +++ b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url @@ -1 +1 @@ -http://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.5.tar.bz2 +http://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.3.tar.bz2 diff --git a/source/xfce/xfce4-session/xfce4-session.SlackBuild b/source/xfce/xfce4-session/xfce4-session.SlackBuild index 30e951f8b..51578b8e4 100755 --- a/source/xfce/xfce4-session/xfce4-session.SlackBuild +++ b/source/xfce/xfce4-session/xfce4-session.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2013, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2013, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-session VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -121,7 +121,7 @@ if [ -d $PKG/usr/man ]; then fi # We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; # Add a documentation directory. Not all of these files are expected to be # present, but listing them ensures that documentation that might appear and diff --git a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild index 540c178f7..290916b5f 100755 --- a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild +++ b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -80,7 +80,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Set Greybird (GTK theme) and elementary-xfce (icon theme) as system defaults zcat $CWD/xfce4-settings.theme.diff.gz | patch -p1 --verbose || exit 1 + zcat $CWD/xfce4-settings.xft.defaults.diff.gz | patch -p1 --verbose || exit 1 # Configure: @@ -123,7 +125,7 @@ if [ -d $PKG/usr/man ]; then fi # We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; # Add a documentation directory. Not all of these files are expected to be # present, but listing them ensures that documentation that might appear and diff --git a/source/xfce/xfce4-settings/xfce4-settings.theme.diff b/source/xfce/xfce4-settings/xfce4-settings.theme.diff index 7b18303bd..898887846 100644 --- a/source/xfce/xfce4-settings/xfce4-settings.theme.diff +++ b/source/xfce/xfce4-settings/xfce4-settings.theme.diff @@ -7,8 +7,8 @@ diff -Nur xfce4-settings-4.11.4.orig/xfsettingsd/xsettings.xml xfce4-settings-4. <property name="Net" type="empty"> - <property name="ThemeName" type="empty"/> - <property name="IconThemeName" type="empty"/> -+ <property name="ThemeName" type="string" value="Adwaita"/> -+ <property name="IconThemeName" type="string" value="Adwaita"/> ++ <property name="ThemeName" type="string" value="Greybird"/> ++ <property name="IconThemeName" type="string" value="elementary-xfce-dark"/> <property name="DoubleClickTime" type="int" value="400"/> <property name="DoubleClickDistance" type="int" value="5"/> <property name="DndDragThreshold" type="int" value="8"/> diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild index 224c0846e..d960ba4fe 100755 --- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild +++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-systemload-plugin -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -69,7 +69,7 @@ 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.lz || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild index 021b4b02c..61bc620fe 100755 --- a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild +++ b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for xfce4-terminal # Copyright 2010-2014 Robby Workman, Northport, Alabama, USA -# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/source/xfce/xfce4-terminal/xfce4-terminal.url b/source/xfce/xfce4-terminal/xfce4-terminal.url index 400bafb0c..25ecf17de 100644 --- a/source/xfce/xfce4-terminal/xfce4-terminal.url +++ b/source/xfce/xfce4-terminal/xfce4-terminal.url @@ -1 +1 @@ -http://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.8.tar.bz2 +http://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.7.4.tar.bz2 diff --git a/source/xfce/xfce4-weather-plugin/update-met_no-API.patch b/source/xfce/xfce4-weather-plugin/update-met_no-API.patch deleted file mode 100644 index 3cfe31215..000000000 --- a/source/xfce/xfce4-weather-plugin/update-met_no-API.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 139545eeda3cff72dc7148cd8765a5650575e661 Mon Sep 17 00:00:00 2001 -From: Olivier Duchateau <duchateau.olivier@gmail.com> -Date: Sun, 22 Dec 2019 19:29:58 +0100 -Subject: [PATCH] Switch to 'locationforecast' product - ---- - panel-plugin/weather.c | 8 +++++--- - panel-plugin/weather.h | 1 + - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c -index be745b3..7d79566 100644 ---- a/panel-plugin/weather.c -+++ b/panel-plugin/weather.c -@@ -588,6 +588,7 @@ cb_weather_update(SoupSession *session, - static gboolean - update_handler(plugin_data *data) - { -+ gchar *api_version = FORECAST_API; - gchar *url; - gboolean night_time; - time_t now_t; -@@ -653,9 +654,10 @@ update_handler(plugin_data *data) - data->weather_update->started = TRUE; - - /* build url */ -- url = g_strdup_printf("https://api.met.no/weatherapi" -- "/locationforecastlts/1.3/?lat=%s&lon=%s&" -- "msl=%d", -+ url = g_strdup_printf("https://api.met.no" -+ "/weatherapi/locationforecast/%s/" -+ "?lat=%s&lon=%s&msl=%d", -+ api_version, - data->lat, data->lon, data->msl); - - /* start receive thread */ -diff --git a/panel-plugin/weather.h b/panel-plugin/weather.h -index 86629c7..2723fc4 100644 ---- a/panel-plugin/weather.h -+++ b/panel-plugin/weather.h -@@ -31,6 +31,7 @@ - #define MAX_FORECAST_DAYS 10 - #define DEFAULT_FORECAST_DAYS 5 - #define MAX_SCROLLBOX_LINES 10 -+#define FORECAST_API "1.9" - - G_BEGIN_DECLS - --- -2.24.1 - diff --git a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild index 73fab2fc6..073168233 100755 --- a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild +++ b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xfce4-weather-plugin -# Copyright 2006-2012 Robby Workman, Northport, Alabama, USA +# Copyright 2006-2018 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -69,7 +69,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -78,8 +78,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/update-met_no-API.patch.gz | patch -p1 --verbose || exit 1 - GEONAMES_USERNAME="slackware" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url index 9ee0ef010..f6c688609 100644 --- a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url +++ b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url @@ -1 +1 @@ -http://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/ +https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/ diff --git a/source/xfce/xfce4-whiskermenu-plugin/doinst.sh b/source/xfce/xfce4-whiskermenu-plugin/doinst.sh new file mode 100644 index 000000000..3e5691a05 --- /dev/null +++ b/source/xfce/xfce4-whiskermenu-plugin/doinst.sh @@ -0,0 +1,9 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/source/xfce/xfce4-whiskermenu-plugin/slack-desc b/source/xfce/xfce4-whiskermenu-plugin/slack-desc new file mode 100644 index 000000000..eaef5a40c --- /dev/null +++ b/source/xfce/xfce4-whiskermenu-plugin/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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +xfce4-whiskermenu-plugin: xfce4-whiskermenu-plugin (alternate application launcher for Xfce) +xfce4-whiskermenu-plugin: +xfce4-whiskermenu-plugin: Whisker Menu is an alternate application launcher for Xfce. When you +xfce4-whiskermenu-plugin: open it you are shown a list of applications you have marked as +xfce4-whiskermenu-plugin: favorites. You can browse through all of your installed applications +xfce4-whiskermenu-plugin: by clicking on the category buttons on the side. Top level categories +xfce4-whiskermenu-plugin: make browsing fast, and simple to switch between. Additionally, +xfce4-whiskermenu-plugin: Whisker Menu keeps a list of the last ten applications +xfce4-whiskermenu-plugin: that you've launched from it. +xfce4-whiskermenu-plugin: +xfce4-whiskermenu-plugin: Homepage: http://gottcode.org/xfce4-whiskermenu-plugin diff --git a/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild new file mode 100755 index 000000000..e9422409b --- /dev/null +++ b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild @@ -0,0 +1,129 @@ +#!/bin/bash + +# Slackware build script for xfce4-whiskermenu-plugin + +# Copyright 2018, 2020 Patrick J. Volkerding, Sebeka, MN, 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=xfce4-whiskermenu-plugin +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + *) export ARCH=$( uname -m ) ;; + esac +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) "} + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP || exit 1 +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 {} \+ + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DCMAKE_BUILD_TYPE=Release .. + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd .. + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# 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 + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html +cp -a \ + AUTHORS COPYING* NEWS README* 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 + +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/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.url b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.url new file mode 100644 index 000000000..e8d56c2dc --- /dev/null +++ b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.url @@ -0,0 +1 @@ +https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/ diff --git a/source/xfce/xfconf/xfconf.SlackBuild b/source/xfce/xfconf/xfconf.SlackBuild index 30b288441..e99817e67 100755 --- a/source/xfce/xfconf/xfconf.SlackBuild +++ b/source/xfce/xfconf/xfconf.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfconf VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -88,6 +88,7 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ + --enable-gsettings-backend \ --disable-static \ --disable-debug \ --build=$ARCH-slackware-linux || exit 1 @@ -121,7 +122,7 @@ if [ -d $PKG/usr/man ]; then fi # We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; # Add a documentation directory. Not all of these files are expected to be # present, but listing them ensures that documentation that might appear and diff --git a/source/xfce/xfdesktop/xfdesktop.SlackBuild b/source/xfce/xfdesktop/xfdesktop.SlackBuild index c6a9c9827..e0648495c 100755 --- a/source/xfce/xfdesktop/xfdesktop.SlackBuild +++ b/source/xfce/xfdesktop/xfdesktop.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfdesktop -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +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: @@ -70,7 +70,7 @@ 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.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . @@ -118,7 +118,7 @@ if [ -d $PKG/usr/man ]; then fi # We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; # Add a documentation directory. Not all of these files are expected to be # present, but listing them ensures that documentation that might appear and diff --git a/source/xfce/xfdesktop/xfdesktop.url b/source/xfce/xfdesktop/xfdesktop.url deleted file mode 100644 index d4f9f65d8..000000000 --- a/source/xfce/xfdesktop/xfdesktop.url +++ /dev/null @@ -1 +0,0 @@ -http://archive.xfce.org/src/xfce/xfdesktop/4.12/xfdesktop-4.12.5.tar.bz2 diff --git a/source/xfce/xfwm4/xfwm4.SlackBuild b/source/xfce/xfwm4/xfwm4.SlackBuild index f17f2d2e6..bb5fd18f9 100755 --- a/source/xfce/xfwm4/xfwm4.SlackBuild +++ b/source/xfce/xfwm4/xfwm4.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012, 2013, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2013, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -122,7 +122,7 @@ if [ -d $PKG/usr/man ]; then fi # We don't want icon caches: -find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+ +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; # Add a documentation directory. Not all of these files are expected to be # present, but listing them ensures that documentation that might appear and |