| 1 |
commit: e3f1a50281a8983e74f8f6da1f0ee1836f61eb4b |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 27 17:53:39 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 27 17:53:53 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f1a502 |
| 7 |
|
| 8 |
app-text/bibletime: backport patch from upstream solving build with Qt 5.5 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
app-text/bibletime/bibletime-2.10.1-r1.ebuild | 1 + |
| 13 |
.../bibletime/files/bibletime-2.10.1-qt55.patch | 32 ++++++++++++++++++++++ |
| 14 |
2 files changed, 33 insertions(+) |
| 15 |
|
| 16 |
diff --git a/app-text/bibletime/bibletime-2.10.1-r1.ebuild b/app-text/bibletime/bibletime-2.10.1-r1.ebuild |
| 17 |
index 38cf722..7caac50 100644 |
| 18 |
--- a/app-text/bibletime/bibletime-2.10.1-r1.ebuild |
| 19 |
+++ b/app-text/bibletime/bibletime-2.10.1-r1.ebuild |
| 20 |
@@ -55,6 +55,7 @@ src_prepare() { |
| 21 |
sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \ |
| 22 |
-i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed" |
| 23 |
epatch "${FILESDIR}/${PN}-2.10.1-qt5-printsupport.patch" |
| 24 |
+ epatch "${FILESDIR}/${PN}-2.10.1-qt55.patch" |
| 25 |
} |
| 26 |
|
| 27 |
src_configure() { |
| 28 |
|
| 29 |
diff --git a/app-text/bibletime/files/bibletime-2.10.1-qt55.patch b/app-text/bibletime/files/bibletime-2.10.1-qt55.patch |
| 30 |
new file mode 100644 |
| 31 |
index 0000000..7157920 |
| 32 |
--- /dev/null |
| 33 |
+++ b/app-text/bibletime/files/bibletime-2.10.1-qt55.patch |
| 34 |
@@ -0,0 +1,32 @@ |
| 35 |
+From: Gary Holmlund <gary.holmlund@×××××.com> |
| 36 |
+Date: Fri, 3 Jul 2015 21:32:26 -0700 |
| 37 |
+Subject: [PATCH] backend: Fix Qt 5.5 compile error with Q_ASSERT. |
| 38 |
+ |
| 39 |
+--- |
| 40 |
+ src/backend/drivers/cswordmoduleinfo.cpp | 3 ++- |
| 41 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
| 42 |
+ |
| 43 |
+diff --git a/src/backend/drivers/cswordmoduleinfo.cpp b/src/backend/drivers/cswordmoduleinfo.cpp |
| 44 |
+index f86f9ac..ae7444f 100644 |
| 45 |
+--- a/src/backend/drivers/cswordmoduleinfo.cpp |
| 46 |
++++ b/src/backend/drivers/cswordmoduleinfo.cpp |
| 47 |
+@@ -54,7 +54,7 @@ const unsigned long BT_MAX_LUCENE_FIELD_LENGTH = 1024 * 1024; |
| 48 |
+ CSwordModuleInfo::CSwordModuleInfo(sword::SWModule * module, |
| 49 |
+ CSwordBackend & backend, |
| 50 |
+ ModuleType type) |
| 51 |
+- : m_module((Q_ASSERT(module), module)), |
| 52 |
++ : m_module(module), |
| 53 |
+ m_backend(backend), |
| 54 |
+ m_type(type), |
| 55 |
+ m_cancelIndexing(false), |
| 56 |
+@@ -63,6 +63,7 @@ CSwordModuleInfo::CSwordModuleInfo(sword::SWModule * module, |
| 57 |
+ { |
| 58 |
+ initCachedCategory(); |
| 59 |
+ initCachedLanguage(); |
| 60 |
++ Q_ASSERT(module); |
| 61 |
+ |
| 62 |
+ m_hidden = btConfig().value<QStringList>("state/hiddenModules", |
| 63 |
+ QStringList()).contains(m_cachedName); |
| 64 |
+-- |
| 65 |
+2.4.10 |
| 66 |
+ |
Archives