diff options
Diffstat (limited to 'app-text/fbreader')
-rw-r--r-- | app-text/fbreader/Manifest | 10 | ||||
-rw-r--r-- | app-text/fbreader/fbreader-0.99.4-r2.ebuild | 88 | ||||
-rw-r--r-- | app-text/fbreader/files/fbreader-0.99.4-gcc6.patch | 11 | ||||
-rw-r--r-- | app-text/fbreader/files/fbreader-0.99.4-ld-bfd.patch | 10 | ||||
-rw-r--r-- | app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch | 6 | ||||
-rw-r--r-- | app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch | 13 | ||||
-rw-r--r-- | app-text/fbreader/files/fbreader-0.99.4.patch | 8 | ||||
-rw-r--r-- | app-text/fbreader/metadata.xml | 10 |
8 files changed, 156 insertions, 0 deletions
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest new file mode 100644 index 000000000000..99d782c8d632 --- /dev/null +++ b/app-text/fbreader/Manifest @@ -0,0 +1,10 @@ +AUX fbreader-0.99.4-gcc6.patch 512 SHA256 bc67b538c51a5b77468469df6b5e96ce918ee11a5ff4e88e398ad5661d322f9c SHA512 79c64750c250e10fa6530ed397a77ed9ebb2b76d12a6c0967cf8739b24f8381c76961e72388d0116f514c71c3cecc04a4945781dc87db3a30a18e4a1afc0315d WHIRLPOOL c135809b6e692f2fced4d0674154c7b25939fd5f924d52aecabda500b27da8bbfb78b3ced1e91575fcd00e468265656f8e9b5dec793da2ea13fc722985078411 +AUX fbreader-0.99.4-ld-bfd.patch 532 SHA256 c583f1bf48349f69972e83955265799ea218c2b359a3eb0eb11211ae7c9d5802 SHA512 77c6a0454706f68f5065333c1bbf8456aaf405ae8532019f1d557d5f66d7d0b633d409b320c8ffba50a78d04f4d64c7d655c3b0ee6f87fdf146aa5f04332167d WHIRLPOOL 7be2d6bf4bb4f8d473cb804dee90ae26608f57ec65e1f8bf14d10dbf1eb17d5693fd0b1d767be24ee35fdcae4ad73e9883b7df962d6d4b757983cc98ac1b890a +AUX fbreader-0.99.4-mimetypes.patch 505 SHA256 8f7f6c793ed08ef305031d402e996911942fabead97e69f87e7cc556572647f1 SHA512 03fd64a802be53bf33c9582d5c2804e0c67809a43db02a2bfbc3e5a15592346cae9ba44333f2f547bcc623bc1d9785ca7a10c77d58a23152a1d3f59328e75d7b WHIRLPOOL 3f4847c2c02cd9f6dedd1df4fc33ca007ee8fd3dac6d0ba170bb2f188a1fad4f393ae1865dd705f78b4666e0af48684c2bae3ce5f7c55a3a83baadb8d580dd66 +AUX fbreader-0.99.4-qreal-cast.patch 950 SHA256 0f3e585292c0dbefa4db33c2b69e90871400be0f92f18fa6ed32daae1227f848 SHA512 260e1966eb5f0bfd42fc3c28fdcdd92d37314d93b31f44e1ec0f94e81ad0084caeaadb69cbd16eb4e8f8b9359534449604845e1b79e63b0dd2eff96b342286d1 WHIRLPOOL aafe31212c1111e43d504f4b84119cdd766c656c86ea454a2fbee541fa5f6bf3649c33aa4874b578d5f0b8ad0541b417a9c69bca11c06c63263f52b62dd3a12d +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.4-r2.ebuild 2144 SHA256 87b49ae4e525a1c9d285a9ed49bf36ea2bc9f6a5b2e13ac73e28cac9807632e7 SHA512 4219403d355e7b38a04944cb589090a412fcbf1fdf2c21a5f04984f41c6175096bcc9436dd0179e19687f08d5b6326290baadb8b4e641254f627c679b50d09ee WHIRLPOOL 4f029512f2400269915e8c27bb718d157d98a325921c3e1c8ff6d66a1f8f9d4b31994d5aeaa4fa253f74410bc27d81e4b67248347059e7b4295d94dfcaef9718 +MISC ChangeLog 2862 SHA256 d71979bfe4b7db5a250a69508147d5b041345332d79da2aef5674f3e225a6461 SHA512 7119be4d7ab6af8835a81ea616b15febdc480987669e60e88ac6e401e46eebea51b9abd1a3f22e797f7a644e14a481a184df2302bcb3b2c8712dc6e71646d489 WHIRLPOOL f756ded8013beb14a2a574d5414cc5cb9aef19a12ff5ec75ec30a0c56eec9f5fd20b5c468dade79f0196e7a16f5a4993dfb7dccdbb1f4bd515a1feca37818bca +MISC ChangeLog-2015 6698 SHA256 1df0df24d5560e8398111e053087e8153ee5f9da9dbd8cd2868db3c58449929d SHA512 31b67c3fb8c0b3854d750f0bf2840cbc82d99e7b67c599898c3f5a6f6ae4b2a94e1afc6b4cd1f9bfba0e24f3dacb80abcabe610b0e90626822843464d471ef93 WHIRLPOOL 8c9e35fadbd828160efdec9673f2fc3e26b1c7f10c551fd2097558cb397af939600eb2e07eedc896ecf129f9c1dfd4291ff78ca40f60c86d3ee99c330f3acf03 +MISC metadata.xml 332 SHA256 e5dde6d2eaf01486025c10a8ddea13c5db04504de76002de9beaf0042f73760b SHA512 f8ea42df45ef57c3a81098a86e13ab124ebfb4f6a8ae34153a03977e122448358d2cb852dd1f9b95a50e293f33a159940132b35b9444e5553eed6017bdeb5e98 WHIRLPOOL 2fa86bf91438ae5df35038019aa2e2d27eb79bd5510830bbdc3e7d0c9ba9e2217fe8c7d160d0874a5d10dbb630c962d24b8625f3b6eda915c77fd47940853372 diff --git a/app-text/fbreader/fbreader-0.99.4-r2.ebuild b/app-text/fbreader/fbreader-0.99.4-r2.ebuild new file mode 100644 index 000000000000..347957b53029 --- /dev/null +++ b/app-text/fbreader/fbreader-0.99.4-r2.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils multilib + +DESCRIPTION="E-Book Reader. Supports many e-book formats" +HOMEPAGE="http://www.fbreader.org/" +SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~ppc x86" +IUSE="debug" + +RDEPEND=" + app-arch/bzip2 + dev-libs/expat + dev-libs/liblinebreak + dev-libs/fribidi + dev-db/sqlite + net-misc/curl + sys-libs/zlib + dev-qt/qtcore:4[ssl] + dev-qt/qtgui:4 +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +src_prepare() { + # Still use linebreak instead of new unibreak + sed -e "s:-lunibreak:-llinebreak:" \ + -i makefiles/config.mk zlibrary/text/Makefile || die "fixing libunibreak failed" + + # Let portage decide about the compiler + 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" + sed -e "/^ CFLAGS +=/ d" \ + -i makefiles/config.mk || die "CFLAGS sed failed" + sed -e "/^ LDFLAGS += -s$/ d" \ + -i makefiles/config.mk || die "sed failed" + sed -e "/^LDFLAGS =$/ d" \ + -i makefiles/arch/desktop.mk || die "sed failed" + + echo "TARGET_ARCH = desktop" > makefiles/target.mk + echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk + + echo "UI_TYPE = qt4" >> makefiles/target.mk + sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \ + -i makefiles/arch/desktop.mk || die "updating desktop.mk failed" + + if use debug; then + echo "TARGET_STATUS = debug" >> makefiles/target.mk + else + echo "TARGET_STATUS = release" >> makefiles/target.mk + fi + + # bug #452636 + epatch "${FILESDIR}"/${P}.patch + # bug #515698 + epatch "${FILESDIR}"/${P}-qreal-cast.patch + # bug #516794 + epatch "${FILESDIR}"/${P}-mimetypes.patch + # bug #437262 + epatch "${FILESDIR}"/${P}-ld-bfd.patch + # bug #592588 + epatch "${FILESDIR}"/${P}-gcc6.patch +} + +src_compile() { + # bug #484516 + emake -j1 +} + +src_install() { + default + dosym FBReader /usr/bin/fbreader +} diff --git a/app-text/fbreader/files/fbreader-0.99.4-gcc6.patch b/app-text/fbreader/files/fbreader-0.99.4-gcc6.patch new file mode 100644 index 000000000000..c6f87a292697 --- /dev/null +++ b/app-text/fbreader/files/fbreader-0.99.4-gcc6.patch @@ -0,0 +1,11 @@ +--- fbreader/src/formats/doc/OleStorage.cpp 2012-11-30 13:41:25.000000000 +0100 ++++ fbreader/src/formats/doc/OleStorage.cpp-new 2016-08-31 17:23:18.232536401 +0200 +@@ -59,7 +59,7 @@ + clear(); + return false; + } +- static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0}; ++ static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0}; + if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) { + clear(); + return false; diff --git a/app-text/fbreader/files/fbreader-0.99.4-ld-bfd.patch b/app-text/fbreader/files/fbreader-0.99.4-ld-bfd.patch new file mode 100644 index 000000000000..ab872edf17cd --- /dev/null +++ b/app-text/fbreader/files/fbreader-0.99.4-ld-bfd.patch @@ -0,0 +1,10 @@ +diff -r -U2 fbreader-0.99.4.orig/fbreader/Makefile fbreader-0.99.4/fbreader/Makefile +--- fbreader-0.99.4.orig/fbreader/Makefile 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/fbreader/Makefile 2016-08-31 19:06:35.011708982 +0700 +@@ -23,5 +23,5 @@ + done; + @echo -n 'Linking $(TARGET) ...' +- @$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3 ++ @$(LD) -fuse-ld=bfd $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3 + @echo ' OK' + diff --git a/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch b/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch new file mode 100644 index 000000000000..0e4a2935d442 --- /dev/null +++ b/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch @@ -0,0 +1,6 @@ +diff -r -U1 fbreader-0.99.4.orig/fbreader/desktop/desktop fbreader-0.99.4/fbreader/desktop/desktop +--- fbreader-0.99.4.orig/fbreader/desktop/desktop 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/fbreader/desktop/desktop 2014-07-10 20:56:33.527638562 +0700 +@@ -23 +23,2 @@ + Categories=Office;Viewer;Literature; ++MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain; diff --git a/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch b/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch new file mode 100644 index 000000000000..ffd21b2924f7 --- /dev/null +++ b/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch @@ -0,0 +1,13 @@ +diff -r -U1 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp +--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2012-11-30 19:41:25.000000000 +0700 ++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2014-07-10 19:18:17.002886537 +0700 +@@ -88,3 +88,3 @@ + void QtWaitingSpinner::setRoundness(qreal roundness) { +- myRoundness = std::max(0.0, std::min(100.0, roundness)); ++ myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness)); + } +@@ -150,3 +150,3 @@ + qreal resultAlpha = color.alphaF() - gradation * distance; +- resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds ++ resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds + color.setAlphaF(resultAlpha); 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); + } diff --git a/app-text/fbreader/metadata.xml b/app-text/fbreader/metadata.xml new file mode 100644 index 000000000000..f71ef8d677c5 --- /dev/null +++ b/app-text/fbreader/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>grozin@gentoo.org</email> + </maintainer> + <longdescription lang="en"> + FBReader is an e-book reader for various platforms. + </longdescription> +</pkgmetadata> |