summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/bibletime/PKGBUILD16
-rw-r--r--libre/bibletime/libre.patch25
2 files changed, 21 insertions, 20 deletions
diff --git a/libre/bibletime/PKGBUILD b/libre/bibletime/PKGBUILD
index c3bb51f1a..09c30d4bc 100644
--- a/libre/bibletime/PKGBUILD
+++ b/libre/bibletime/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
# Maintainer (Arch): Alexander F Rødseth <xyproto@archlinux.org>
# Contributor: André Silva <emulatorman@hyperbola.info>
@@ -6,18 +5,21 @@
# Contributor (Arch): Tobias T. <OldShatterhand at gmx-topmail dot de>
pkgname=bibletime
-pkgver=2.11.1
-pkgrel=1.parabola1
-pkgdesc='Bible study tool, with qt5-webkit-ng support'
-arch=('x86_64' 'i686' 'armv7h')
+pkgver=2.11.2
+pkgrel=1
+pkgrel+=.parabola1
+pkgdesc='Bible study tool'
+pkgdesc+=', with qt5-webkit-ng support'
+arch=('x86_64')
+arch+=('i686' 'armv7h')
url='http://www.bibletime.info/'
license=('GPL2')
depends=('sword' 'clucene' 'qt5-webkit' 'qt5-svg')
makedepends=('cmake' 'qt5-tools')
source=("$pkgname-$pkgver.tar.gz::https://github.com/bibletime/bibletime/archive/v$pkgver.tar.gz"
'libre.patch')
-sha512sums=('ad718b2c7b6591991ffdcd00fdb9a2bcd7905bc5b8c8cf9828ce60e3a3b1ecbafb6fa06ac5689a1e8e33590439d8bc4cf69f0584bec30c3adb3c32cc14006342'
- '04908f3711bb9b64647adcead6b13adf78763ee653be2e998d835a456f7a56a9c91937b8d7c618ea7c5426646d9012870bf499c592e6a0408de6589089f7dd42')
+sha512sums=('951c72dea1e281c0403284b36d680452ffb9dec180097faec49bc8536ad9a9e3cb543060b9972beae415e94467dbff6edcc253a0fda217cbb17a94fce40ff553'
+ '6d64be9904729b9bdf7a0464af8ba9e230b400ee461aca6dc8c7060c8bdb870ad61494ae3cd6a2f32a7ef45605b88671350c83e6cf9406f334242c63139cdc0c')
prepare() {
mkdir -p build
diff --git a/libre/bibletime/libre.patch b/libre/bibletime/libre.patch
index 38a041152..d7c1a6ce0 100644
--- a/libre/bibletime/libre.patch
+++ b/libre/bibletime/libre.patch
@@ -1,38 +1,37 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 50c7391db..30a58e34f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -150,19 +150,8 @@ IF("${BIBLETIME_FRONTEND}" STREQUAL "MOBILE")
+--- bibletime-2.11.2.orig/CMakeLists.txt 2018-06-18 15:07:00.000000000 -0500
++++ bibletime-2.11.2/CMakeLists.txt 2020-04-10 12:50:57.857672342 -0500
+@@ -156,21 +156,10 @@
ADD_DEFINITIONS("-DBT_MOBILE")
ENDIF()
-FIND_PACKAGE(Qt5WebEngine QUIET)
-IF(NOT Qt5WebEngine_FOUND)
MESSAGE(STATUS "Using Qt WebKit")
+ FIND_PACKAGE(Qt5WebKit REQUIRED)
+ FIND_PACKAGE(Qt5WebKitWidgets REQUIRED)
SET(USEWEBENGINE OFF)
-ELSE()
- MESSAGE(STATUS "Using Qt WebEngine")
+- FIND_PACKAGE(Qt5WebEngineWidgets REQUIRED)
- SET(USEWEBENGINE ON)
-ENDIF()
-
-IF(USEWEBENGINE)
- ADD_DEFINITIONS("-DUSEWEBENGINE")
-ENDIF()
--
+
# Define $bibletime_SOURCES
INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTSourceFileList.cmake")
-
-@@ -223,8 +212,6 @@ TARGET_LINK_LIBRARIES("bibletime"
+@@ -232,8 +221,6 @@
IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE")
- qt5_use_modules("bibletime" Widgets WebKitWidgets Qml Quick Xml Network PrintSupport Svg)
+ TARGET_LINK_LIBRARIES("bibletime" Qt5::Widgets Qt5::WebKitWidgets Qt5::Qml Qt5::Quick Qt5::Xml Qt5::Network Qt5::PrintSupport Qt5::Svg)
-ELSEIF(USEWEBENGINE)
-- qt5_use_modules("bibletime" Widgets WebEngine WebEngineWidgets WebChannel Xml Network PrintSupport Svg)
+- TARGET_LINK_LIBRARIES("bibletime" Qt5::Widgets Qt5::WebEngine Qt5::WebEngineWidgets Qt5::WebChannel Qt5::Xml Qt5::Network Qt5::PrintSupport Qt5::Svg)
ELSE()
- qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network PrintSupport Svg)
+ TARGET_LINK_LIBRARIES("bibletime" Qt5::Widgets Qt5::WebKit Qt5::WebKitWidgets Qt5::Xml Qt5::Network Qt5::PrintSupport Qt5::Svg)
ENDIF()
-
-@@ -279,13 +267,8 @@ INSTALL(FILES ${INSTALL_TMPL_LIST}
+@@ -288,13 +275,8 @@
DESTINATION "${BT_SHARE_PATH}/bibletime/display-templates/")