commit: e3f1a50281a8983e74f8f6da1f0ee1836f61eb4b
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 17:53:39 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 17:53:53 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f1a502
app-text/bibletime: backport patch from upstream solving build with Qt 5.5
Package-Manager: portage-2.2.26
app-text/bibletime/bibletime-2.10.1-r1.ebuild | 1 +
.../bibletime/files/bibletime-2.10.1-qt55.patch | 32 ++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/app-text/bibletime/bibletime-2.10.1-r1.ebuild
b/app-text/bibletime/bibletime-2.10.1-r1.ebuild
index 38cf722..7caac50 100644
--- a/app-text/bibletime/bibletime-2.10.1-r1.ebuild
+++ b/app-text/bibletime/bibletime-2.10.1-r1.ebuild
@@ -55,6 +55,7 @@ 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() {
diff --git a/app-text/bibletime/files/bibletime-2.10.1-qt55.patch
b/app-text/bibletime/files/bibletime-2.10.1-qt55.patch
new file mode 100644
index 0000000..7157920
--- /dev/null
+++ b/app-text/bibletime/files/bibletime-2.10.1-qt55.patch
@@ -0,0 +1,32 @@
+From: Gary Holmlund <[email protected]>
+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
+
