summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-text')
-rw-r--r--app-text/fbreader/ChangeLog8
-rw-r--r--app-text/fbreader/fbreader-0.99.4-r1.ebuild (renamed from app-text/fbreader/fbreader-0.99.2.ebuild)11
-rw-r--r--app-text/fbreader/files/fbreader-0.99.4.patch8
3 files changed, 24 insertions, 3 deletions
diff --git a/app-text/fbreader/ChangeLog b/app-text/fbreader/ChangeLog
index cfea146b960a..7196bb1041e0 100644
--- a/app-text/fbreader/ChangeLog
+++ b/app-text/fbreader/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-text/fbreader
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.32 2013/01/19 06:13:47 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.33 2013/02/21 13:40:17 grozin Exp $
+
+*fbreader-0.99.4-r1 (21 Feb 2013)
+
+ 21 Feb 2013; Andrey Grozin <grozin@gentoo.org> -fbreader-0.99.2.ebuild,
+ +fbreader-0.99.4-r1.ebuild, +files/fbreader-0.99.4.patch:
+ Fixed #452636
19 Jan 2013; Andrey Grozin <grozin@gentoo.org> +fbreader-0.99.2.ebuild:
Added 0.99.2 back, see bug #452636
diff --git a/app-text/fbreader/fbreader-0.99.2.ebuild b/app-text/fbreader/fbreader-0.99.4-r1.ebuild
index 1767d9fa2e75..755f7b638787 100644
--- a/app-text/fbreader/fbreader-0.99.2.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.99.2.ebuild,v 1.5 2013/01/19 06:13:47 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.99.4-r1.ebuild,v 1.1 2013/02/21 13:40:17 grozin Exp $
-EAPI=4
+EAPI=5
inherit eutils multilib
@@ -39,6 +39,10 @@ src_prepare() {
sed -e "/^CC = /d" \
-i makefiles/arch/desktop.mk || die "removing CC line failed"
+ # let portage strip the binary
+ sed -e '/@strip/d' \
+ -i fbreader/desktop/Makefile || die
+
# Respect *FLAGS
sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
-i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
@@ -61,6 +65,9 @@ src_prepare() {
else
echo "TARGET_STATUS = release" >> makefiles/target.mk
fi
+
+ # bug #452636
+ epatch "${FILESDIR}"/${P}.patch
}
src_install() {
diff --git a/app-text/fbreader/files/fbreader-0.99.4.patch b/app-text/fbreader/files/fbreader-0.99.4.patch
new file mode 100644
index 000000000000..deb90228301d
--- /dev/null
+++ b/app-text/fbreader/files/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);
+ }