diff --git a/base/mate-control-center/mate-control-center.SlackBuild b/base/mate-control-center/mate-control-center.SlackBuild index fb08a5e..a117526 100644 --- a/base/mate-control-center/mate-control-center.SlackBuild +++ b/base/mate-control-center/mate-control-center.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mate-control-center # Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013 Willy Sudiarto Raharjo +# Copyright 2013-2014 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-control-center -VERSION=${VERSION:-1.6.1} +VERSION=${VERSION:-1.7.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.6/$PRGNAM-$VERSION.tar.xz +wget -c http://pub.mate-desktop.org/releases/1.7/$PRGNAM-$VERSION.tar.xz NUMJOBS=${NUMJOBS:-" -j8 "} @@ -68,14 +68,11 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Temporary patch until this package is compatible with MATE 1.7 -patch -p0 < $CWD/mate-control-center.patch +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -87,7 +84,6 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ - --disable-scrollkeeper \ --build=$ARCH-slackware-linux make $NUMJOBS || make @@ -127,9 +123,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -# Remove help files for now - until MATE upstream fixes help documentation -# buttons and menus. Confirmed w/ upstream. -find $PKG/usr/share/mate/help/$PRGNAM/* -maxdepth 0 -type d ! -name C -exec rm -rf {} \; - cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} diff --git a/base/mate-control-center/mate-control-center.patch b/base/mate-control-center/mate-control-center.patch deleted file mode 100644 index 164e76b..0000000 --- a/base/mate-control-center/mate-control-center.patch +++ /dev/null @@ -1,231 +0,0 @@ ---- libwindow-settings/mate-window-manager.h.orig 2013-11-03 07:04:25.843848462 +0700 -+++ libwindow-settings/mate-window-manager.h 2013-11-03 07:04:55.886405072 +0700 -@@ -28,7 +28,7 @@ - - #include - --#include -+#include - - /* Increment if backward-incompatible changes are made, so we get a clean - * error. In principle the libtool versioning handles this, but ---- capplets/common/mate-theme-info.c.orig 2013-11-03 07:08:21.792366747 +0700 -+++ capplets/common/mate-theme-info.c 2013-11-03 07:08:27.610280913 +0700 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include "mate-theme-info.h" - #include "gtkrc-utils.h" - ---- capplets/common/mate-theme-test.c.orig 2013-11-03 07:10:33.311426585 +0700 -+++ capplets/common/mate-theme-test.c 2013-11-03 07:10:40.133325959 +0700 -@@ -1,7 +1,7 @@ - #include - #include - #include --#include -+#include - #include "mate-theme-info.h" - - int ---- capplets/appearance/appearance.h.orig 2013-11-03 07:12:08.465023127 +0700 -+++ capplets/appearance/appearance.h 2013-11-03 07:12:23.062807836 +0700 -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - - #include "mate-theme-info.h" - ---- capplets/appearance/mate-wp-info.h.orig 2013-11-03 07:14:07.013276658 +0700 -+++ capplets/appearance/mate-wp-info.h 2013-11-03 07:14:14.880160897 +0700 -@@ -22,7 +22,7 @@ - #define _MATE_WP_INFO_H_ - - #include --#include -+#include - - typedef struct _MateWPInfo { - char* uri; ---- capplets/appearance/mate-wp-item.h.orig 2013-11-03 07:15:24.911130421 +0700 -+++ capplets/appearance/mate-wp-item.h 2013-11-03 07:15:31.609031867 +0700 -@@ -22,8 +22,8 @@ - #include - #include - #include --#include --#include -+#include -+#include - - #include "mate-wp-info.h" - ---- capplets/appearance/appearance-desktop.c.orig 2013-11-03 07:16:51.752852642 +0700 -+++ capplets/appearance/appearance-desktop.c 2013-11-03 07:17:05.028657309 +0700 -@@ -27,8 +27,8 @@ - #include - #include - #include --#include --#include -+#include -+#include - - enum { - TARGET_URI_LIST, ---- capplets/appearance/appearance-themes.c.orig 2013-11-03 07:18:19.896555772 +0700 -+++ capplets/appearance/appearance-themes.c 2013-11-03 07:18:25.785469130 +0700 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - - #define CUSTOM_THEME_NAME "__custom__" - ---- capplets/display/xrandr-capplet.c.orig 2013-11-03 07:22:33.093830809 +0700 -+++ capplets/display/xrandr-capplet.c 2013-11-03 07:22:57.979464727 +0700 -@@ -27,9 +27,9 @@ - #include - #include "scrollarea.h" - #define MATE_DESKTOP_USE_UNSTABLE_API --#include --#include --#include -+#include -+#include -+#include - #include - #include - #include ---- capplets/about-me/mate-about-me.c.orig 2013-11-03 07:24:37.001008111 +0700 -+++ capplets/about-me/mate-about-me.c 2013-11-03 07:24:41.961935138 +0700 -@@ -29,7 +29,7 @@ - #include - - #define MATE_DESKTOP_USE_UNSTABLE_API --#include -+#include - - #include "e-image-chooser.h" - #include "mate-about-me-password.h" ---- libslab/app-resizer.c.orig 2013-11-03 07:26:58.714923618 +0700 -+++ libslab/app-resizer.c 2013-11-03 07:27:10.173755074 +0700 -@@ -19,7 +19,7 @@ - */ - - #include --#include -+#include - - #include "app-shell.h" - #include "app-resizer.h" ---- libslab/app-shell.c.orig 2013-11-03 07:28:03.742967160 +0700 -+++ libslab/app-shell.c 2013-11-03 07:28:09.973875514 +0700 -@@ -22,7 +22,7 @@ - #include - #endif - --#include -+#include - #include - #include - #include ---- libslab/app-shell.h.orig 2013-11-03 07:28:46.420339461 +0700 -+++ libslab/app-shell.h 2013-11-03 07:29:40.335546495 +0700 -@@ -26,7 +26,7 @@ - #include - #define MATEMENU_I_KNOW_THIS_IS_UNSTABLE - #include --#include -+#include - - #include - #include ---- libslab/application-tile.h.orig 2013-11-03 07:30:24.104902766 +0700 -+++ libslab/application-tile.h 2013-11-03 07:30:29.687820657 +0700 -@@ -23,7 +23,7 @@ - - #include - --#include -+#include - - #ifdef __cplusplus - extern "C" { ---- libslab/libslab-utils.h.orig 2013-11-03 07:31:12.736187548 +0700 -+++ libslab/libslab-utils.h 2013-11-03 07:31:18.842097749 +0700 -@@ -3,9 +3,9 @@ - - #include - #include --#include -+#include - #define MATE_DESKTOP_USE_UNSTABLE_API 1 --#include -+#include - - #ifdef __cplusplus - extern "C" { ---- libslab/mate-utils.h.orig 2013-11-03 07:32:25.420118618 +0700 -+++ libslab/mate-utils.h 2013-11-03 07:32:31.178033942 +0700 -@@ -22,7 +22,7 @@ - #define __MATE_UTILS_H__ - - #include --#include -+#include - - #ifdef __cplusplus - extern "C" { ---- libslab/shell-window.h.orig 2013-11-03 07:33:09.101476233 +0700 -+++ libslab/shell-window.h 2013-11-03 07:33:14.524396484 +0700 -@@ -23,7 +23,7 @@ - - #include - #include --#include -+#include - - #include - ---- libslab/slab-mate-util.h.orig 2013-11-03 07:33:44.289958756 +0700 -+++ libslab/slab-mate-util.h 2013-11-03 07:33:48.997889522 +0700 -@@ -23,7 +23,7 @@ - - #include - #include --#include -+#include - - #ifdef __cplusplus - extern "C" { ---- libslab/system-tile.h.orig 2013-11-03 07:34:30.880273617 +0700 -+++ libslab/system-tile.h 2013-11-03 07:34:35.897199841 +0700 -@@ -23,7 +23,7 @@ - - #include - --#include -+#include - - #ifdef __cplusplus - extern "C" { ---- shell/control-center.c.orig 2013-11-03 07:36:12.836774336 +0700 -+++ shell/control-center.c 2013-11-03 07:36:20.366663611 +0700 -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - #include - - #include