From 663acf19d19b94b04e9cdd16026099caf0289aa0 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Sun, 8 Nov 2015 08:02:00 +0700 Subject: [PATCH] MATE: Upgrade to 1.17.0, enable GTK+3-build and provide HELP files. atril: Changed dep to webkit2gtk. mate-calc: Added caja-actions: Added galculator: Removed doinst: use -f to force icon cache generation Signed-off-by: Willy Sudiarto Raharjo --- GIT_BRANCHES.TXT | 46 +- MATE-1.16-CHANGES.TXT | 9 - MATE-1.18-CHANGES.TXT | 14 + MATE-1.16-DEPS.TXT => MATE-1.18-DEPS.TXT | 4 +- README.TXT | 2 +- base/caja/caja.SlackBuild | 6 +- base/caja/doinst.sh | 2 +- base/engrampa/doinst.sh | 2 +- base/engrampa/engrampa.SlackBuild | 6 +- base/eom/doinst.sh | 2 +- base/eom/eom.SlackBuild | 4 +- base/libmatekbd/doinst.sh | 2 +- base/libmatekbd/libmatekbd.SlackBuild | 11 +- base/libmatemixer/libmatemixer.SlackBuild | 8 +- base/libmateweather/doinst.sh | 2 +- base/libmateweather/libmateweather.SlackBuild | 6 +- base/marco/doinst.sh | 2 +- base/marco/marco.SlackBuild | 8 +- .../mate-backgrounds.SlackBuild | 6 +- base/mate-common/mate-common.SlackBuild | 6 +- base/mate-control-center/doinst.sh | 2 +- .../mate-control-center.SlackBuild | 5 +- base/mate-desktop/doinst.sh | 2 +- base/mate-desktop/mate-desktop.SlackBuild | 7 +- base/mate-icon-theme/doinst.sh | 6 - .../mate-icon-theme.SlackBuild | 7 +- base/mate-icon-theme/mate.svg | 178 ------- base/mate-media/doinst.sh | 2 +- base/mate-media/mate-media.SlackBuild | 6 +- base/mate-menus/mate-menus.SlackBuild | 6 +- base/mate-notification-daemon/doinst.sh | 2 +- .../mate-notification-daemon.SlackBuild | 4 +- base/mate-panel/doinst.sh | 2 +- base/mate-panel/mate-panel.SlackBuild | 6 +- base/mate-polkit/mate-polkit.SlackBuild | 6 +- base/mate-power-manager/ck2.patch | 249 ++++++++++ base/mate-power-manager/doinst.sh | 2 +- .../mate-power-manager.SlackBuild | 6 +- base/mate-screensaver/doinst.sh | 2 +- .../mate-screensaver.SlackBuild | 4 +- base/mate-session-manager/ck2.patch | 468 ++++++++++++++++++ base/mate-session-manager/doinst.sh | 2 +- .../mate-session-manager.SlackBuild | 6 +- base/mate-settings-daemon/doinst.sh | 2 +- .../mate-settings-daemon.SlackBuild | 4 +- base/mate-system-monitor/doinst.sh | 2 +- .../mate-system-monitor.SlackBuild | 8 +- base/mate-terminal/doinst.sh | 2 +- base/mate-terminal/mate-terminal.SlackBuild | 4 +- deps/gksu/gksu.SlackBuild | 2 +- deps/glade/doinst.sh | 2 +- deps/gssdp/gssdp.SlackBuild | 2 +- deps/gupnp/gupnp.SlackBuild | 2 +- deps/libgksu/doinst.sh | 2 +- deps/libgtop/libgtop.SlackBuild | 2 +- deps/libgxps/libgxps.SlackBuild | 2 +- deps/libpeas/doinst.sh | 2 +- deps/libunique/libunique.SlackBuild | 2 +- deps/vte3/vte3.SlackBuild | 2 +- deps/yelp-tools/yelp-tools.SlackBuild | 2 +- deps/yelp-xsl/yelp-xsl.SlackBuild | 2 +- deps/zenity/zenity.SlackBuild | 1 - extra/atril/atril.SlackBuild | 8 +- extra/atril/doinst.sh | 2 +- extra/caja-dropbox/caja-dropbox.SlackBuild | 6 +- extra/caja-dropbox/doinst.sh | 2 +- .../caja-extensions.SlackBuild | 6 +- extra/galculator/doinst.sh | 3 - extra/galculator/slack-desc | 19 - extra/mate-applets/doinst.sh | 2 +- extra/mate-applets/mate-applets.SlackBuild | 8 +- extra/mate-calc/doinst.sh | 19 + .../mate-calc.SlackBuild} | 68 +-- extra/mate-calc/slack-desc | 12 + extra/mate-icon-theme-faenza/doinst.sh | 2 +- .../mate-icon-theme-faenza.SlackBuild | 2 +- extra/mate-sensors-applet/doinst.sh | 2 +- .../mate-sensors-applet.SlackBuild | 4 +- extra/mate-utils/doinst.sh | 2 +- extra/mate-utils/mate-utils.SlackBuild | 7 +- extra/mozo/doinst.sh | 2 +- extra/mozo/mozo.SlackBuild | 6 +- extra/pluma/doinst.sh | 2 +- extra/pluma/pluma.SlackBuild | 6 +- mate-build-deps.sh | 1 + mate-build-extra.sh | 3 +- testing/libindicator/libindicator.SlackBuild | 8 +- .../mate-indicator-applet.SlackBuild | 13 +- .../mate-user-guide.SlackBuild | 6 +- .../mate-user-share.SlackBuild | 5 +- testing/numix-icon-theme-circle/doinst.sh | 2 +- testing/numix-icon-theme-shine/doinst.sh | 2 +- testing/numix-icon-theme/doinst.sh | 2 +- testing/yelp/doinst.sh | 2 +- testing/yelp/yelp.SlackBuild | 6 +- 95 files changed, 973 insertions(+), 442 deletions(-) delete mode 100644 MATE-1.16-CHANGES.TXT create mode 100644 MATE-1.18-CHANGES.TXT rename MATE-1.16-DEPS.TXT => MATE-1.18-DEPS.TXT (80%) delete mode 100644 base/mate-icon-theme/mate.svg create mode 100644 base/mate-power-manager/ck2.patch create mode 100644 base/mate-session-manager/ck2.patch delete mode 100644 extra/galculator/doinst.sh delete mode 100644 extra/galculator/slack-desc create mode 100644 extra/mate-calc/doinst.sh rename extra/{galculator/galculator.SlackBuild => mate-calc/mate-calc.SlackBuild} (51%) create mode 100644 extra/mate-calc/slack-desc diff --git a/GIT_BRANCHES.TXT b/GIT_BRANCHES.TXT index 2def237..34b128e 100644 --- a/GIT_BRANCHES.TXT +++ b/GIT_BRANCHES.TXT @@ -7,54 +7,32 @@ MATE's wiki: http://wiki.mate-desktop.org/dev-doc. Currently, there are three branches in the MSB GIT repository: - master: The MSB development branch. It represents the most up-to-date - code, but no binary packages are built from this branch. Building from - this branch may or may not work. This is where the next stable release - will come from. Please use this branch for testing only and not for - production environments. + code, but no regular binary packages are built from this branch. + Building from this branch may or may not work due to the nature of changes. + This is where the next stable release will come from. + Please use this branch for testing only and not for production environments. -- 14.0-mate-1.6: The MSB stable branch for Slackware 14.0. This is the - previously supported branch and only receives bug fix updates. The MSB +- 14.0-mate-1.6: The MSB stable branch for Slackware 14.0. The MSB 1.6 binary packages for Slackware 14.0 were built from this branch. Since Slackware 14.1 has been declared as the next stable release then this branch is considered obsoleted and no longer updated. -- 14.1-mate-1.6: The MSB stable branch for Slackware 14.1. - This is the previously supported branch and only receives bug fix - updates. The MSB 1.6 binary packages for Slackware 14.1 are built from - this branch. You might want to use this branch if you enjoy stable - releases. Since MATE 1.8 has been released as the next stable release +- 14.1-mate-1.6 + 14.1-mate-1.8 + 14.1-mate-1.10 + 14.1-mate-1.12: The MSB stable branch for Slackware 14.1. + The MSB 1.6 binary packages for Slackware 14.1 are built from + this branch. Since Slackware 14.2 has been released as the next stable release then this branch is considered obsoleted and no longer updated. -- 14.1-mate-1.8: The MSB stable branch for Slackware 14.1. - This is the previously supported branch and only receives bug fix - updates. The MSB 1.8 binary packages for Slackware 14.1 are built from - this branch. You might want to use this branch if you enjoy stable - releases. Since MATE 1.10 has been released as the next stable release - then this branch is considered obsoleted and no longer updated. - -- 14.1-mate-1.10: The MSB stable branch for Slackware 14.1. - This is the previously supported branch and only receives bug fix updates. - The MSB 1.10 binary packages for Slackware 14.1 are built from this branch. - You might want to use this branch if you enjoy stable releases. - Since MATE 1.12 has been released as the next stable release - then this branch is considered obsoleted and no longer updated. - -- 14.1-mate-1.12: The MSB stable branch for Slackware 14.1. - This is the previously supported branch and only receives bug fix updates. - The MSB 1.12 binary packages for Slackware 14.1 are built from this branch. - Since MATE 1.12 has been released as the next stable release and - Slackware 14.2 gets closer, this branch is considered obsoleted and no - longer updated. - - 14.2-mate-1.14: The MSB stable branch for Slackware 14.2. - This is the previously supported branch and only receives bug fix updates. The MSB 1.14 binary packages for Slackware 14.2 are built from this branch. Since MATE 1.16 has been released as the next stable release then this branch is considered obsoleted and no longer updated. - 14.2-mate-1.16: The MSB stable branch for Slackware 14.2. This is the currently supported branch and only receives bug fix updates. - The MSB 1.14 binary packages for Slackware 14.2 are built from this branch. + The MSB 1.16 binary packages for Slackware 14.2 are built from this branch. You might want to use this branch if you enjoy stable releases. An easy way to find out which branch are you in right now (once you have diff --git a/MATE-1.16-CHANGES.TXT b/MATE-1.16-CHANGES.TXT deleted file mode 100644 index af27e31..0000000 --- a/MATE-1.16-CHANGES.TXT +++ /dev/null @@ -1,9 +0,0 @@ -New Packages in MATE 1.16: -libgxps -vala -vte3 - -Renamed Packages in MATE 1.16: - -Packages removed in MATE 1.16: - diff --git a/MATE-1.18-CHANGES.TXT b/MATE-1.18-CHANGES.TXT new file mode 100644 index 0000000..112b4ec --- /dev/null +++ b/MATE-1.18-CHANGES.TXT @@ -0,0 +1,14 @@ +New Packages in MATE 1.18: +glade +gtksourceview3 +libunique3 +libpeas +mate-calc +caja-actions + +Renamed Packages in MATE 1.18: + +Packages removed in MATE 1.18: +gtksourceview +pygtksourceview +galculator diff --git a/MATE-1.16-DEPS.TXT b/MATE-1.18-DEPS.TXT similarity index 80% rename from MATE-1.16-DEPS.TXT rename to MATE-1.18-DEPS.TXT index bed9964..a3b0c90 100644 --- a/MATE-1.16-DEPS.TXT +++ b/MATE-1.18-DEPS.TXT @@ -1,12 +1,12 @@ This is a list of dependencies for the packages in the /extra directory. -1. extra/mate-applets requires deps/libgtop and deps/gtksourceview +1. extra/mate-applets requires deps/libgtop and deps/gtksourceview3 2. extra/caja-extensions requires deps/gssdp and deps/gupnp 3. extra/mate-utils requires deps/libgtop -4. extra/pluma requires both deps/gtksourceview and deps/pygtksourceview +4. extra/pluma requires deps/gtksourceview3 and deps/libpeas 5. extra/caja-dropbox requires deps/doc-utils diff --git a/README.TXT b/README.TXT index 1acf57e..b77099f 100644 --- a/README.TXT +++ b/README.TXT @@ -27,7 +27,7 @@ How to build and install the MATE packages using these scripts: 2. Run the 'mate-build-deps.sh' in the msb root directory which will build and install all the necessary dependencies in the /deps directory. There are -a total of 20 packages. Please use "su" or "su -" to build as root instead +a total of 22 packages. Please use "su" or "su -" to build as root instead of using "sudo". 3. Run the 'mate-build-base.sh' in the msb root directory which will build diff --git a/base/caja/caja.SlackBuild b/base/caja/caja.SlackBuild index f5712c8..fdfcc5c 100644 --- a/base/caja/caja.SlackBuild +++ b/base/caja/caja.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=caja -VERSION=${VERSION:-1.16.2} +VERSION=${VERSION:-1.17.3} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -82,7 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ - --libexecdir=/usr/lib${LIBDIRSUFFIX}/mate-file-manager \ + --libexecdir=/usr/lib${LIBDIRSUFFIX}/caja \ --disable-update-mimedb \ --enable-introspection \ --build=$ARCH-slackware-linux diff --git a/base/caja/doinst.sh b/base/caja/doinst.sh index ed28460..f25bed6 100644 --- a/base/caja/doinst.sh +++ b/base/caja/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/engrampa/doinst.sh b/base/engrampa/doinst.sh index ed28460..f25bed6 100644 --- a/base/engrampa/doinst.sh +++ b/base/engrampa/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/engrampa/engrampa.SlackBuild b/base/engrampa/engrampa.SlackBuild index 4a8cae0..3c189ef 100644 --- a/base/engrampa/engrampa.SlackBuild +++ b/base/engrampa/engrampa.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for engrampa # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2014-2016 Willy Sudiarto Raharjo +# Copyright 2014-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=engrampa -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/eom/doinst.sh b/base/eom/doinst.sh index ed28460..f25bed6 100644 --- a/base/eom/doinst.sh +++ b/base/eom/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/eom/eom.SlackBuild b/base/eom/eom.SlackBuild index 2761ec3..1fff81e 100644 --- a/base/eom/eom.SlackBuild +++ b/base/eom/eom.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=eom -VERSION=${VERSION:-1.16.1} +VERSION=${VERSION:-1.17.2} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/libmatekbd/doinst.sh b/base/libmatekbd/doinst.sh index ed28460..f25bed6 100644 --- a/base/libmatekbd/doinst.sh +++ b/base/libmatekbd/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/libmatekbd/libmatekbd.SlackBuild b/base/libmatekbd/libmatekbd.SlackBuild index d372418..055f38e 100644 --- a/base/libmatekbd/libmatekbd.SlackBuild +++ b/base/libmatekbd/libmatekbd.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libmatekbd # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libmatekbd -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,9 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz - - +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -108,8 +106,7 @@ if [ -d $PKG/usr/man ]; then fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc/$PRGNAM-$VERSION/ -type f -exec chmod 644 {} \; chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/base/libmatemixer/libmatemixer.SlackBuild b/base/libmatemixer/libmatemixer.SlackBuild index 7fa26b1..493c323 100644 --- a/base/libmatemixer/libmatemixer.SlackBuild +++ b/base/libmatemixer/libmatemixer.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libmatemixer -# Copyright 2014-2016 Willy Sudiarto Raharjo +# Copyright 2014-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libmatemixer -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -35,9 +35,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz - - +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/libmateweather/doinst.sh b/base/libmateweather/doinst.sh index ed28460..f25bed6 100644 --- a/base/libmateweather/doinst.sh +++ b/base/libmateweather/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/libmateweather/libmateweather.SlackBuild b/base/libmateweather/libmateweather.SlackBuild index 939e3a3..1afe7eb 100644 --- a/base/libmateweather/libmateweather.SlackBuild +++ b/base/libmateweather/libmateweather.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libmateweather # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libmateweather -VERSION=${VERSION:-1.16.1} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/marco/doinst.sh b/base/marco/doinst.sh index ed28460..f25bed6 100644 --- a/base/marco/doinst.sh +++ b/base/marco/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/marco/marco.SlackBuild b/base/marco/marco.SlackBuild index 4a24c55..1ec1ced 100644 --- a/base/marco/marco.SlackBuild +++ b/base/marco/marco.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for marco # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=marco -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.1} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,9 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz - - +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/mate-backgrounds/mate-backgrounds.SlackBuild b/base/mate-backgrounds/mate-backgrounds.SlackBuild index 07bb0a4..2d5c59a 100644 --- a/base/mate-backgrounds/mate-backgrounds.SlackBuild +++ b/base/mate-backgrounds/mate-backgrounds.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mate-backgrounds # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,13 +24,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-backgrounds -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} ARCH=noarch -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/mate-common/mate-common.SlackBuild b/base/mate-common/mate-common.SlackBuild index f083ea0..99b0f10 100644 --- a/base/mate-common/mate-common.SlackBuild +++ b/base/mate-common/mate-common.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mate-common # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-common -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/mate-control-center/doinst.sh b/base/mate-control-center/doinst.sh index ed28460..f25bed6 100644 --- a/base/mate-control-center/doinst.sh +++ b/base/mate-control-center/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/mate-control-center/mate-control-center.SlackBuild b/base/mate-control-center/mate-control-center.SlackBuild index 7e40d9f..50b3c8f 100644 --- a/base/mate-control-center/mate-control-center.SlackBuild +++ b/base/mate-control-center/mate-control-center.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-control-center -VERSION=${VERSION:-1.16.1} +VERSION=${VERSION:-1.17.3} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -82,6 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ + --enable-appindicator=auto \ --build=$ARCH-slackware-linux make diff --git a/base/mate-desktop/doinst.sh b/base/mate-desktop/doinst.sh index ed28460..f25bed6 100644 --- a/base/mate-desktop/doinst.sh +++ b/base/mate-desktop/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/mate-desktop/mate-desktop.SlackBuild b/base/mate-desktop/mate-desktop.SlackBuild index ccb87dc..ff00dae 100644 --- a/base/mate-desktop/mate-desktop.SlackBuild +++ b/base/mate-desktop/mate-desktop.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mate-desktop # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-desktop -VERSION=${VERSION:-1.16.1} +VERSION=${VERSION:-1.17.2} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -82,7 +82,6 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ - --enable-mpaste \ --enable-introspection \ --build=$ARCH-slackware-linux diff --git a/base/mate-icon-theme/doinst.sh b/base/mate-icon-theme/doinst.sh index 9424ce4..9a8ded3 100644 --- a/base/mate-icon-theme/doinst.sh +++ b/base/mate-icon-theme/doinst.sh @@ -5,9 +5,3 @@ fi if [ -x /usr/bin/update-mime-database ]; then /usr/bin/update-mime-database usr/share/mime >/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/base/mate-icon-theme/mate-icon-theme.SlackBuild b/base/mate-icon-theme/mate-icon-theme.SlackBuild index 3810c28..57fe374 100644 --- a/base/mate-icon-theme/mate-icon-theme.SlackBuild +++ b/base/mate-icon-theme/mate-icon-theme.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mate-icon-theme # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,13 +24,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-icon-theme -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} ARCH=noarch -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -52,7 +52,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -cp $CWD/mate.svg mate/scalable/apps/mate.svg CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/base/mate-icon-theme/mate.svg b/base/mate-icon-theme/mate.svg deleted file mode 100644 index ee60800..0000000 --- a/base/mate-icon-theme/mate.svg +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/base/mate-media/doinst.sh b/base/mate-media/doinst.sh index ed28460..f25bed6 100644 --- a/base/mate-media/doinst.sh +++ b/base/mate-media/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/mate-media/mate-media.SlackBuild b/base/mate-media/mate-media.SlackBuild index 68047dd..0de60e3 100644 --- a/base/mate-media/mate-media.SlackBuild +++ b/base/mate-media/mate-media.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mate-media # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-media -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/mate-menus/mate-menus.SlackBuild b/base/mate-menus/mate-menus.SlackBuild index 3f12fde..4d176ac 100644 --- a/base/mate-menus/mate-menus.SlackBuild +++ b/base/mate-menus/mate-menus.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mate-menus # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-menus -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/mate-notification-daemon/doinst.sh b/base/mate-notification-daemon/doinst.sh index ed28460..f25bed6 100644 --- a/base/mate-notification-daemon/doinst.sh +++ b/base/mate-notification-daemon/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/mate-notification-daemon/mate-notification-daemon.SlackBuild b/base/mate-notification-daemon/mate-notification-daemon.SlackBuild index 09c2916..edb2f5c 100644 --- a/base/mate-notification-daemon/mate-notification-daemon.SlackBuild +++ b/base/mate-notification-daemon/mate-notification-daemon.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-notification-daemon -VERSION=${VERSION:-1.16.1} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/mate-panel/doinst.sh b/base/mate-panel/doinst.sh index ed28460..f25bed6 100644 --- a/base/mate-panel/doinst.sh +++ b/base/mate-panel/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/mate-panel/mate-panel.SlackBuild b/base/mate-panel/mate-panel.SlackBuild index 8f6e3ed..83464f7 100644 --- a/base/mate-panel/mate-panel.SlackBuild +++ b/base/mate-panel/mate-panel.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-panel -VERSION=${VERSION:-1.16.1} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -83,7 +83,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ --libexecdir=/usr/lib${LIBDIRSUFFIX}/mate-panel \ - --enable-introspection \ + --enable-introspection=yes \ --build=$ARCH-slackware-linux make diff --git a/base/mate-polkit/mate-polkit.SlackBuild b/base/mate-polkit/mate-polkit.SlackBuild index 4dd92dd..4a4cff5 100644 --- a/base/mate-polkit/mate-polkit.SlackBuild +++ b/base/mate-polkit/mate-polkit.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mate-polkit # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-polkit -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/mate-power-manager/ck2.patch b/base/mate-power-manager/ck2.patch new file mode 100644 index 0000000..436239e --- /dev/null +++ b/base/mate-power-manager/ck2.patch @@ -0,0 +1,249 @@ +commit 43ea466c7f14c23c51c26ddf698d2ddf5ac8446b +Author: infirit +Date: Sun Apr 17 19:23:33 2016 +0200 + + Replace deprecated UPower functions with ConsoleKit2 equivalents + + This requires ConsoleKit2 0.9.2. + +diff --git a/src/egg-console-kit.c b/src/egg-console-kit.c +index 0602d7c..df47210 100644 +--- a/src/egg-console-kit.c ++++ b/src/egg-console-kit.c +@@ -108,6 +108,54 @@ egg_console_kit_stop (EggConsoleKit *console, GError **error) + } + + /** ++ * egg_console_kit_suspend: ++ **/ ++gboolean ++egg_console_kit_suspend (EggConsoleKit *console, GError **error) ++{ ++ gboolean ret; ++ GError *error_local = NULL; ++ ++ g_return_val_if_fail (EGG_IS_CONSOLE_KIT (console), FALSE); ++ g_return_val_if_fail (console->priv->proxy_manager != NULL, FALSE); ++ ++ ret = dbus_g_proxy_call (console->priv->proxy_manager, "Suspend", &error_local, ++ G_TYPE_BOOLEAN, TRUE, ++ G_TYPE_INVALID, G_TYPE_INVALID); ++ if (!ret) { ++ egg_warning ("Couldn't suspend: %s", error_local->message); ++ if (error != NULL) ++ *error = g_error_new (1, 0, "%s", error_local->message); ++ g_error_free (error_local); ++ } ++ return ret; ++} ++ ++/** ++ * egg_console_kit_hibernate: ++ **/ ++gboolean ++egg_console_kit_hibernate (EggConsoleKit *console, GError **error) ++{ ++ gboolean ret; ++ GError *error_local = NULL; ++ ++ g_return_val_if_fail (EGG_IS_CONSOLE_KIT (console), FALSE); ++ g_return_val_if_fail (console->priv->proxy_manager != NULL, FALSE); ++ ++ ret = dbus_g_proxy_call (console->priv->proxy_manager, "Hibernate", &error_local, ++ G_TYPE_BOOLEAN, TRUE, ++ G_TYPE_INVALID, G_TYPE_INVALID); ++ if (!ret) { ++ egg_warning ("Couldn't hibernate: %s", error_local->message); ++ if (error != NULL) ++ *error = g_error_new (1, 0, "%s", error_local->message); ++ g_error_free (error_local); ++ } ++ return ret; ++} ++ ++/** + * egg_console_kit_can_stop: + **/ + gboolean +@@ -162,6 +210,65 @@ egg_console_kit_can_restart (EggConsoleKit *console, gboolean *can_restart, GErr + } + + /** ++ * egg_console_kit_can_suspend: ++ **/ ++gboolean ++egg_console_kit_can_suspend (EggConsoleKit *console, gboolean *can_suspend, GError **error) ++{ ++ GError *error_local = NULL; ++ gboolean ret; ++ gchar *retval; ++ ++ g_return_val_if_fail (EGG_IS_CONSOLE_KIT (console), FALSE); ++ g_return_val_if_fail (console->priv->proxy_manager != NULL, FALSE); ++ ++ ret = dbus_g_proxy_call (console->priv->proxy_manager, "CanSuspend", &error_local, ++ G_TYPE_INVALID, ++ G_TYPE_STRING, &retval, G_TYPE_INVALID); ++ if (!ret) { ++ egg_warning ("Couldn't do CanSuspend: %s", error_local->message); ++ if (error != NULL) ++ *error = g_error_new (1, 0, "%s", error_local->message); ++ g_error_free (error_local); ++ } ++ ++ *can_suspend = g_strcmp0 (retval, "yes") == 0 || ++ g_strcmp0 (retval, "challenge") == 0; ++ ++ g_free (retval); ++ return ret; ++} ++ ++/** ++ * egg_console_kit_can_hibernate: ++ **/ ++ ++gboolean ++egg_console_kit_can_hibernate (EggConsoleKit *console, gboolean *can_hibernate, GError **error) ++{ ++ GError *error_local = NULL; ++ gboolean ret; ++ gchar *retval; ++ ++ g_return_val_if_fail (EGG_IS_CONSOLE_KIT (console), FALSE); ++ g_return_val_if_fail (console->priv->proxy_manager != NULL, FALSE); ++ ++ ret = dbus_g_proxy_call (console->priv->proxy_manager, "CanHibernate", &error_local, ++ G_TYPE_INVALID, ++ G_TYPE_STRING, &retval, G_TYPE_INVALID); ++ if (!ret) { ++ egg_warning ("Couldn't do CanHibernate: %s", error_local->message); ++ if (error != NULL) ++ *error = g_error_new (1, 0, "%s", error_local->message); ++ g_error_free (error_local); ++ } ++ ++ *can_hibernate = g_strcmp0 (retval, "yes") == 0 || ++ g_strcmp0 (retval, "challenge") == 0; ++ return ret; ++} ++ ++/** + * egg_console_kit_is_local: + * + * Return value: Returns whether the session is local +diff --git a/src/egg-console-kit.h b/src/egg-console-kit.h +index c93ddce..6664131 100644 +--- a/src/egg-console-kit.h ++++ b/src/egg-console-kit.h +@@ -58,12 +58,22 @@ gboolean egg_console_kit_stop (EggConsoleKit *console, + GError **error); + gboolean egg_console_kit_restart (EggConsoleKit *console, + GError **error); ++gboolean egg_console_kit_suspend (EggConsoleKit *console, ++ GError **error); ++gboolean egg_console_kit_hibernate (EggConsoleKit *console, ++ GError **error); + gboolean egg_console_kit_can_stop (EggConsoleKit *console, + gboolean *can_stop, + GError **error); + gboolean egg_console_kit_can_restart (EggConsoleKit *console, + gboolean *can_restart, + GError **error); ++gboolean egg_console_kit_can_suspend (EggConsoleKit *console, ++ gboolean *can_restart, ++ GError **error); ++gboolean egg_console_kit_can_hibernate (EggConsoleKit *console, ++ gboolean *can_restart, ++ GError **error); + + G_END_DECLS + +diff --git a/src/gpm-control.c b/src/gpm-control.c +index c334fb5..04d3925 100644 +--- a/src/gpm-control.c ++++ b/src/gpm-control.c +@@ -39,7 +39,6 @@ + #include + #include + #include +-#define UPOWER_ENABLE_DEPRECATED + #include + + #ifdef WITH_KEYRING +@@ -212,6 +211,7 @@ gpm_control_suspend (GpmControl *control, GError **error) + gboolean ret = FALSE; + gboolean do_lock; + gboolean nm_sleep; ++ EggConsoleKit *console; + GpmScreensaver *screensaver; + guint32 throttle_cookie = 0; + #ifdef WITH_KEYRING +@@ -293,11 +293,12 @@ gpm_control_suspend (GpmControl *control, GError **error) + } + g_object_unref(proxy); + } +-#if !UP_CHECK_VERSION(0, 99, 0) + else { +- ret = up_client_suspend_sync (control->priv->client, NULL, error); ++ console = egg_console_kit_new (); ++ ret = egg_console_kit_suspend (console, error); ++ g_object_unref (console); + } +-#endif ++ + egg_debug ("emitting resume"); + g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_SUSPEND); + +@@ -326,6 +327,7 @@ gpm_control_hibernate (GpmControl *control, GError **error) + gboolean ret = FALSE; + gboolean do_lock; + gboolean nm_sleep; ++ EggConsoleKit *console; + GpmScreensaver *screensaver; + guint32 throttle_cookie = 0; + #ifdef WITH_KEYRING +@@ -406,11 +408,12 @@ gpm_control_hibernate (GpmControl *control, GError **error) + ret = TRUE; + } + } +-#if !UP_CHECK_VERSION(0, 99, 0) + else { +- ret = up_client_hibernate_sync (control->priv->client, NULL, error); ++ console = egg_console_kit_new (); ++ ret = egg_console_kit_hibernate (console, error); ++ g_object_unref (console); + } +-#endif ++ + egg_debug ("emitting resume"); + g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_HIBERNATE); + +diff --git a/src/gpm-prefs-core.c b/src/gpm-prefs-core.c +index b33ff22..65202e8 100644 +--- a/src/gpm-prefs-core.c ++++ b/src/gpm-prefs-core.c +@@ -30,7 +30,6 @@ + #include + #include + #include +-#define UPOWER_ENABLE_DEPRECATED + #include + + #include "egg-debug.h" +@@ -756,13 +755,10 @@ gpm_prefs_init (GpmPrefs *prefs) + g_object_unref(proxy); + } + else { +- /* are we allowed to shutdown? */ ++ /* Get values from ConseleKit */ + egg_console_kit_can_stop (prefs->priv->console, &prefs->priv->can_shutdown, NULL); +-#if !UP_CHECK_VERSION(0, 99, 0) +- /* get values from UpClient */ +- prefs->priv->can_suspend = up_client_get_can_suspend (prefs->priv->client); +- prefs->priv->can_hibernate = up_client_get_can_hibernate (prefs->priv->client); +-#endif ++ egg_console_kit_can_suspend (prefs->priv->console, &prefs->priv->can_suspend, NULL); ++ egg_console_kit_can_hibernate (prefs->priv->console, &prefs->priv->can_hibernate, NULL); + } + + if (LOGIND_RUNNING()) { diff --git a/base/mate-power-manager/doinst.sh b/base/mate-power-manager/doinst.sh index ed28460..f25bed6 100644 --- a/base/mate-power-manager/doinst.sh +++ b/base/mate-power-manager/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/mate-power-manager/mate-power-manager.SlackBuild b/base/mate-power-manager/mate-power-manager.SlackBuild index c62604a..efbdfc9 100644 --- a/base/mate-power-manager/mate-power-manager.SlackBuild +++ b/base/mate-power-manager/mate-power-manager.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-power-manager -VERSION=${VERSION:-1.16.2} +VERSION=${VERSION:-1.17.1} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -72,6 +72,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/ck2.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/base/mate-screensaver/doinst.sh b/base/mate-screensaver/doinst.sh index ed28460..f25bed6 100644 --- a/base/mate-screensaver/doinst.sh +++ b/base/mate-screensaver/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/mate-screensaver/mate-screensaver.SlackBuild b/base/mate-screensaver/mate-screensaver.SlackBuild index b35d8c3..730a9ee 100644 --- a/base/mate-screensaver/mate-screensaver.SlackBuild +++ b/base/mate-screensaver/mate-screensaver.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-screensaver -VERSION=${VERSION:-1.16.1} +VERSION=${VERSION:-1.17.1} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/mate-session-manager/ck2.patch b/base/mate-session-manager/ck2.patch new file mode 100644 index 0000000..fffe106 --- /dev/null +++ b/base/mate-session-manager/ck2.patch @@ -0,0 +1,468 @@ +commit d0b39de2a8b714f746eef8aaabe278bf22b9b43e +Author: Sander Sweers +Date: Sun Apr 17 15:04:08 2016 +0200 + + Replace deprecated upower functions with ConsoleKit2 equivalents + + This requires ConsoleKit2 version 0.9.2. + +diff --git a/configure.ac b/configure.ac +index 4714e29..58b7f79 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -45,7 +45,6 @@ GLIB_REQUIRED=2.36.0 + GIO_REQUIRED=2.25.0 + GTK_REQUIRED=3.14.0 + DBUS_GLIB_REQUIRED=0.76 +-UPOWER_REQUIRED=0.9.0 + + dnl ==================================================================== + dnl Dependency Checks +@@ -117,32 +116,6 @@ AM_CONDITIONAL(HAVE_SYSTEMD, test "x$use_systemd" = "xyes") + AC_SUBST(HAVE_SYSTEMD) + + dnl ==================================================================== +-dnl UPOWER +-dnl ==================================================================== +- +-AC_ARG_ENABLE(upower, +- AS_HELP_STRING([--enable-upower], +- [Use upower to suspend/hibernate]), +- enable_upower=$enableval, +- enable_upower=no) +-if test "x$enable_upower" = "xyes"; then +- PKG_CHECK_MODULES([UPOWER], [upower-glib >= $UPOWER_REQUIRED], has_upower=yes, has_upower=no) +- +- if test "x$has_upower" = "xyes"; then +- AC_DEFINE(HAVE_UPOWER, 1, [upower support]) +- AC_SUBST(UPOWER_CFLAGS) +- AC_SUBST(UPOWER_LIBS) +- fi +- PKG_CHECK_MODULES([UPOWER_HIBERNATE], [upower-glib < 0.99], has_upower_hibernate_suspend=yes, has_upower_hibernate_suspend=no) +- if test "x$has_upower_hibernate_suspend" = "xyes"; then +- AC_DEFINE(HAVE_UPOWER_HIBERNATE_SUSPEND, 1, [upower based support for hibernate and suspend (< 0.99)]) +- fi +- +-fi +-AM_CONDITIONAL(HAVE_UPOWER, test "x$has_upower" = "xyes") +-AC_SUBST(HAVE_UPOWER) +- +-dnl ==================================================================== + dnl Check for XSync extension + dnl ==================================================================== + +diff --git a/mate-session/Makefile.am b/mate-session/Makefile.am +index c6e8d37..4b2e3f1 100644 +--- a/mate-session/Makefile.am ++++ b/mate-session/Makefile.am +@@ -7,7 +7,6 @@ noinst_PROGRAMS = \ + AM_CPPFLAGS = \ + $(MATE_SESSION_CFLAGS) \ + $(SYSTEMD_CFLAGS) \ +- $(UPOWER_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) + + AM_CFLAGS = $(WARN_CFLAGS) +@@ -81,7 +80,6 @@ mate_session_LDADD = \ + $(XEXT_LIBS) \ + $(MATE_SESSION_LIBS) \ + $(SYSTEMD_LIBS) \ +- $(UPOWER_LIBS) \ + $(EXECINFO_LIBS) + + libgsmutil_la_SOURCES = \ +diff --git a/mate-session/gsm-consolekit.c b/mate-session/gsm-consolekit.c +index a008c4c..e7af674 100644 +--- a/mate-session/gsm-consolekit.c ++++ b/mate-session/gsm-consolekit.c +@@ -480,6 +480,65 @@ gsm_consolekit_attempt_stop (GsmConsolekit *manager) + } + } + ++void ++gsm_consolekit_attempt_suspend (GsmConsolekit *manager) ++{ ++ gboolean res; ++ GError *error; ++ ++ error = NULL; ++ ++ if (!gsm_consolekit_ensure_ck_connection (manager, &error)) { ++ g_warning ("Could not connect to ConsoleKit: %s", ++ error->message); ++ g_error_free (error); ++ return; ++ } ++ ++ res = dbus_g_proxy_call_with_timeout (manager->priv->ck_proxy, ++ "Suspend", ++ INT_MAX, ++ &error, ++ G_TYPE_BOOLEAN, TRUE, /* interactive */ ++ G_TYPE_INVALID, ++ G_TYPE_INVALID); ++ ++ if (!res) { ++ g_warning ("Unable to suspend system: %s", error->message); ++ g_error_free (error); ++ } ++} ++ ++void ++gsm_consolekit_attempt_hibernate (GsmConsolekit *manager) ++{ ++ gboolean res; ++ GError *error; ++ ++ error = NULL; ++ ++ if (!gsm_consolekit_ensure_ck_connection (manager, &error)) { ++ g_warning ("Could not connect to ConsoleKit: %s", ++ error->message); ++ g_error_free (error); ++ return; ++ } ++ ++ res = dbus_g_proxy_call_with_timeout (manager->priv->ck_proxy, ++ "Hibernate", ++ INT_MAX, ++ &error, ++ G_TYPE_BOOLEAN, TRUE, /* interactive */ ++ G_TYPE_INVALID, ++ G_TYPE_INVALID); ++ ++ ++ if (!res) { ++ g_warning ("Unable to hibernate system: %s", error->message); ++ g_error_free (error); ++ } ++} ++ + static gboolean + get_current_session_id (DBusConnection *connection, + char **session_id) +@@ -836,6 +895,80 @@ gsm_consolekit_can_stop (GsmConsolekit *manager) + return can_stop; + } + ++gboolean ++gsm_consolekit_can_suspend (GsmConsolekit *manager) ++{ ++ gboolean res; ++ gboolean can_suspend; ++ gchar *retval; ++ GError *error = NULL; ++ ++ if (!gsm_consolekit_ensure_ck_connection (manager, &error)) { ++ g_warning ("Could not connect to ConsoleKit: %s", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ ++ res = dbus_g_proxy_call_with_timeout (manager->priv->ck_proxy, ++ "CanSuspend", ++ INT_MAX, ++ &error, ++ G_TYPE_INVALID, ++ G_TYPE_STRING, &retval, ++ G_TYPE_INVALID); ++ ++ if (res == FALSE) { ++ g_warning ("Could not make DBUS call: %s", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ ++ can_suspend = g_strcmp0 (retval, "yes") == 0 || ++ g_strcmp0 (retval, "challenge") == 0; ++ ++ g_free (retval); ++ return can_suspend; ++} ++ ++gboolean ++gsm_consolekit_can_hibernate (GsmConsolekit *manager) ++{ ++ gboolean res; ++ gboolean can_hibernate; ++ gchar *retval; ++ GError *error = NULL; ++ ++ if (!gsm_consolekit_ensure_ck_connection (manager, &error)) { ++ g_warning ("Could not connect to ConsoleKit: %s", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ ++ res = dbus_g_proxy_call_with_timeout (manager->priv->ck_proxy, ++ "CanHibernate", ++ INT_MAX, ++ &error, ++ G_TYPE_INVALID, ++ G_TYPE_STRING, &retval, ++ G_TYPE_INVALID); ++ ++ if (res == FALSE) { ++ g_warning ("Could not make DBUS call: %s", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ ++ can_hibernate = g_strcmp0 (retval, "yes") == 0 || ++ g_strcmp0 (retval, "challenge") == 0; ++ ++ g_free (retval); ++ return can_hibernate; ++} ++ + gchar * + gsm_consolekit_get_current_session_type (GsmConsolekit *manager) + { +diff --git a/mate-session/gsm-consolekit.h b/mate-session/gsm-consolekit.h +index 741bde9..3dbb4f8 100644 +--- a/mate-session/gsm-consolekit.h ++++ b/mate-session/gsm-consolekit.h +@@ -87,10 +87,18 @@ gboolean gsm_consolekit_can_stop (GsmConsolekit *manager); + + gboolean gsm_consolekit_can_restart (GsmConsolekit *manager); + ++gboolean gsm_consolekit_can_suspend (GsmConsolekit *manager); ++ ++gboolean gsm_consolekit_can_hibernate (GsmConsolekit *manager); ++ + void gsm_consolekit_attempt_stop (GsmConsolekit *manager); + + void gsm_consolekit_attempt_restart (GsmConsolekit *manager); + ++void gsm_consolekit_attempt_suspend (GsmConsolekit *manager); ++ ++void gsm_consolekit_attempt_hibernate (GsmConsolekit *manager); ++ + void gsm_consolekit_set_session_idle (GsmConsolekit *manager, + gboolean is_idle); + +diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c +index 9eb9366..76e0167 100644 +--- a/mate-session/gsm-logout-dialog.c ++++ b/mate-session/gsm-logout-dialog.c +@@ -27,10 +27,6 @@ + #include + #include + +-#ifdef HAVE_UPOWER +-#include +-#endif +- + #include "gsm-logout-dialog.h" + #ifdef HAVE_SYSTEMD + #include "gsm-systemd.h" +@@ -58,9 +54,6 @@ typedef enum { + struct _GsmLogoutDialogPrivate + { + GsmDialogLogoutType type; +-#ifdef HAVE_UPOWER +- UpClient *up_client; +-#endif + #ifdef HAVE_SYSTEMD + GsmSystemd *systemd; + #endif +@@ -156,9 +149,6 @@ gsm_logout_dialog_init (GsmLogoutDialog *logout_dialog) + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE); + gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE); + gtk_window_stick (GTK_WINDOW (logout_dialog)); +-#ifdef HAVE_UPOWER +- logout_dialog->priv->up_client = up_client_new (); +-#endif + #ifdef HAVE_SYSTEMD + if (LOGIND_RUNNING()) + logout_dialog->priv->systemd = gsm_get_systemd (); +@@ -185,12 +175,6 @@ gsm_logout_dialog_destroy (GsmLogoutDialog *logout_dialog, + g_source_remove (logout_dialog->priv->timeout_id); + logout_dialog->priv->timeout_id = 0; + } +-#ifdef HAVE_UPOWER +- if (logout_dialog->priv->up_client) { +- g_object_unref (logout_dialog->priv->up_client); +- logout_dialog->priv->up_client = NULL; +- } +-#endif + #ifdef HAVE_SYSTEMD + if (logout_dialog->priv->systemd) { + g_object_unref (logout_dialog->priv->systemd); +@@ -214,12 +198,8 @@ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog) + #ifdef HAVE_SYSTEMD + if (LOGIND_RUNNING()) + ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd); +-#endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) +- else +-#endif +-#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND +- ret = up_client_get_can_suspend (logout_dialog->priv->up_client); ++#else ++ ret = gsm_consolekit_can_suspend (logout_dialog->priv->consolekit); + #endif + return ret; + } +@@ -232,12 +212,8 @@ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog) + #ifdef HAVE_SYSTEMD + if (LOGIND_RUNNING()) + ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd); +-#endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) +- else +-#endif +-#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND +- ret = up_client_get_can_hibernate (logout_dialog->priv->up_client); ++#else ++ ret = gsm_consolekit_can_hibernate (logout_dialog->priv->consolekit); + #endif + return ret; + } +diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c +index 153e937..e09f7f4 100644 +--- a/mate-session/gsm-manager.c ++++ b/mate-session/gsm-manager.c +@@ -38,10 +38,6 @@ + #include + #include + +-#ifdef HAVE_UPOWER +-#include +-#endif +- + #include /* for logout dialog */ + #include /* for gsettings */ + +@@ -150,10 +146,6 @@ struct GsmManagerPrivate + + DBusGProxy *bus_proxy; + DBusGConnection *connection; +-#ifdef HAVE_UPOWER +- /* Interface with other parts of the system */ +- UpClient *up_client; +-#endif + }; + + enum { +@@ -1178,26 +1170,16 @@ manager_attempt_hibernate (GsmManager *manager) + + gsm_systemd_attempt_hibernate (systemd); + } +-#endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) +- else { +-#endif +-#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND +- gboolean can_hibernate = up_client_get_can_hibernate (manager->priv->up_client); ++#else ++ GsmConsolekit *consolekit; ++ consolekit = gsm_get_consolekit (); ++ ++ gboolean can_hibernate = gsm_consolekit_can_hibernate (consolekit); + if (can_hibernate) { + /* lock the screen before we suspend */ + manager_perhaps_lock (manager); + +- GError *error = NULL; +- gboolean ret = up_client_hibernate_sync (manager->priv->up_client, NULL, &error); +- if (!ret) { +- g_warning ("Unexpected hibernate failure: %s", +- error->message); +- g_error_free (error); +- } +- } +-#endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) ++ gsm_consolekit_attempt_hibernate (consolekit); + } + #endif + } +@@ -1217,27 +1199,18 @@ manager_attempt_suspend (GsmManager *manager) + + gsm_systemd_attempt_suspend (systemd); + } +-#endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) +- else { +-#endif +-#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND +- gboolean can_suspend = up_client_get_can_suspend (manager->priv->up_client); ++#else ++ GsmConsolekit *consolekit; ++ consolekit = gsm_get_consolekit (); ++ ++ gboolean can_suspend = gsm_consolekit_can_suspend (consolekit); + if (can_suspend) { + /* lock the screen before we suspend */ + manager_perhaps_lock (manager); + +- GError *error = NULL; +- gboolean ret = up_client_suspend_sync (manager->priv->up_client, NULL, &error); +- if (!ret) { +- g_warning ("Unexpected suspend failure: %s", +- error->message); +- g_error_free (error); +- } +- } +-#endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) ++ gsm_consolekit_attempt_suspend (consolekit); + } ++ + #endif + } + +@@ -2452,12 +2425,6 @@ gsm_manager_dispose (GObject *object) + g_object_unref (manager->priv->settings_screensaver); + manager->priv->settings_screensaver = NULL; + } +-#ifdef HAVE_UPOWER +- if (manager->priv->up_client != NULL) { +- g_object_unref (manager->priv->up_client); +- manager->priv->up_client = NULL; +- } +-#endif + G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object); + } + +@@ -2664,9 +2631,6 @@ gsm_manager_init (GsmManager *manager) + "status-changed", + G_CALLBACK (on_presence_status_changed), + manager); +-#ifdef HAVE_UPOWER +- manager->priv->up_client = up_client_new (); +-#endif + g_signal_connect (manager->priv->settings_session, + "changed", + G_CALLBACK (on_gsettings_key_changed), +@@ -3376,14 +3340,6 @@ gsm_manager_can_shutdown (GsmManager *manager, + #ifdef HAVE_SYSTEMD + GsmSystemd *systemd; + #endif +- gboolean can_suspend = FALSE; +- gboolean can_hibernate = FALSE; +-#ifdef HAVE_UPOWER +- g_object_get (manager->priv->up_client, +- "can-suspend", &can_suspend, +- "can-hibernate", &can_hibernate, +- NULL); +-#endif + g_debug ("GsmManager: CanShutdown called"); + + g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); +@@ -3403,8 +3359,8 @@ gsm_manager_can_shutdown (GsmManager *manager, + *shutdown_available = !_log_out_is_locked_down (manager) && + (gsm_consolekit_can_stop (consolekit) + || gsm_consolekit_can_restart (consolekit) +- || can_suspend +- || can_hibernate); ++ || gsm_consolekit_can_suspend (consolekit) ++ || gsm_consolekit_can_hibernate (consolekit)); + g_object_unref (consolekit); + #ifdef HAVE_SYSTEMD + } diff --git a/base/mate-session-manager/doinst.sh b/base/mate-session-manager/doinst.sh index ed28460..f25bed6 100644 --- a/base/mate-session-manager/doinst.sh +++ b/base/mate-session-manager/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/mate-session-manager/mate-session-manager.SlackBuild b/base/mate-session-manager/mate-session-manager.SlackBuild index 5e5ddb3..e643c0e 100644 --- a/base/mate-session-manager/mate-session-manager.SlackBuild +++ b/base/mate-session-manager/mate-session-manager.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-session-manager -VERSION=${VERSION:-1.16.1} +VERSION=${VERSION:-1.17.1} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -72,6 +72,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/ck2.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/base/mate-settings-daemon/doinst.sh b/base/mate-settings-daemon/doinst.sh index ed28460..f25bed6 100644 --- a/base/mate-settings-daemon/doinst.sh +++ b/base/mate-settings-daemon/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/mate-settings-daemon/mate-settings-daemon.SlackBuild b/base/mate-settings-daemon/mate-settings-daemon.SlackBuild index f82b5e7..3ae8695 100644 --- a/base/mate-settings-daemon/mate-settings-daemon.SlackBuild +++ b/base/mate-settings-daemon/mate-settings-daemon.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-settings-daemon -VERSION=${VERSION:-1.16.1} +VERSION=${VERSION:-1.17.1} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/mate-system-monitor/doinst.sh b/base/mate-system-monitor/doinst.sh index ed28460..f25bed6 100644 --- a/base/mate-system-monitor/doinst.sh +++ b/base/mate-system-monitor/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/mate-system-monitor/mate-system-monitor.SlackBuild b/base/mate-system-monitor/mate-system-monitor.SlackBuild index 9142637..fc02c0f 100644 --- a/base/mate-system-monitor/mate-system-monitor.SlackBuild +++ b/base/mate-system-monitor/mate-system-monitor.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mate-system-monitor # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-system-monitor -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,9 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz - - +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/base/mate-terminal/doinst.sh b/base/mate-terminal/doinst.sh index ed28460..f25bed6 100644 --- a/base/mate-terminal/doinst.sh +++ b/base/mate-terminal/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/base/mate-terminal/mate-terminal.SlackBuild b/base/mate-terminal/mate-terminal.SlackBuild index 01e3b2c..b5bc42b 100644 --- a/base/mate-terminal/mate-terminal.SlackBuild +++ b/base/mate-terminal/mate-terminal.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-terminal -VERSION=${VERSION:-1.16.2} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/deps/gksu/gksu.SlackBuild b/deps/gksu/gksu.SlackBuild index e6575a7..199b145 100644 --- a/deps/gksu/gksu.SlackBuild +++ b/deps/gksu/gksu.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gksu -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/deps/glade/doinst.sh b/deps/glade/doinst.sh index 8542d1c..4110f55 100644 --- a/deps/glade/doinst.sh +++ b/deps/glade/doinst.sh @@ -1,5 +1,5 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/deps/gssdp/gssdp.SlackBuild b/deps/gssdp/gssdp.SlackBuild index db71c1b..649270d 100644 --- a/deps/gssdp/gssdp.SlackBuild +++ b/deps/gssdp/gssdp.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gssdp -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/deps/gupnp/gupnp.SlackBuild b/deps/gupnp/gupnp.SlackBuild index 00891ac..ee941d5 100644 --- a/deps/gupnp/gupnp.SlackBuild +++ b/deps/gupnp/gupnp.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gupnp -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/deps/libgksu/doinst.sh b/deps/libgksu/doinst.sh index ad2dd50..298d387 100644 --- a/deps/libgksu/doinst.sh +++ b/deps/libgksu/doinst.sh @@ -18,7 +18,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/deps/libgtop/libgtop.SlackBuild b/deps/libgtop/libgtop.SlackBuild index ebab1dc..d8824b4 100644 --- a/deps/libgtop/libgtop.SlackBuild +++ b/deps/libgtop/libgtop.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libgtop # Copyright 2008 Stylianos Tsampas -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/deps/libgxps/libgxps.SlackBuild b/deps/libgxps/libgxps.SlackBuild index 3185db5..32c1cc1 100644 --- a/deps/libgxps/libgxps.SlackBuild +++ b/deps/libgxps/libgxps.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libgxps -# Copyright 2016 Willy Sudiarto Raharjo +# Copyright 2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/deps/libpeas/doinst.sh b/deps/libpeas/doinst.sh index 8542d1c..4110f55 100644 --- a/deps/libpeas/doinst.sh +++ b/deps/libpeas/doinst.sh @@ -1,5 +1,5 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/deps/libunique/libunique.SlackBuild b/deps/libunique/libunique.SlackBuild index 8585ea7..a3cc67a 100644 --- a/deps/libunique/libunique.SlackBuild +++ b/deps/libunique/libunique.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libunique # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/deps/vte3/vte3.SlackBuild b/deps/vte3/vte3.SlackBuild index 65a618d..939d540 100644 --- a/deps/vte3/vte3.SlackBuild +++ b/deps/vte3/vte3.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for vte3 -# Copyright 2012-2016 Willy Sudiarto Raharjo +# Copyright 2012-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/deps/yelp-tools/yelp-tools.SlackBuild b/deps/yelp-tools/yelp-tools.SlackBuild index 468c295..08fb33b 100644 --- a/deps/yelp-tools/yelp-tools.SlackBuild +++ b/deps/yelp-tools/yelp-tools.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for yelp-tools # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/deps/yelp-xsl/yelp-xsl.SlackBuild b/deps/yelp-xsl/yelp-xsl.SlackBuild index 1d13d3b..4fdfda0 100644 --- a/deps/yelp-xsl/yelp-xsl.SlackBuild +++ b/deps/yelp-xsl/yelp-xsl.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for yelp-xsl # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/deps/zenity/zenity.SlackBuild b/deps/zenity/zenity.SlackBuild index 48fc15c..ce29703 100644 --- a/deps/zenity/zenity.SlackBuild +++ b/deps/zenity/zenity.SlackBuild @@ -63,7 +63,6 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --enable-debug=no \ --enable-libnotify \ - --without-help-dir \ --build=$ARCH-slackware-linux make diff --git a/extra/atril/atril.SlackBuild b/extra/atril/atril.SlackBuild index 6fe0d5b..e54c755 100644 --- a/extra/atril/atril.SlackBuild +++ b/extra/atril/atril.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for atril # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=atril -VERSION=${VERSION:-1.16.1} +VERSION=${VERSION:-1.17.1} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -58,7 +58,7 @@ else fi # check webkitgtk existence -webkit=`pkg-config --exists webkit-1.0` +webkit=`pkg-config --exists webkit2gtk-4.0` if [ "$?" -eq 0 ]; then epub="--enable-epub" else diff --git a/extra/atril/doinst.sh b/extra/atril/doinst.sh index ed28460..f25bed6 100644 --- a/extra/atril/doinst.sh +++ b/extra/atril/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/extra/caja-dropbox/caja-dropbox.SlackBuild b/extra/caja-dropbox/caja-dropbox.SlackBuild index 04c2b96..edc16ea 100644 --- a/extra/caja-dropbox/caja-dropbox.SlackBuild +++ b/extra/caja-dropbox/caja-dropbox.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for caja-dropbox -# Copyright 2014-2016 Willy Sudiarto Raharjo +# Copyright 2014-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=caja-dropbox -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -35,7 +35,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/extra/caja-dropbox/doinst.sh b/extra/caja-dropbox/doinst.sh index 3e5691a..65c7e2e 100644 --- a/extra/caja-dropbox/doinst.sh +++ b/extra/caja-dropbox/doinst.sh @@ -4,6 +4,6 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/extra/caja-extensions/caja-extensions.SlackBuild b/extra/caja-extensions/caja-extensions.SlackBuild index 54b6938..759aa48 100644 --- a/extra/caja-extensions/caja-extensions.SlackBuild +++ b/extra/caja-extensions/caja-extensions.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for caja-extensions -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=caja-extensions -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -35,7 +35,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/extra/galculator/doinst.sh b/extra/galculator/doinst.sh deleted file mode 100644 index 140e332..0000000 --- a/extra/galculator/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications -fi diff --git a/extra/galculator/slack-desc b/extra/galculator/slack-desc deleted file mode 100644 index cef2da9..0000000 --- a/extra/galculator/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 ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -galculator: galculator (Scientific Calculator) -galculator: -galculator: galculator is a GTK 2 based calculator with ordinary notation/reverse -galculator: polish notation, a formula entry mode, different number bases (DEC, -galculator: HEX, OCT, BIN) and different units of angular measure (DEG, RAD, GRAD) -galculator: -galculator: Homepage: http://galculator.sourceforge.net/ -galculator: -galculator: -galculator: -galculator: diff --git a/extra/mate-applets/doinst.sh b/extra/mate-applets/doinst.sh index ed28460..f25bed6 100644 --- a/extra/mate-applets/doinst.sh +++ b/extra/mate-applets/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/extra/mate-applets/mate-applets.SlackBuild b/extra/mate-applets/mate-applets.SlackBuild index 318e0c6..a494821 100644 --- a/extra/mate-applets/mate-applets.SlackBuild +++ b/extra/mate-applets/mate-applets.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mate-applets # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2016 Willy Sudiarto Raharjo +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-applets -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -83,9 +83,11 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ --with-cpufreq-lib=cpufreq \ + --enable-frequency-selector=yes \ --enable-polkit \ --enable-ipv6 \ --enable-stickynotes \ + --enable-suid=yes \ --build=$ARCH-slackware-linux make diff --git a/extra/mate-calc/doinst.sh b/extra/mate-calc/doinst.sh new file mode 100644 index 0000000..f25bed6 --- /dev/null +++ b/extra/mate-calc/doinst.sh @@ -0,0 +1,19 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/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 -f 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/extra/galculator/galculator.SlackBuild b/extra/mate-calc/mate-calc.SlackBuild similarity index 51% rename from extra/galculator/galculator.SlackBuild rename to extra/mate-calc/mate-calc.SlackBuild index f80f57b..bdaffbd 100644 --- a/extra/galculator/galculator.SlackBuild +++ b/extra/mate-calc/mate-calc.SlackBuild @@ -1,9 +1,9 @@ #!/bin/sh -# Slackware build script for galculator +# Slackware build script for mate-calc -# Copyright 2008, 2009 Frank Caraballo -# Copyright 2014-2016 Willy Sudiarto Raharjo +# Copyright 2013 Chess Griffin Raleigh, NC +# Copyright 2013-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -12,21 +12,19 @@ # 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. +# 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. -# Modified by Willy Sudiarto Raharjo for MSB Project - -PRGNAM=galculator -VERSION=${VERSION:-2.1.4} +PRGNAM=mate-calc +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -38,10 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c https://github.com/galculator/galculator/archive/v$VERSION.tar.gz - - - +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -68,38 +63,53 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./autogen.sh \ +./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --enable-static=no \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --without-help-dir \ --build=$ARCH-slackware-linux make -make install-strip DESTDIR=$PKG +make install DESTDIR=$PKG 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 -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 +# Compress and link manpages +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/$PRGNAM-$VERSION -cp -a ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +find $PKG/usr/doc/$PRGNAM-$VERSION/ -type f -exec chmod 644 {} \; +chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/extra/mate-calc/slack-desc b/extra/mate-calc/slack-desc new file mode 100644 index 0000000..6eb2682 --- /dev/null +++ b/extra/mate-calc/slack-desc @@ -0,0 +1,12 @@ + |-----handy-ruler------------------------------------------------------| +mate-calc: mate-calc (calculator for the MATE desktop) +mate-calc: +mate-calc: mate-calc is a fork of gnome-calc, a calculator application for +mate-calc: the MATE desktop. +mate-calc: +mate-calc: +mate-calc: +mate-calc: +mate-calc: +mate-calc: Homepage: http://www.mate-desktop.org +mate-calc: diff --git a/extra/mate-icon-theme-faenza/doinst.sh b/extra/mate-icon-theme-faenza/doinst.sh index ed28460..f25bed6 100644 --- a/extra/mate-icon-theme-faenza/doinst.sh +++ b/extra/mate-icon-theme-faenza/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/extra/mate-icon-theme-faenza/mate-icon-theme-faenza.SlackBuild b/extra/mate-icon-theme-faenza/mate-icon-theme-faenza.SlackBuild index 6fcae82..8609a99 100644 --- a/extra/mate-icon-theme-faenza/mate-icon-theme-faenza.SlackBuild +++ b/extra/mate-icon-theme-faenza/mate-icon-theme-faenza.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mate-icon-theme-faenza # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2014-2016 Willy Sudiarto Raharjo +# Copyright 2014-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/extra/mate-sensors-applet/doinst.sh b/extra/mate-sensors-applet/doinst.sh index ed28460..f25bed6 100644 --- a/extra/mate-sensors-applet/doinst.sh +++ b/extra/mate-sensors-applet/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/extra/mate-sensors-applet/mate-sensors-applet.SlackBuild b/extra/mate-sensors-applet/mate-sensors-applet.SlackBuild index 2be31f3..70f18b0 100644 --- a/extra/mate-sensors-applet/mate-sensors-applet.SlackBuild +++ b/extra/mate-sensors-applet/mate-sensors-applet.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-sensors-applet -VERSION=${VERSION:-1.16.1} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/extra/mate-utils/doinst.sh b/extra/mate-utils/doinst.sh index ed28460..f25bed6 100644 --- a/extra/mate-utils/doinst.sh +++ b/extra/mate-utils/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/extra/mate-utils/mate-utils.SlackBuild b/extra/mate-utils/mate-utils.SlackBuild index 577f5b8..6cdee2a 100644 --- a/extra/mate-utils/mate-utils.SlackBuild +++ b/extra/mate-utils/mate-utils.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mate-utils # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2014-2016 Willy Sudiarto Raharjo +# Copyright 2014-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-utils -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -85,7 +85,6 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --enable-debug=no \ --enable-gdict-applet=yes \ - --with-gtk=2.0 \ --build=$ARCH-slackware-linux # This is needed in -current, but should be harmless in -stable as well diff --git a/extra/mozo/doinst.sh b/extra/mozo/doinst.sh index ed28460..f25bed6 100644 --- a/extra/mozo/doinst.sh +++ b/extra/mozo/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/extra/mozo/mozo.SlackBuild b/extra/mozo/mozo.SlackBuild index beedfc3..73e1d54 100644 --- a/extra/mozo/mozo.SlackBuild +++ b/extra/mozo/mozo.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mozo # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2014-2016 Willy Sudiarto Raharjo +# Copyright 2014-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mozo -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/extra/pluma/doinst.sh b/extra/pluma/doinst.sh index ed28460..f25bed6 100644 --- a/extra/pluma/doinst.sh +++ b/extra/pluma/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/extra/pluma/pluma.SlackBuild b/extra/pluma/pluma.SlackBuild index 3e277c9..c8da2ea 100644 --- a/extra/pluma/pluma.SlackBuild +++ b/extra/pluma/pluma.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for pluma # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2014-2016 Willy Sudiarto Raharjo +# Copyright 2014-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pluma -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.4} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/mate-build-deps.sh b/mate-build-deps.sh index 4580bbf..fabda85 100755 --- a/mate-build-deps.sh +++ b/mate-build-deps.sh @@ -54,6 +54,7 @@ for dir in \ deps/gtk-engines \ deps/murrine \ deps/glade \ + deps/libpeas \ deps/gtksourceview3 \ deps/libgtop \ deps/libgksu \ diff --git a/mate-build-extra.sh b/mate-build-extra.sh index ca58236..57cfc03 100755 --- a/mate-build-extra.sh +++ b/mate-build-extra.sh @@ -42,10 +42,11 @@ CHECKDUPLICATE=0 # Loop for all extra packages for dir in \ - extra/galculator \ + extra/mate-calc \ extra/atril \ extra/caja-extensions \ extra/caja-dropbox \ + extra/caja-actions \ extra/mate-applets \ extra/mate-icon-theme-faenza \ extra/mate-sensors-applet \ diff --git a/testing/libindicator/libindicator.SlackBuild b/testing/libindicator/libindicator.SlackBuild index 193d251..64c2c3d 100644 --- a/testing/libindicator/libindicator.SlackBuild +++ b/testing/libindicator/libindicator.SlackBuild @@ -29,7 +29,7 @@ TAG=${TAG:-_msb} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/msb} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -87,7 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-gtk=2 \ + --with-gtk=3 \ --disable-static \ --disable-tests \ --build=$ARCH-slackware-linux diff --git a/testing/mate-indicator-applet/mate-indicator-applet.SlackBuild b/testing/mate-indicator-applet/mate-indicator-applet.SlackBuild index 350c34e..e8b1983 100644 --- a/testing/mate-indicator-applet/mate-indicator-applet.SlackBuild +++ b/testing/mate-indicator-applet/mate-indicator-applet.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mate-indicator-applet -# Copyright 2016 Willy Sudiarto Raharjo +# Copyright 2016-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,27 +23,27 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-indicator-applet -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.1} BUILD=${BUILD:-1} TAG=${TAG:-_msb} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -80,7 +80,6 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-gtk=2.0 \ --disable-static \ --build=$ARCH-slackware-linux diff --git a/testing/mate-user-guide/mate-user-guide.SlackBuild b/testing/mate-user-guide/mate-user-guide.SlackBuild index 6e1265c..45ee7ac 100644 --- a/testing/mate-user-guide/mate-user-guide.SlackBuild +++ b/testing/mate-user-guide/mate-user-guide.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mate-user-guide -# Copyright 2015-2016 Willy Sudiarto Raharjo +# Copyright 2015-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-user-guide -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -35,7 +35,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} diff --git a/testing/mate-user-share/mate-user-share.SlackBuild b/testing/mate-user-share/mate-user-share.SlackBuild index 174f16e..b1820b4 100644 --- a/testing/mate-user-share/mate-user-share.SlackBuild +++ b/testing/mate-user-share/mate-user-share.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mate-user-share -VERSION=${VERSION:-1.16.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -35,7 +35,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://pub.mate-desktop.org/releases/1.16/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.17/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -82,6 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ --with-httpd \ + --with-modules-path=/usr/lib${LIBDIRSUFFIX}/httpd/modules/ \ --build=$ARCH-slackware-linux make diff --git a/testing/numix-icon-theme-circle/doinst.sh b/testing/numix-icon-theme-circle/doinst.sh index 9424ce4..aea0f89 100644 --- a/testing/numix-icon-theme-circle/doinst.sh +++ b/testing/numix-icon-theme-circle/doinst.sh @@ -8,6 +8,6 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/testing/numix-icon-theme-shine/doinst.sh b/testing/numix-icon-theme-shine/doinst.sh index 9424ce4..aea0f89 100644 --- a/testing/numix-icon-theme-shine/doinst.sh +++ b/testing/numix-icon-theme-shine/doinst.sh @@ -8,6 +8,6 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/testing/numix-icon-theme/doinst.sh b/testing/numix-icon-theme/doinst.sh index 9424ce4..aea0f89 100644 --- a/testing/numix-icon-theme/doinst.sh +++ b/testing/numix-icon-theme/doinst.sh @@ -8,6 +8,6 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/testing/yelp/doinst.sh b/testing/yelp/doinst.sh index ed28460..f25bed6 100644 --- a/testing/yelp/doinst.sh +++ b/testing/yelp/doinst.sh @@ -8,7 +8,7 @@ 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 + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/testing/yelp/yelp.SlackBuild b/testing/yelp/yelp.SlackBuild index ca1fdb2..191b7ea 100644 --- a/testing/yelp/yelp.SlackBuild +++ b/testing/yelp/yelp.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for yelp -# Copyright 2014-2016 Willy Sudiarto Raharjo +# Copyright 2014-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=yelp -VERSION=${VERSION:-3.20.1} +VERSION=${VERSION:-3.22.0} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -35,7 +35,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c ftp://ftp.gnome.org/pub/gnome/sources/yelp/3.20/$PRGNAM-$VERSION.tar.xz +wget -c ftp://ftp.gnome.org/pub/gnome/sources/yelp/3.22/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb}