From 14635ca5380a480450a66c3fcc29992d29a2bd8e Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Thu, 15 Mar 2012 00:01:19 +0000
Subject: Thu Mar 15 00:01:19 UTC 2012

---
 community/gdmap/PKGBUILD      | 16 +++++++++-----
 community/gdmap/gtk-fix.patch | 50 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 community/gdmap/gtk-fix.patch

(limited to 'community/gdmap')

diff --git a/community/gdmap/PKGBUILD b/community/gdmap/PKGBUILD
index 6295d89d7..ea5be993f 100644
--- a/community/gdmap/PKGBUILD
+++ b/community/gdmap/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 22488 2010-07-21 22:10:21Z lcarlier $
+# $Id: PKGBUILD 67645 2012-03-13 15:14:31Z lcarlier $
 # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 
 pkgname=gdmap
 pkgver=0.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Tool to inspect the used space of folders."
 arch=('i686' 'x86_64')
 url="http://gdmap.sourceforge.net"
@@ -11,14 +11,20 @@ license=('GPL')
 depends=('gtk2' 'glib2' 'libxml2')
 makedepends=('gettext' 'intltool')
 source=(http://downloads.sourceforge.net/sourceforge/gdmap/$pkgname-$pkgver.tar.gz \
-	fix_deprecated_GTK_WIDGET_SENSITIVE.diff)
+	gtk-fix.patch)
 md5sums=('54b43354dbe774810104607ad1eaaed3'
-         '98bf658a1994a5e6b7aafc738640d05b')
+         'a5488ae69fa778cd35398b99bb1d6c94')
 
 build() {
   cd ${srcdir}/gdmap-$pkgver
 
-  patch -p1 < ../fix_deprecated_GTK_WIDGET_SENSITIVE.diff
+  cd src
+  # fix deprecated gtk macros call
+  patch -Np0 -i ../../gtk-fix.patch
+  # fix linking
+  sed -i -e 's/@LIBXML_LIBS@/@LIBXML_LIBS@ -lm/g' Makefile.in
+  cd ..
+
   ./configure --prefix=/usr
   make
 }
diff --git a/community/gdmap/gtk-fix.patch b/community/gdmap/gtk-fix.patch
new file mode 100644
index 000000000..c6269f1dc
--- /dev/null
+++ b/community/gdmap/gtk-fix.patch
@@ -0,0 +1,50 @@
+--- 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);
-- 
cgit v1.2.3-54-g00ecf