diff options
| author |   Andrey Grozin <grozin@gentoo.org> | 2013-02-21 13:40:22 +0000 |
|---|---|---|
| committer | Andrey Grozin <grozin@gentoo.org> | 2013-02-21 13:40:22 +0000 |
| commit | cd1f74ce73625124b029afc5eb9cd10b5241ec16 (patch) | |
| tree | 47097843ce66d94cb89d0942663c8d287d7785c8 /app-text | |
| parent | Stable for ia64, wrt bug #457342 (diff) | |
| download | historical-cd1f74ce73625124b029afc5eb9cd10b5241ec16.tar.gz historical-cd1f74ce73625124b029afc5eb9cd10b5241ec16.tar.bz2 historical-cd1f74ce73625124b029afc5eb9cd10b5241ec16.zip | |
Fixed #452636
Package-Manager: portage-2.2.0_alpha163/cvs/Linux i686
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/fbreader/ChangeLog | 8 | ||||
| -rw-r--r-- | app-text/fbreader/Manifest | 6 | ||||
| -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.patch | 8 |
4 files changed, 27 insertions, 6 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/Manifest b/app-text/fbreader/Manifest index 97578fb3620f..a17f6738a069 100644 --- a/app-text/fbreader/Manifest +++ b/app-text/fbreader/Manifest @@ -1,6 +1,6 @@ -DIST fbreader-sources-0.99.2.tgz 2423279 SHA256 e753010dc041396ddfd385a4a7fb7e01b219644015fe5776253aeeca0e13a650 SHA512 73d86e08162e29e86a9f0fa687c11bcf5b089340799c06b3924b413d048ca817ba5ab97102479df5d1c5ed29e66479b99c0cde3fd49b51ef9f6032b25b523d80 WHIRLPOOL b782e8ff924580071bac8d2a77e21284805f469dd40ed30ce589fef1e38b46d0d245af8a98b45cec4f6a84055c132139b49acc7a63b3a6be42b6251005179169 +AUX fbreader-0.99.4.patch 472 SHA256 cb3aa6795c8f7c694ba296f6f6e6a7939648578a289bc84c10f8302c7e72df86 SHA512 486dc74e3cfc6f94f1bf95269e35e866465095efee0cd31b586592fbd780613d4d5d243b809e494da14a69da8e0c5e47e6dd2ca35619616c4497eb0a053ba09d WHIRLPOOL c9bed0e846e90e9d31240d24ae536092a00819676fa9588b3125182bb242a597a69947eaa4b19ab5f7b2aba5fc4cf5e700c945f5174d2e8a384677ac6c256c42 DIST fbreader-sources-0.99.4.tgz 2345664 SHA256 3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7 WHIRLPOOL 1d25ff39bcd93d3b0445abc76d3bbaf5e376385303fd71c98e3844123c85b9edd413f18c8d89a95807391ee2fb9c044d4dfc4b5898484548a011ecc22993e3d9 -EBUILD fbreader-0.99.2.ebuild 1860 SHA256 93f4cb916f7b0e6d548d48150961a452738bab81c234a9ee2d0cc47548ca877f SHA512 205a8a0f8aa3fca806b7b54c6d4a05355d8a80dc7ae91395f800fb000023c8684f42742ee2ce71edfbbd7815803c1945995c4893c174986f6a786d87a2168bc3 WHIRLPOOL 9230a042e77f37c16dbd02a88912ef548586b1161ccc40c54a618eb898690c8b89fcda3168c0501020b34d1583dde63e29527330e3c0639956c407bfc58cdf74 +EBUILD fbreader-0.99.4-r1.ebuild 2005 SHA256 8c9013e7a93b5b0b33919aa106d6065f6cb7d2544704e1c9f98b3cf5a3b26a11 SHA512 fcba91454abd2ca3a73f16f9245b57d11378b41d4c6ae69fc00392967369d2e6cee7fe9b63d6c4ec6cfa06ccf83e21b8b57a44bd4550562da2e8d3c51c117c76 WHIRLPOOL f8bf3b6e9b938de22cec573c5b293f5de2e1a46cafc233dca0f8abd6f2af4e5b623a9fcb21a128811b1888c3835666fa7e3bfc0a2f42cb2617fee692e4cd4fd5 EBUILD fbreader-0.99.4.ebuild 1954 SHA256 82ebdafda8a65de96bd8d480f231f88332dceb4b526b3e53fbafed3e95cae566 SHA512 d712a6f70b47ce94e3309ef8c707556080ede734151fdc2a7703c8e0f6ef919067c7fb6a780368497aabe70d8c6d2163271baeaa2deae2ca6e1e794873424062 WHIRLPOOL 82de5b0b9b374c89a9de432cfd4743e0ba032045e83aec6e42fc46019b05cebc040bb916b8abe93ee99567e33630b4e5910f9102e6a60efa2b51a10052a5316d -MISC ChangeLog 5030 SHA256 f9b187e449c9f43b39c4c66dfd809825cda00e2591125ec0acf6152bf65c6033 SHA512 459d45f921ac1a9842673d04cf4bafa385022b8cbe378171fbe7cd74ebaebed6e48efe70d9a79eb74b0a460a04a8f347e34f6a49d66e5243c4797f5b91b452f9 WHIRLPOOL bc5a8c367d8df78f5d8fbf17c02a17159161e579a024931e88a6a240ef6a9ce4158975e2e823f6855659894e89c819cb16ac7b98f8f2f4fb71d221af7ba8547e +MISC ChangeLog 5216 SHA256 ad5b2ada890bc263eda1993c5749a2146382c54945fd372566398312ea321adc SHA512 34d0ff2461a0fb5fca77900d77c70599106581048cc5bf4a722fe8f794e3319fe6a9495de9272aa097bbef97e8fbff7f9a3cab99fbdfbb3780cea7df0d12ecfc WHIRLPOOL 32a02b093554e144937007346838dc7f58c51733242082b368a16137e29edb7c961dfff15c35c6bfc5e668ed90fa8e07a8efc3b297f1eb06795da969c9820a5b MISC metadata.xml 367 SHA256 ea449e9ab5b0604e10360c35f9646cf74e15a54bb6e937cea8b0479739e1a25f SHA512 68f9b5b01c0bf0737c10bb95d929ce35fba13c21ebf231ace312cea9c3a6ff4bda15ecfa10e38a2791dff81584c438a4d29614c1cce83edb7b93a5312cb2d1da WHIRLPOOL 6d0146fcce4b6a9c93403e533c452cfd9a2029da5e17b209661bd181b248031cb92f42c569ad4920063f746c84f5e9f3be99191f8f830aad36ac8c3583017482 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); + } |