summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-text/bibletime/files')
-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
2 files changed, 0 insertions, 53 deletions
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 20370548540..00000000000
--- 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 71579203503..00000000000
--- 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
-