diff options
Diffstat (limited to 'source/xap/gucharmap')
| -rw-r--r-- | source/xap/gucharmap/doinst.sh | 12 | ||||
| -rwxr-xr-x | source/xap/gucharmap/gucharmap.SlackBuild | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/source/xap/gucharmap/doinst.sh b/source/xap/gucharmap/doinst.sh index f6a667688..5146862f5 100644 --- a/source/xap/gucharmap/doinst.sh +++ b/source/xap/gucharmap/doinst.sh @@ -1,10 +1,4 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/glib-2.0/schemas ]; then - if [ -x /usr/bin/glib-compile-schemas ]; then - /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 - fi -fi +# Try to run these. If they fail, no biggie. +chroot . /usr/bin/update-desktop-database -q usr/share/applications 1> /dev/null 2> /dev/null +chroot . /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/ 1> /dev/null 2> /dev/null diff --git a/source/xap/gucharmap/gucharmap.SlackBuild b/source/xap/gucharmap/gucharmap.SlackBuild index 4ceef2337..56fe66c67 100755 --- a/source/xap/gucharmap/gucharmap.SlackBuild +++ b/source/xap/gucharmap/gucharmap.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -60,7 +60,6 @@ cd $TMP rm -rf gucharmap-$VERSION tar xvf $CWD/gucharmap-$VERSION.tar.?z* || exit 1 cd gucharmap-$VERSION || exit 1 -#zcat $CWD/gucharmap.noscrollkeeper.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -76,7 +75,6 @@ CFLAGS="$SLKCFLAGS" \ --localstatedir=/var/lib \ --docdir=/usr/doc/gucharmap-$VERSION \ --enable-static=no \ - --disable-scrollkeeper \ --build=$ARCH-slackware-linux make -i $NUMJOBS || make || exit 1 @@ -102,6 +100,7 @@ if [ -r ChangeLog ]; then fi mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG |