* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2021-08-01 18:27 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-08-01 18:27 UTC (permalink / raw
To: gentoo-commits
commit: 0138a2425de64b533b21244ce14373e0e6986ca1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 1 06:24:39 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 1 18:27:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0138a242
app-text/fbreader: drop obsolete qt5 C++11 workaround
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/fbreader/fbreader-0.99.4-r5.ebuild | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
index b3b298ab9d8..76413d99296 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit flag-o-matic qmake-utils xdg
+inherit qmake-utils xdg
DESCRIPTION="E-Book Reader. Supports many e-book formats"
HOMEPAGE="https://www.fbreader.org/"
@@ -39,8 +39,6 @@ PATCHES=( "${DISTDIR}"/${P}-combined.patch )
src_prepare() {
default
- append-cflags -std=c++11
-
# Let portage decide about the compiler
sed -e "/^CC = /d" \
-i makefiles/arch/desktop.mk || die "removing CC line failed"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2021-12-01 15:54 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-12-01 15:54 UTC (permalink / raw
To: gentoo-commits
commit: d1dcb6871d0b6f825cd2e5f821cf54d44f327cb8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 1 15:51:10 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 1 15:51:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1dcb687
app-text/fbreader: add subslot operator for libunibreak
Reported-by: kurly
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../fbreader/{fbreader-0.99.4-r5.ebuild => fbreader-0.99.4-r6.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r6.ebuild
similarity index 98%
rename from app-text/fbreader/fbreader-0.99.4-r5.ebuild
rename to app-text/fbreader/fbreader-0.99.4-r6.ebuild
index 44288fac4896..5ab017db26e5 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r6.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
dev-db/sqlite
dev-libs/expat
dev-libs/fribidi
- dev-libs/libunibreak
+ dev-libs/libunibreak:=
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2021-11-07 5:05 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-11-07 5:05 UTC (permalink / raw
To: gentoo-commits
commit: 92bf07a9d62eceade5cf107c9392ef1e907049be
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 7 04:57:53 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 7 04:57:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92bf07a9
app-text/fbreader: disable gold
Bug: https://bugs.gentoo.org/437262
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/fbreader/fbreader-0.99.4-r5.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
index 76413d99296..44288fac489 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit qmake-utils xdg
+inherit qmake-utils toolchain-funcs xdg
DESCRIPTION="E-Book Reader. Supports many e-book formats"
HOMEPAGE="https://www.fbreader.org/"
@@ -71,6 +71,9 @@ src_prepare() {
else
echo "TARGET_STATUS = release" >> makefiles/target.mk || die
fi
+
+ # bug #437262
+ tc-ld-disable-gold
}
src_compile() {
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2021-08-01 18:27 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-08-01 18:27 UTC (permalink / raw
To: gentoo-commits
commit: 8163150c9dcc8b4cdaa8bd1adb0536dbc3cac796
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 1 06:25:14 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 1 18:27:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8163150c
app-text/fbreader: add github upstream metadata
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/fbreader/metadata.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app-text/fbreader/metadata.xml b/app-text/fbreader/metadata.xml
index 13830225acf..c7713ae7f27 100644
--- a/app-text/fbreader/metadata.xml
+++ b/app-text/fbreader/metadata.xml
@@ -4,4 +4,7 @@
<maintainer type="person">
<email>grozin@gentoo.org</email>
</maintainer>
+ <upstream>
+ <remote-id type="github">geometer/FBReader</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2020-11-16 23:21 David Seifert
0 siblings, 0 replies; 16+ messages in thread
From: David Seifert @ 2020-11-16 23:21 UTC (permalink / raw
To: gentoo-commits
commit: 2d61b8def859012571a2e5321c2ba356669873f4
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Nov 16 23:21:06 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 23:21:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d61b8de
app-text/fbreader: inherit xdg.eclass
Closes: https://bugs.gentoo.org/745501
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-text/fbreader/fbreader-0.99.4-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
index d309f9f7a5f..b3b298ab9d8 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic qmake-utils
+inherit flag-o-matic qmake-utils xdg
DESCRIPTION="E-Book Reader. Supports many e-book formats"
HOMEPAGE="https://www.fbreader.org/"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2020-09-29 20:46 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2020-09-29 20:46 UTC (permalink / raw
To: gentoo-commits
commit: bbaf7b5944a0cff48ff7a0796f99aa53e30cb1bc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 17:13:03 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 20:45:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbaf7b59
app-text/fbreader: EAPI-7, unused eclass, missing || die, sort deps
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-text/fbreader/fbreader-0.99.4-r5.ebuild | 33 +++++++++++++++--------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
index 7c47fc4ac07..75cd8347fff 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit eutils multilib flag-o-matic qmake-utils
+inherit flag-o-matic qmake-utils
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"
+HOMEPAGE="https://www.fbreader.org/"
+SRC_URI="https://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
@@ -16,18 +16,19 @@ IUSE="debug"
RDEPEND="
app-arch/bzip2
+ dev-db/sqlite
dev-libs/expat
- dev-libs/libunibreak
dev-libs/fribidi
- dev-db/sqlite
- net-misc/curl
- sys-libs/zlib
+ dev-libs/libunibreak
dev-qt/qtcore:5
dev-qt/qtgui:5
- dev-qt/qtwidgets:5
dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtwidgets:5
+ net-misc/curl
+ sys-libs/zlib
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
"
@@ -61,15 +62,15 @@ src_prepare() {
sed -e "s:MOC = moc-qt4:MOC = $(qt5_get_bindir)/moc:" \
-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
- echo "TARGET_ARCH = desktop" > makefiles/target.mk
- echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
+ echo "TARGET_ARCH = desktop" > makefiles/target.mk || die
+ echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk || die
- echo "UI_TYPE = qt4" >> makefiles/target.mk
+ echo "UI_TYPE = qt4" >> makefiles/target.mk || die
if use debug; then
- echo "TARGET_STATUS = debug" >> makefiles/target.mk
+ echo "TARGET_STATUS = debug" >> makefiles/target.mk || die
else
- echo "TARGET_STATUS = release" >> makefiles/target.mk
+ echo "TARGET_STATUS = release" >> makefiles/target.mk || die
fi
}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2018-03-18 20:30 Mikle Kolyada
0 siblings, 0 replies; 16+ messages in thread
From: Mikle Kolyada @ 2018-03-18 20:30 UTC (permalink / raw
To: gentoo-commits
commit: ead95b17a4a85f46f5bf794edd7dcdd2394af086
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 20:29:52 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 20:30:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ead95b17
app-text/fbreader: amd64 stable wrt bug #650794
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-text/fbreader/fbreader-0.99.4-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
index 41a203a894e..9f6a95bccb9 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
IUSE="debug"
RDEPEND="
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2018-01-02 6:09 Andrey Grozin
0 siblings, 0 replies; 16+ messages in thread
From: Andrey Grozin @ 2018-01-02 6:09 UTC (permalink / raw
To: gentoo-commits
commit: 694c419b615baf24dab3dd53b66609bed7cc4618
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 2 06:09:27 2018 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Tue Jan 2 06:09:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694c419b
app-text/fbreader: remove Qt4-based version
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-text/fbreader/fbreader-0.99.4-r2.ebuild | 88 -----------------------------
1 file changed, 88 deletions(-)
diff --git a/app-text/fbreader/fbreader-0.99.4-r2.ebuild b/app-text/fbreader/fbreader-0.99.4-r2.ebuild
deleted file mode 100644
index 347957b5302..00000000000
--- a/app-text/fbreader/fbreader-0.99.4-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2018-01-02 0:12 Mikle Kolyada
0 siblings, 0 replies; 16+ messages in thread
From: Mikle Kolyada @ 2018-01-02 0:12 UTC (permalink / raw
To: gentoo-commits
commit: 42d28835c6295dfb0154bd01c5f719d1bb3f2901
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 2 00:12:26 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Jan 2 00:12:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d28835
app-text/fbreader: amd64 stable wrt bug #639850
Package-Manager: Portage-2.3.13, Repoman-2.3.3
app-text/fbreader/fbreader-0.99.4-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-text/fbreader/fbreader-0.99.4-r3.ebuild b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
index 82e032af33a..ab2f47419e7 100644
--- a/app-text/fbreader/fbreader-0.99.4-r3.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
IUSE="debug"
RDEPEND="
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2017-12-14 16:37 Andrey Grozin
0 siblings, 0 replies; 16+ messages in thread
From: Andrey Grozin @ 2017-12-14 16:37 UTC (permalink / raw
To: gentoo-commits
commit: e3cd1d9452a5698bbfaf7066cd8f6f8effca41d0
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 16:37:20 2017 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 16:37:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3cd1d94
app-text/fbreader: use libunibreak instead of liblinebreak
Package-Manager: Portage-2.3.18, Repoman-2.3.6
app-text/fbreader/fbreader-0.99.4-r4.ebuild | 91 +++++++++++++++++++++++++++++
1 file changed, 91 insertions(+)
diff --git a/app-text/fbreader/fbreader-0.99.4-r4.ebuild b/app-text/fbreader/fbreader-0.99.4-r4.ebuild
new file mode 100644
index 00000000000..a828ea2670c
--- /dev/null
+++ b/app-text/fbreader/fbreader-0.99.4-r4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib flag-o-matic
+
+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/libunibreak
+ dev-libs/fribidi
+ dev-db/sqlite
+ net-misc/curl
+ sys-libs/zlib
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtnetwork:5[ssl]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # 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
+ eapply "${FILESDIR}"/${P}.patch
+ # bug #515698
+ eapply "${FILESDIR}"/${P}-qreal-cast.patch
+ # bug #516794
+ eapply "${FILESDIR}"/${P}-mimetypes.patch
+ # bug #437262
+ eapply "${FILESDIR}"/${P}-ld-bfd.patch
+ # bug #592588
+ eapply -p0 "${FILESDIR}"/${P}-gcc6.patch
+
+ eapply "${FILESDIR}"/${P}-qt5.patch
+ append-cflags -std=c++11
+
+ eapply_user
+}
+
+src_compile() {
+ # bug #484516
+ emake -j1
+}
+
+src_install() {
+ default
+ dosym FBReader /usr/bin/fbreader
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2017-12-14 13:27 Thomas Deutschmann
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Deutschmann @ 2017-12-14 13:27 UTC (permalink / raw
To: gentoo-commits
commit: 84a4f3fc5416a190ed657a582a0abbbfb3d5b846
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 13:26:12 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 13:26:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a4f3fc
Revert "app-text/fbreader: depend on libunibreak instead of liblinebreak"
This reverts commit d48fe8e5437ba8b011bb615a66544e395fb6a6c0.
Required because commit 8b4ea0f6d2bed140116f69855d1d3100ea0cf020 was reverted due to QA issues.
app-text/fbreader/fbreader-0.99.4-r4.ebuild | 91 -----------------------------
1 file changed, 91 deletions(-)
diff --git a/app-text/fbreader/fbreader-0.99.4-r4.ebuild b/app-text/fbreader/fbreader-0.99.4-r4.ebuild
deleted file mode 100644
index a828ea2670c..00000000000
--- a/app-text/fbreader/fbreader-0.99.4-r4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib flag-o-matic
-
-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/libunibreak
- dev-libs/fribidi
- dev-db/sqlite
- net-misc/curl
- sys-libs/zlib
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtnetwork:5[ssl]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-src_prepare() {
- # 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
- eapply "${FILESDIR}"/${P}.patch
- # bug #515698
- eapply "${FILESDIR}"/${P}-qreal-cast.patch
- # bug #516794
- eapply "${FILESDIR}"/${P}-mimetypes.patch
- # bug #437262
- eapply "${FILESDIR}"/${P}-ld-bfd.patch
- # bug #592588
- eapply -p0 "${FILESDIR}"/${P}-gcc6.patch
-
- eapply "${FILESDIR}"/${P}-qt5.patch
- append-cflags -std=c++11
-
- eapply_user
-}
-
-src_compile() {
- # bug #484516
- emake -j1
-}
-
-src_install() {
- default
- dosym FBReader /usr/bin/fbreader
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2017-12-14 9:46 Andrey Grozin
0 siblings, 0 replies; 16+ messages in thread
From: Andrey Grozin @ 2017-12-14 9:46 UTC (permalink / raw
To: gentoo-commits
commit: d48fe8e5437ba8b011bb615a66544e395fb6a6c0
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 09:45:37 2017 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 09:45:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d48fe8e5
app-text/fbreader: depend on libunibreak instead of liblinebreak
Reported by: Johannes Janssen <mail <AT> johannes-janssen.de>
Closes: https://bugs.gentoo.org/640972
Package-Manager: Portage-2.3.16, Repoman-2.3.6
app-text/fbreader/fbreader-0.99.4-r4.ebuild | 91 +++++++++++++++++++++++++++++
1 file changed, 91 insertions(+)
diff --git a/app-text/fbreader/fbreader-0.99.4-r4.ebuild b/app-text/fbreader/fbreader-0.99.4-r4.ebuild
new file mode 100644
index 00000000000..a828ea2670c
--- /dev/null
+++ b/app-text/fbreader/fbreader-0.99.4-r4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib flag-o-matic
+
+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/libunibreak
+ dev-libs/fribidi
+ dev-db/sqlite
+ net-misc/curl
+ sys-libs/zlib
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtnetwork:5[ssl]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # 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
+ eapply "${FILESDIR}"/${P}.patch
+ # bug #515698
+ eapply "${FILESDIR}"/${P}-qreal-cast.patch
+ # bug #516794
+ eapply "${FILESDIR}"/${P}-mimetypes.patch
+ # bug #437262
+ eapply "${FILESDIR}"/${P}-ld-bfd.patch
+ # bug #592588
+ eapply -p0 "${FILESDIR}"/${P}-gcc6.patch
+
+ eapply "${FILESDIR}"/${P}-qt5.patch
+ append-cflags -std=c++11
+
+ eapply_user
+}
+
+src_compile() {
+ # bug #484516
+ emake -j1
+}
+
+src_install() {
+ default
+ dosym FBReader /usr/bin/fbreader
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2017-12-08 20:39 Thomas Deutschmann
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Deutschmann @ 2017-12-08 20:39 UTC (permalink / raw
To: gentoo-commits
commit: 0b26cd9497054c3f1d4ecf1cb06545dcbf8bc5b2
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 8 20:13:04 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 20:13:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b26cd94
app-text/fbreader: x86 stable (bug #639850)
Package-Manager: Portage-2.3.16, Repoman-2.3.6
app-text/fbreader/fbreader-0.99.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/fbreader/fbreader-0.99.4-r3.ebuild b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
index ea2f14e6849..82e032af33a 100644
--- a/app-text/fbreader/fbreader-0.99.4-r3.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc x86"
IUSE="debug"
RDEPEND="
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2017-11-25 19:55 David Seifert
0 siblings, 0 replies; 16+ messages in thread
From: David Seifert @ 2017-11-25 19:55 UTC (permalink / raw
To: gentoo-commits
commit: 3e4d1be0e95457f598e75c940c1f4d38432204bb
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 18:05:38 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 19:54:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e4d1be0
app-text/fbreader: [QA] Consistent whitespace in metadata.xml
app-text/fbreader/metadata.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-text/fbreader/metadata.xml b/app-text/fbreader/metadata.xml
index f71ef8d677c..6eb5f614141 100644
--- a/app-text/fbreader/metadata.xml
+++ b/app-text/fbreader/metadata.xml
@@ -1,10 +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>
+ <maintainer type="person">
+ <email>grozin@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
+ FBReader is an e-book reader for various platforms.
+ </longdescription>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2017-08-24 15:53 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2017-08-24 15:53 UTC (permalink / raw
To: gentoo-commits
commit: c5d7008b8dbed6ba2a0d290014db3c2b519ffb21
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 14:26:45 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 15:53:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d7008b
app-text/fbreader: [QA] Use relative symlink target(s)
app-text/fbreader/fbreader-0.99.4-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-text/fbreader/fbreader-0.99.4-r2.ebuild b/app-text/fbreader/fbreader-0.99.4-r2.ebuild
index 5a44b67d2de..347957b5302 100644
--- a/app-text/fbreader/fbreader-0.99.4-r2.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -84,5 +84,5 @@ src_compile() {
src_install() {
default
- dosym /usr/bin/FBReader /usr/bin/fbreader
+ dosym FBReader /usr/bin/fbreader
}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/
@ 2015-12-27 13:30 Andrey Grozin
0 siblings, 0 replies; 16+ messages in thread
From: Andrey Grozin @ 2015-12-27 13:30 UTC (permalink / raw
To: gentoo-commits
commit: 512d83c71626ec936dfecebe0758555cf993b674
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 13:24:40 2015 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 13:24:40 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=512d83c7
app-text/fbreader: cleaning 0.99.4-r1
Package-Manager: portage-2.2.26
app-text/fbreader/fbreader-0.99.4-r1.ebuild | 76 -----------------------------
1 file changed, 76 deletions(-)
diff --git a/app-text/fbreader/fbreader-0.99.4-r1.ebuild b/app-text/fbreader/fbreader-0.99.4-r1.ebuild
deleted file mode 100644
index 5b86080..0000000
--- a/app-text/fbreader/fbreader-0.99.4-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
- 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
-}
-
-src_install() {
- default
- dosym /usr/bin/FBReader /usr/bin/fbreader
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2021-12-01 15:54 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-01 18:27 [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-12-01 15:54 Sam James
2021-11-07 5:05 Sam James
2021-08-01 18:27 Sam James
2020-11-16 23:21 David Seifert
2020-09-29 20:46 Andreas Sturmlechner
2018-03-18 20:30 Mikle Kolyada
2018-01-02 6:09 Andrey Grozin
2018-01-02 0:12 Mikle Kolyada
2017-12-14 16:37 Andrey Grozin
2017-12-14 13:27 Thomas Deutschmann
2017-12-14 9:46 Andrey Grozin
2017-12-08 20:39 Thomas Deutschmann
2017-11-25 19:55 David Seifert
2017-08-24 15:53 Michał Górny
2015-12-27 13:30 Andrey Grozin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox