From 57c783ffac12f30ac3965bb53f82fa0efaae755f Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackware-id.org>
Date: Tue, 14 Jan 2014 22:09:38 +0700
Subject: [PATCH] mate-panel: Upgraded to 1.7.1

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
---
 base/mate-panel/mate-panel.SlackBuild | 17 +++++++----------
 base/mate-panel/mate-panel.patch      | 22 ----------------------
 2 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 base/mate-panel/mate-panel.patch

diff --git a/base/mate-panel/mate-panel.SlackBuild b/base/mate-panel/mate-panel.SlackBuild
index a004e06..26b078c 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.6.1}
+VERSION=${VERSION:-1.7.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.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 upgraded to 1.7
-patch -p0 < $CWD/mate-panel.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" \
diff --git a/base/mate-panel/mate-panel.patch b/base/mate-panel/mate-panel.patch
deleted file mode 100644
index ef33482..0000000
--- a/base/mate-panel/mate-panel.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mate-panel/panel-run-dialog.c	2013-07-13 01:52:29.000000000 +0700
-+++ mate-panel/panel-run-dialog.c.orig	2013-11-03 17:24:25.957806537 +0700
-@@ -43,7 +43,7 @@
- #include <matemenu-tree.h>
- 
- #define MATE_DESKTOP_USE_UNSTABLE_API
--#include <libmate/mate-desktop-utils.h>
-+#include <libmate-desktop/mate-desktop-utils.h>
- 
- #include <libpanel-util/panel-error.h>
- #include <libpanel-util/panel-glib.h>
---- applets/clock/calendar-window.c.orig	2013-11-03 17:27:36.248872755 +0700
-+++ applets/clock/calendar-window.c	2013-11-03 17:27:47.739070552 +0700
-@@ -33,7 +33,7 @@
- #include <gio/gio.h>
- 
- #define MATE_DESKTOP_USE_UNSTABLE_API
--#include <libmate/mate-desktop-utils.h>
-+#include <libmate-desktop/mate-desktop-utils.h>
- 
- #include "calendar-window.h"
-