system/gdmap: Fix GTK issue + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 65 insertions, 10 deletions

diff --git a/system/gdmap/gdmap.SlackBuild b/system/gdmap/gdmap.SlackBuild
index 6e2b7e119178..8937ef8eab1e 100644
--- a/system/gdmap/gdmap.SlackBuild
+++ b/system/gdmap/gdmap.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright 2010, 2012  Binh Nguyen <binhvng@gmail.com>
+# Copyright 2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +23,7 @@
 
 PRGNAM=gdmap
 VERSION=${VERSION:-0.8.1}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -62,14 +63,18 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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 {} \;
 
 # Allow deprecated gtk functions.
 sed -i s/-DGTK_DISABLE_DEPRECATED//g configure
 
+cd src
+patch -p0 < $CWD/gtk-fix.patch
+cd ..
+
 CFLAGS="$SLKCFLAGS -lm" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -86,15 +91,14 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/gdmap/gdmap.info b/system/gdmap/gdmap.info
index 581690f8c171..19360239cb91 100644
--- a/system/gdmap/gdmap.info
+++ b/system/gdmap/gdmap.info
@@ -6,5 +6,5 @@ MD5SUM="54b43354dbe774810104607ad1eaaed3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Binh Nguyen"
-EMAIL="binhvng@gmail.com"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/system/gdmap/gtk-fix.patch b/system/gdmap/gtk-fix.patch
new file mode 100644
index 000000000000..b12e667bb707
--- /dev/null
+++ b/system/gdmap/gtk-fix.patch
@@ -0,0 +1,51 @@
+--- gui_support.c	2008/05/23 14:54:28	1.2
++++ gui_support.c	2012/01/06 13:51:36	1.3
+@@ -2,8 +2,8 @@
+  * distributed under the terms of the GNU Public License.  See the
+  * file COPYING for details.
+  */
+-/* $Revision: 1.2 $
+- * $Date: 2008/05/23 14:54:28 $
++/* $Revision: 1.3 $
++ * $Date: 2012/01/06 13:51:36 $
+  * $Author: sgop $
+  */
+ 
+@@ -85,7 +85,11 @@
+   const char* text;
+ 
+   (void)event;
++#if GTK_CHECK_VERSION(2,20,0)
++  if (gtk_widget_get_sensitive(GTK_WIDGET(label))) {
++#else
+   if (GTK_WIDGET_SENSITIVE(label)) {
++#endif
+     char* temp;
+ 
+     text = g_object_get_data(G_OBJECT(label), "label");
+@@ -129,7 +133,11 @@
+ void ui_event_label_set_sensitive(GtkWidget* ebox, gboolean set) {
+   gpointer callback = g_object_get_data(G_OBJECT(ebox), "callback");
+   GtkWidget* child = GTK_BIN(ebox)->child;
++#if GTK_CHECK_VERSION(2,20,0)
++  if (gtk_widget_get_sensitive(child) == set) return;
++#else
+   if (GTK_WIDGET_SENSITIVE(child) == set) return;
++#endif
+ 
+   if (set && !callback) return;
+   gtk_widget_set_sensitive(child, set);
+@@ -164,8 +172,11 @@
+                         // GDK_FOCUS_CHANGE_MASK |
+                         GDK_ENTER_NOTIFY_MASK |
+                         GDK_LEAVE_NOTIFY_MASK);
++#if GTK_CHECK_VERSION(2,22,0)
++  gtk_widget_set_can_focus(ebox, TRUE);
++#else
+   GTK_WIDGET_SET_FLAGS(ebox, GTK_CAN_FOCUS);
+-
++#endif
+   gtk_widget_show(ebox);
+ 
+   temp = g_strdup_printf(EVENT_FMT, text);
+