diff options
Diffstat (limited to 'office/fbreader')
| -rw-r--r-- | office/fbreader/fbreader-0.99.4.patch | 8 | ||||
| -rw-r--r-- | office/fbreader/fbreader.SlackBuild | 39 | ||||
| -rw-r--r-- | office/fbreader/fbreader.info | 8 | ||||
| -rw-r--r-- | office/fbreader/fbreader_gcc45x.patch | 11 |
4 files changed, 22 insertions, 44 deletions
diff --git a/office/fbreader/fbreader-0.99.4.patch b/office/fbreader/fbreader-0.99.4.patch new file mode 100644 index 0000000000..deb9022830 --- /dev/null +++ b/office/fbreader/fbreader-0.99.4.patch @@ -0,0 +1,8 @@ +diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2013-02-21 13:30:31.000000000 +0700 +@@ -49,3 +49,4 @@ + path = replacement + path.substr(1); + } ++ ZLUnixFSManager::normalizeRealPath(path); + } diff --git a/office/fbreader/fbreader.SlackBuild b/office/fbreader/fbreader.SlackBuild index 9523773648..09fe528408 100644 --- a/office/fbreader/fbreader.SlackBuild +++ b/office/fbreader/fbreader.SlackBuild @@ -6,8 +6,8 @@ # revision date: 2011/03/09 PRGNAM=fbreader -VERSION=${VERSION:-0.12.10} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.99.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -61,33 +61,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# We're building for desktop against Qt4 -# If you want to build against GTK+2, just change UI_TYPE to gtk -cat > makefiles/target.mk << EOF -TARGET_ARCH = desktop -UI_TYPE = $UI -TARGET_STATUS = release -EOF - -# Add SLKCFLAGS -sed -i "s|CFLAGS =|CFLAGS = $SLKCFLAGS|" makefiles/arch/desktop.mk - -# Fix all Qt3 related flags (just in case) -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 - -# Patch source for gcc45x hickup (from the friendly ARCH people) -patch -p1 < $CWD/fbreader_gcc45x.patch - -# Use "-j1" to avoid some warnings -make -j1 LIBDIR=/usr/lib${LIBDIRSUFFIX} -make install LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG +patch -p1 < $CWD/fbreader-0.99.4.patch + +export TARGET_ARCH=desktop +export UI_TYPE=$UI +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 \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/office/fbreader/fbreader.info b/office/fbreader/fbreader.info index 2a6fdcddbe..e4b40e50fc 100644 --- a/office/fbreader/fbreader.info +++ b/office/fbreader/fbreader.info @@ -1,10 +1,10 @@ PRGNAM="fbreader" -VERSION="0.12.10" +VERSION="0.99.4" HOMEPAGE="http://fbreader.org/" -DOWNLOAD="http://www.fbreader.org/files/sources/fbreader-sources-0.12.10.tgz" -MD5SUM="da9ec4721efdb0ec0aaa182bff16ad82" +DOWNLOAD="http://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz" +MD5SUM="ed13a9c3aeb68aaa98a1dd6f7947a31d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="liblinebreak" +REQUIRES="libunibreak" MAINTAINER="Niels Horn" EMAIL="niels.horn@gmail.com" diff --git a/office/fbreader/fbreader_gcc45x.patch b/office/fbreader/fbreader_gcc45x.patch deleted file mode 100644 index a54bdb58cc..0000000000 --- a/office/fbreader/fbreader_gcc45x.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- fbreader-0.12.10/fbreader/src/library/Library.cpp 2010-04-01 10:14:24.000000000 -0300 -+++ fbreader-0.12.10_patched/fbreader/src/library/Library.cpp 2011-03-09 01:48:27.000000000 -0300 -@@ -39,7 +39,7 @@ - shared_ptr<Library> Library::ourInstance; - const size_t Library::MaxRecentListSize = 10; - --Library::Library &Library::Instance() { -+Library &Library::Instance() { - if (ourInstance.isNull()) { - ourInstance = new Library(); - } |