aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--office/fbreader/README3
-rw-r--r--office/fbreader/fbreader.SlackBuild11
2 files changed, 3 insertions, 11 deletions
diff --git a/office/fbreader/README b/office/fbreader/README
index 3108795049519..286d2d0937d13 100644
--- a/office/fbreader/README
+++ b/office/fbreader/README
@@ -1,4 +1 @@
FBReader is e-book reader for Linux PDAs and desktop.
-
-This builds the Qt-based user interface by default; if you prefer the GTK
-interface instead, run the script as follows: UI=gtk ./fbreader.SlackBuild
diff --git a/office/fbreader/fbreader.SlackBuild b/office/fbreader/fbreader.SlackBuild
index 09fe52840853c..d5c54adeacf35 100644
--- a/office/fbreader/fbreader.SlackBuild
+++ b/office/fbreader/fbreader.SlackBuild
@@ -23,11 +23,6 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-# If you want to build the gtk interface instead, then change this
-# value to 'gtk' or run the script like this:
-# UI=gtk ./fbreader.SlackBuild
-UI=${UI:-qt4}
-
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -59,18 +54,18 @@ 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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p1 < $CWD/fbreader-0.99.4.patch
export TARGET_ARCH=desktop
-export UI_TYPE=$UI
+export UI_TYPE=qt4
export TARGET_STATUS=release
make LIBDIR=/usr/lib${LIBDIRSUFFIX} ZLSHARED=no MOC=/usr/bin/moc
make install LIBDIR=/usr/lib${LIBDIRSUFFIX} ZLSHARED=no DESTDIR=$PKG
-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
# Fix .desktop file