From 8c882064bede369d7fd35e19f73c3cdb10aea330 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackware-id.org>
Date: Wed, 22 Jan 2014 00:01:30 +0700
Subject: [PATCH] mate-media: Upgraded to 1.7.0

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
---
 extra/mate-media/mate-media-build.patch | 45 -------------------------
 extra/mate-media/mate-media.SlackBuild  | 23 ++++++-------
 2 files changed, 10 insertions(+), 58 deletions(-)
 delete mode 100644 extra/mate-media/mate-media-build.patch

diff --git a/extra/mate-media/mate-media-build.patch b/extra/mate-media/mate-media-build.patch
deleted file mode 100644
index 0dd7050..0000000
--- a/extra/mate-media/mate-media-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- configure.ac.orig   2013-11-03 20:13:23.140450797 +0700
-+++ configure.ac        2013-11-03 20:14:34.055710980 +0700
-@@ -45,9 +45,6 @@
- AC_PROG_GCC_TRADITIONAL
- AC_FUNC_MMAP
- 
--# CFLAGS
--MATE_COMPILE_WARNINGS
--
- # AS_NANO(GM_RELEASE="yes", GM_RELEASE="no")
- AS_COMPILER_FLAG(-Wall, GM_ERROR_CFLAGS="-Wall")
- 
-@@ -260,6 +257,21 @@
- MATE_COMPILE_WARNINGS([maximum])
- MATE_CXX_WARNINGS
- 
-+AC_ARG_ENABLE(deprecated,
-+ [AS_HELP_STRING([--enable-deprecated],
-+ [warn about deprecated usages [default=no]])],,
-+ [enable_deprecated=no])
-+
-+if test "x$enable_deprecated" = "xyes"; then
-+ DISABLE_DEPRECATED="\
-+ -DMATE_DISABLE_DEPRECATED \
-+ -DGDK_PIXBUF_DISABLE_DEPRECATED \
-+ -DGTK_DISABLE_DEPRECATED \
-+ -DGDK_DISABLE_DEPRECATED"
-+ AC_SUBST(DISABLE_DEPRECATED)
-+fi
-+
-+
- # Turn on the additional warnings last, so warnings don't affect other tests.
- AC_ARG_ENABLE(more-warnings,
-         [AC_HELP_STRING([--enable-more-warnings],
-+++ Makefile.am	2013-11-03 20:15:53.073902725 +0700
-@@ -21,7 +21,8 @@
- DISTCHECK_CONFIGURE_FLAGS = \
- 	--disable-scrollkeeper	\
- 	--enable-more-warnings  \
--	--enable-compile-warnings=maximum
-+	--enable-compile-warnings=maximum \
-+	--enable-deprecated 
- 
- DIST_SUBDIRS = \
- 	po 			\
diff --git a/extra/mate-media/mate-media.SlackBuild b/extra/mate-media/mate-media.SlackBuild
index b918be3..2b0d428 100644
--- a/extra/mate-media/mate-media.SlackBuild
+++ b/extra/mate-media/mate-media.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for mate-media
 
 # Copyright 2013 Chess Griffin <chess.griffin@gmail.com> Raleigh, NC
-# Copyright 2013 Willy Sudiarto Raharjo <willysr@slackware-id.org>
+# Copyright 2013-2014 Willy Sudiarto Raharjo <willysr@slackware-id.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mate-media
-VERSION=${VERSION:-1.6.0}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.7.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
@@ -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,18 +68,15 @@ 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 {} \;
-
-# Upstream patch to make mate-media buildable for Slackware 14.1
-patch -p0 < $CWD/mate-media-build.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" \
-./autogen.sh \
+./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \