summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-text')
-rw-r--r--app-text/bibletime/Manifest1
-rw-r--r--app-text/bibletime/bibletime-2.10.1-r1.ebuild69
-rw-r--r--app-text/bibletime/files/bibletime-2.10.1-qt5-printsupport.patch21
-rw-r--r--app-text/bibletime/files/bibletime-2.10.1-qt55.patch32
4 files changed, 0 insertions, 123 deletions
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 165209cd8bd0..0d34aa95b9a2 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,2 +1 @@
-DIST bibletime-2.10.1.tar.xz 3252680 SHA256 86d2d53913c08bce9f67c0d897639091d84e9d330527636cecd2b9008bf7ca91 SHA512 50f84eb1aefe911f1336ec7a23ea34ade1628383f35dca25330984787221214c0bc0cbc9f88f9540336949df02e76e769b7998d2eef3a15862e3038541564cc9 WHIRLPOOL 2ffc1b1b516d7fa94e842c957dc0be47be5e29ea015fcee2ff291093d0afc201af59d70b055193b420ff3acbc62386980b540eeb63ed92dbd1a741fb68b5be54
DIST bibletime-2.11.0.tar.xz 2403136 SHA256 8794db413ce927d8e664a873efbab62f8764a1f27b62d62165cb455ef55f1a32 SHA512 41f0751db30b9001d04e1c4040dca022c83eb440987104e2c3465f4233f8c0ecb1c940eac0433409f97f78c89c00d0f880f822a51219eadcbf3fc6513cfa81e6 WHIRLPOOL 664e9b8c9181dd604dec2f54ec7e37b042cc6050eb96e6c1c7b44ac2d2515594feb409be57645ca46cc8acc16c4a5875098ce35ec53b753b2fedd9b54bea9bbe
diff --git a/app-text/bibletime/bibletime-2.10.1-r1.ebuild b/app-text/bibletime/bibletime-2.10.1-r1.ebuild
deleted file mode 100644
index bf1f2db8fb7f..000000000000
--- a/app-text/bibletime/bibletime-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Qt Bible study application using the SWORD library"
-HOMEPAGE="http://www.bibletime.info/"
-SRC_URI="mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug qt5"
-
-# bug 313657
-# RESTRICT="test"
-
-RDEPEND="
- >=app-text/sword-1.7.0
- >=dev-cpp/clucene-2.3.3.4
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- )
- !qt5? (
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- dev-qt/qtwebkit:4
- )
-"
-DEPEND="
- ${RDEPEND}
- dev-libs/boost
- dev-libs/icu:=
- net-misc/curl
- sys-libs/zlib
- qt5? (
- dev-qt/linguist-tools:5
- dev-qt/qttest:5
- )
- !qt5? (
- dev-qt/qttest:4
- )
-"
-
-DOCS=( ChangeLog README )
-
-src_prepare() {
- sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
- -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
- epatch "${FILESDIR}/${PN}-2.10.1-qt5-printsupport.patch"
- epatch "${FILESDIR}/${PN}-2.10.1-qt55.patch"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_QT_WEBKIT=ON
- )
- if use !qt5; then
- mycmakeargs+=(-DBT_FORCE_USE_QT4=ON)
- fi
-
- cmake-utils_src_configure
-}
diff --git a/app-text/bibletime/files/bibletime-2.10.1-qt5-printsupport.patch b/app-text/bibletime/files/bibletime-2.10.1-qt5-printsupport.patch
deleted file mode 100644
index 203705485409..000000000000
--- a/app-text/bibletime/files/bibletime-2.10.1-qt5-printsupport.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN bibletime-2.10.1-orig/CMakeLists.txt bibletime-2.10.1/CMakeLists.txt
---- bibletime-2.10.1-orig/CMakeLists.txt 2014-10-14 21:20:59.068697225 -0400
-+++ bibletime-2.10.1/CMakeLists.txt 2014-10-14 21:23:20.045693427 -0400
-@@ -172,12 +172,14 @@
- )
-
- IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE")
-- qt5_use_modules("bibletime" Widgets Qml Quick Network)
-+ qt5_use_modules("bibletime" Widgets Qml Quick Network PrintSupport)
- ELSE()
- IF(BT_Use_DBus)
-- qt5_use_modules("bibletime" DBus Widgets WebKit WebKitWidgets Xml Network)
-+ qt5_use_modules("bibletime" DBus Widgets WebKit WebKitWidgets Xml
-+ Network PrintSupport)
- ELSE()
-- qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network)
-+ qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network
-+ PrintSupport)
- ENDIF()
- ENDIF()
- ELSE()
diff --git a/app-text/bibletime/files/bibletime-2.10.1-qt55.patch b/app-text/bibletime/files/bibletime-2.10.1-qt55.patch
deleted file mode 100644
index 715792035039..000000000000
--- a/app-text/bibletime/files/bibletime-2.10.1-qt55.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Gary Holmlund <gary.holmlund@gmail.com>
-Date: Fri, 3 Jul 2015 21:32:26 -0700
-Subject: [PATCH] backend: Fix Qt 5.5 compile error with Q_ASSERT.
-
----
- src/backend/drivers/cswordmoduleinfo.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/backend/drivers/cswordmoduleinfo.cpp b/src/backend/drivers/cswordmoduleinfo.cpp
-index f86f9ac..ae7444f 100644
---- a/src/backend/drivers/cswordmoduleinfo.cpp
-+++ b/src/backend/drivers/cswordmoduleinfo.cpp
-@@ -54,7 +54,7 @@ const unsigned long BT_MAX_LUCENE_FIELD_LENGTH = 1024 * 1024;
- CSwordModuleInfo::CSwordModuleInfo(sword::SWModule * module,
- CSwordBackend & backend,
- ModuleType type)
-- : m_module((Q_ASSERT(module), module)),
-+ : m_module(module),
- m_backend(backend),
- m_type(type),
- m_cancelIndexing(false),
-@@ -63,6 +63,7 @@ CSwordModuleInfo::CSwordModuleInfo(sword::SWModule * module,
- {
- initCachedCategory();
- initCachedLanguage();
-+ Q_ASSERT(module);
-
- m_hidden = btConfig().value<QStringList>("state/hiddenModules",
- QStringList()).contains(m_cachedName);
---
-2.4.10
-