summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--office/epdfview/doinst.sh9
-rw-r--r--office/epdfview/epdfview.SlackBuild39
-rw-r--r--office/epdfview/epdfview.info2
3 files changed, 36 insertions, 14 deletions
diff --git a/office/epdfview/doinst.sh b/office/epdfview/doinst.sh
index f39d8d4dfa..1f8ff67ded 100644
--- a/office/epdfview/doinst.sh
+++ b/office/epdfview/doinst.sh
@@ -1,3 +1,10 @@
if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
+
diff --git a/office/epdfview/epdfview.SlackBuild b/office/epdfview/epdfview.SlackBuild
index 7ff0f29e32..afdf7fabd6 100644
--- a/office/epdfview/epdfview.SlackBuild
+++ b/office/epdfview/epdfview.SlackBuild
@@ -37,19 +37,22 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2"
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvjf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
find . \
@@ -59,32 +62,42 @@ find . \
-exec chmod 644 {} \;
# Add patch to fix mouse-scrolling in 0.1.7
-patch -Np0 -i $CWD/mouse-scroll-fix.patch
+patch -p0 < $CWD/mouse-scroll-fix.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
- --prefix=/usr
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --build=$ARCH-slackware-linux
make
make install-strip DESTDIR=$PKG
# Add some default icons
install -d $PKG/usr/share/icons/hicolor/{24x24,32x32,48x48}/apps
-install -m644 data/icon_epdfview-24.png "$PKG/usr/share/icons/hicolor/24x24/apps/epdfview.png"
-install -m644 data/icon_epdfview-32.png "$PKG/usr/share/icons/hicolor/32x32/apps/epdfview.png"
-install -m644 data/icon_epdfview-48.png "$PKG/usr/share/icons/hicolor/48x48/apps/epdfview.png"
+install -m644 data/icon_epdfview-24.png \
+ $PKG/usr/share/icons/hicolor/24x24/apps/epdfview.png
+install -m644 data/icon_epdfview-32.png \
+ $PKG/usr/share/icons/hicolor/32x32/apps/epdfview.png
+install -m644 data/icon_epdfview-48.png \
+ $PKG/usr/share/icons/hicolor/48x48/apps/epdfview.png
+
+# Fix path to icons in .desktop file
+sed -i 's#Icon=icon_epdfview-48#Icon=epdfview#' \
+ $PKG/usr/share/applications/$PRGNAM.desktop
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING INSTALL NEWS README \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-# Fix path to icons in .desktop file
-sed -i 's#Icon=icon_epdfview-48#Icon=epdfview#' $PKG/usr/share/applications/$PRGNAM.desktop
-
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/epdfview/epdfview.info b/office/epdfview/epdfview.info
index cd758e3ed0..87b8336065 100644
--- a/office/epdfview/epdfview.info
+++ b/office/epdfview/epdfview.info
@@ -3,6 +3,8 @@ VERSION="0.1.7"
HOMEPAGE="http://trac.emma-soft.com/epdfview/"
DOWNLOAD="http://trac.emma-soft.com/epdfview/chrome/site/releases/epdfview-0.1.7.tar.bz2"
MD5SUM="1919bb19c16ef0a97d48b0a8303d3c7b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="Andrew Brouwers"
EMAIL="abrouwers@gmail.com"
APPROVED="dsomero"