diff --git a/office/fbreader/README b/office/fbreader/README index bfc9a32bf0..8188c15eb7 100644 --- a/office/fbreader/README +++ b/office/fbreader/README @@ -8,11 +8,13 @@ FBReader is e-book reader for Linux PDAs and desktop. (css and tables are not supported); OpenReader format (css and tables are not supported); Non-DRM'ed mobipocket format (tables are not supported); Plain text format. -- Direct reading from tar, zip, gzip and bzip2 archives. +- Direct reading from tar, zip, gzip and bzip2 archives. - Automatically generated contents table. - Embedded images support. - Footnotes/hyperlinks support. -This builds the QT-based user interface by default; if you prefer to build +Requires liblinebreak (build time dependency) which can be found here at SBo. + +This builds the Qt-based user interface by default; if you prefer to build the GTK interface instead, run the script as follows: UI=gtk ./fbreader.SlackBuild diff --git a/office/fbreader/doinst.sh b/office/fbreader/doinst.sh index 34be13eb65..5fb28930db 100644 --- a/office/fbreader/doinst.sh +++ b/office/fbreader/doinst.sh @@ -1,3 +1,3 @@ -if [ -x usr/bin/update-desktop-database ]; then - usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1 +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi diff --git a/office/fbreader/fbreader.SlackBuild b/office/fbreader/fbreader.SlackBuild index 1d732a0be9..515d2c4c7c 100644 --- a/office/fbreader/fbreader.SlackBuild +++ b/office/fbreader/fbreader.SlackBuild @@ -4,7 +4,7 @@ # Written by Audrius Kažukauskas PRGNAM=fbreader -VERSION=0.8.8d +VERSION=0.8.17 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -17,6 +17,7 @@ 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 +# (or UI=qt4 for those who have Qt4 from -current) UI=${UI:-qt} if [ "$ARCH" = "i486" ]; then @@ -52,6 +53,11 @@ sed -i 's|moc-qt3|moc|' makefiles/arch/desktop.mk sed -i 's|-I /usr/include/qt3|$(shell pkg-config --cflags qt-mt)|' makefiles/arch/desktop.mk sed -i 's|-lqt-mt|$(shell pkg-config --libs qt-mt)|' makefiles/arch/desktop.mk +# Fix all Qt4 related flags +sed -i 's|moc-qt4|moc|' makefiles/arch/desktop.mk +sed -i 's|-I /usr/include/qt4|$(shell pkg-config --cflags QtGui)|' makefiles/arch/desktop.mk +sed -i 's|-lQtGui|$(shell pkg-config --libs QtGui)|' makefiles/arch/desktop.mk + make make install DESTDIR=$PKG diff --git a/office/fbreader/fbreader.info b/office/fbreader/fbreader.info index fcd6fac9be..daba4124ed 100644 --- a/office/fbreader/fbreader.info +++ b/office/fbreader/fbreader.info @@ -1,8 +1,8 @@ PRGNAM="fbreader" -VERSION="0.8.8d" +VERSION="0.8.17" HOMEPAGE="http://www.fbreader.org/" -DOWNLOAD="http://www.fbreader.org/fbreader-sources-0.8.8d.tgz" -MD5SUM="37839e49a7696e615cf87c3eba59e1a5" +DOWNLOAD="http://www.fbreader.org/fbreader-sources-0.8.17.tgz" +MD5SUM="cde2f1224c51d0adbf970bdb6748eb90" MAINTAINER="Audrius Kazukauskas" EMAIL="neobug@tornado.ktu.lt" -APPROVED="rworkman" +APPROVED="David Somero" \ No newline at end of file