From f048c42e966a9a8061e780f23b7b194ec5cb06ea Mon Sep 17 00:00:00 2001
From: dsomero <xgizzmo@slackbuilds.org>
Date: Thu, 6 Sep 2012 14:50:15 -0400
Subject: academic/geda-gaf: Updated for version 1.6.2

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 academic/geda-gaf/geda-gaf.SlackBuild       | 16 ++++++++--------
 academic/geda-gaf/geda-gaf.info             |  6 +++---
 academic/geda-gaf/glib-single-include.patch | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 academic/geda-gaf/glib-single-include.patch

diff --git a/academic/geda-gaf/geda-gaf.SlackBuild b/academic/geda-gaf/geda-gaf.SlackBuild
index 71c10098e2..8002c40bc2 100644
--- a/academic/geda-gaf/geda-gaf.SlackBuild
+++ b/academic/geda-gaf/geda-gaf.SlackBuild
@@ -5,16 +5,14 @@
 # Written by Stephen Van Berg stephen_van_berg@earlicker.com
 
 PRGNAM=geda-gaf
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -53,6 +51,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Starting with glib 2.32 it is now mandatory to 
+# include glib.h instead of individual headers.
+patch -p1 -i $CWD/glib-single-include.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -69,13 +71,11 @@ make install DESTDIR=$PKG
 
 rm -f $PKG/usr/share/applications/mimeinfo.cache
 
-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
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+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 \
diff --git a/academic/geda-gaf/geda-gaf.info b/academic/geda-gaf/geda-gaf.info
index c67528d486..d21e60b04f 100644
--- a/academic/geda-gaf/geda-gaf.info
+++ b/academic/geda-gaf/geda-gaf.info
@@ -1,8 +1,8 @@
 PRGNAM="geda-gaf"
-VERSION="1.6.0"
+VERSION="1.6.2"
 HOMEPAGE="http://gpleda.org"
-DOWNLOAD="http://geda.seul.org/release/v1.6/1.6.0/geda-gaf-1.6.0.tar.gz"
-MD5SUM="1dacc71407e69d77eaf4c1115f5bcd56"
+DOWNLOAD="http://geda.seul.org/release/v1.6/1.6.2/geda-gaf-1.6.2.tar.gz"
+MD5SUM="35ae86aebc174ec1fc03863fde4c843c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/geda-gaf/glib-single-include.patch b/academic/geda-gaf/glib-single-include.patch
new file mode 100644
index 0000000000..f2f05e2323
--- /dev/null
+++ b/academic/geda-gaf/glib-single-include.patch
@@ -0,0 +1,15 @@
+Index: geda-gaf-1.6.2/libgeda/src/s_path.c
+===================================================================
+--- geda-gaf-1.6.2.orig/libgeda/src/s_path.c
++++ geda-gaf-1.6.2/libgeda/src/s_path.c
+@@ -37,9 +37,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include <glib/gmem.h>
+-#include <glib/gmessages.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "libgeda_priv.h"
+ 
-- 
cgit v1.2.3