From 146191edd7d66882d2602c5a69291874ef6a67e2 Mon Sep 17 00:00:00 2001
From: mancha
Date: Fri, 14 Feb 2014 10:33:59 +0700
Subject: libraries/libgksu: Fixed helper path on x86_64 + Compress manual.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/libgksu/doinst.sh                        |  2 +-
 libraries/libgksu/libgksu.SlackBuild               | 20 ++++++++++++++------
 .../patches/libgksu-2.0.12-x86_64-path.diff        | 22 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 libraries/libgksu/patches/libgksu-2.0.12-x86_64-path.diff

(limited to 'libraries/libgksu')

diff --git a/libraries/libgksu/doinst.sh b/libraries/libgksu/doinst.sh
index a54583df04..6c507d15da 100644
--- a/libraries/libgksu/doinst.sh
+++ b/libraries/libgksu/doinst.sh
@@ -1,7 +1,7 @@
 GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
 chroot . gconftool-2 --makefile-install-rule \
     /etc/gconf/schemas/gksu.schemas \
-    1>/dev/null 
+    1>/dev/null 2>/dev/null
 
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database &> /dev/null
diff --git a/libraries/libgksu/libgksu.SlackBuild b/libraries/libgksu/libgksu.SlackBuild
index 105711ab39..6d61b3fa2e 100644
--- a/libraries/libgksu/libgksu.SlackBuild
+++ b/libraries/libgksu/libgksu.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=libgksu
 VERSION=${VERSION:-2.0.12}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -65,10 +65,10 @@ 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 {} \;
 
 # Patches from gentoo.
 patch -p1 < $CWD/patches/libgksu-2.0.0-fbsd.patch
@@ -79,6 +79,11 @@ patch -p0 < $CWD/patches/libgksu-2.0.12-fix-make-3.82.patch
 patch -p1 < $CWD/patches/libgksu-2.0.12-notests.patch
 patch -p1 < $CWD/patches/libgksu-2.0.12-automake-1.11.2.patch
 
+# Patch from mancha
+if [ "$ARCH" = "x86_64" ]; then
+  patch -p1 < $CWD/patches/libgksu-2.0.12-x86_64-path.diff
+fi
+
 touch NEWS README
 libtoolize --force --copy --install
 autoreconf
@@ -101,9 +106,12 @@ make install DESTDIR=$PKG
 
 mkdir -p $PKG/etc/gconf/gconf.xml.defaults
 
-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 \
   INSTALL ChangeLog COPYING AUTHORS ABOUT-NLS \
diff --git a/libraries/libgksu/patches/libgksu-2.0.12-x86_64-path.diff b/libraries/libgksu/patches/libgksu-2.0.12-x86_64-path.diff
new file mode 100644
index 0000000000..35f578f7d3
--- /dev/null
+++ b/libraries/libgksu/patches/libgksu-2.0.12-x86_64-path.diff
@@ -0,0 +1,22 @@
+From 803667f7c8a8610b270ea0a50df9562b3e11025c Mon Sep 17 00:00:00 2001
+From: mancha <mancha1@hush.com>
+Date: Thu, 13 Feb 2014
+Subject: Change hardcoded path for helper
+
+SBo installs gksu-run-helper under /usr/lib64 for x86_64 systems.
+This patch changes the hard-coded path so it is found.
+
+ libgksu/libgksu.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgksu/libgksu.c
++++ b/libgksu/libgksu.c
+@@ -1936,7 +1936,7 @@ gksu_su_fuller (GksuContext *context,
+   GQuark gksu_quark;
+   int i = 0;
+ 
+-  gchar auxcommand[] = PREFIX "/lib/" PACKAGE "/gksu-run-helper";
++  gchar auxcommand[] = PREFIX "/lib64/" PACKAGE "/gksu-run-helper";
+ 
+   int fdpty;
+   pid_t pid;
-- 
cgit v1.2.3