From 6e7cabc65d64eab33bcef40d86833792cbe71430 Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Mon, 15 Jan 2018 16:22:32 +0100
Subject: libre/bibletime: updated to 2.11.1

---
 libre/bibletime/PKGBUILD    | 33 +++++++++++++++++----------------
 libre/bibletime/libre.patch | 14 +++++++++-----
 2 files changed, 26 insertions(+), 21 deletions(-)

(limited to 'libre/bibletime')

diff --git a/libre/bibletime/PKGBUILD b/libre/bibletime/PKGBUILD
index b3b07d4a2..c3bb51f1a 100644
--- a/libre/bibletime/PKGBUILD
+++ b/libre/bibletime/PKGBUILD
@@ -1,34 +1,35 @@
-# $Id: PKGBUILD 208912 2017-01-24 16:42:17Z felixonmars $
-# Maintainer: Felix Yan <felixonmars@archlinux.org>
-# Maintainer: Alexander F Rødseth <xyproto@archlinux.org>
-# Contributor: SanskritFritz (gmail)
-# Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# $Id$
+# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
+# Maintainer (Arch): Alexander F Rødseth <xyproto@archlinux.org>
+# Contributor: André Silva <emulatorman@hyperbola.info>
+# Contributor (Arch): SanskritFritz (gmail)
+# Contributor (Arch): Tobias T. <OldShatterhand at gmx-topmail dot de>
 
 pkgname=bibletime
-pkgver=2.11.0
+pkgver=2.11.1
 pkgrel=1.parabola1
 pkgdesc='Bible study tool, with qt5-webkit-ng support'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'armv7h')
 url='http://www.bibletime.info/'
 license=('GPL2')
-depends=('sword' 'clucene' 'qt5-webkit-ng' 'qt5-svg')
-makedepends=('cmake' 'qt5-tools' 'git')
-source=("git://github.com/bibletime/bibletime.git#tag=v$pkgver"
+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')
-md5sums=('SKIP'
-         '7364f533a5e4df5edecff95c172a8fc9')
+sha512sums=('ad718b2c7b6591991ffdcd00fdb9a2bcd7905bc5b8c8cf9828ce60e3a3b1ecbafb6fa06ac5689a1e8e33590439d8bc4cf69f0584bec30c3adb3c32cc14006342'
+            '04908f3711bb9b64647adcead6b13adf78763ee653be2e998d835a456f7a56a9c91937b8d7c618ea7c5426646d9012870bf499c592e6a0408de6589089f7dd42')
 
 prepare() {
   mkdir -p build
-  cd bibletime
-  patch -p1 -i ../libre.patch
+
+  cd bibletime-$pkgver
+  patch -p1 -i "$srcdir/libre.patch"
 }
 
 build() {
   cd build
 
-  cmake ../bibletime \
+  cmake ../bibletime-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
   make
diff --git a/libre/bibletime/libre.patch b/libre/bibletime/libre.patch
index edbef3f8f..38a041152 100644
--- a/libre/bibletime/libre.patch
+++ b/libre/bibletime/libre.patch
@@ -2,13 +2,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 50c7391db..30a58e34f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -150,16 +150,6 @@ IF("${BIBLETIME_FRONTEND}" STREQUAL "MOBILE")
+@@ -150,19 +150,8 @@ IF("${BIBLETIME_FRONTEND}" STREQUAL "MOBILE")
      ADD_DEFINITIONS("-DBT_MOBILE")
  ENDIF()
  
--IF(Qt5Core_VERSION VERSION_LESS 5.6.0)
--    SET(USEWEBENGINE OFF)
+-FIND_PACKAGE(Qt5WebEngine QUIET)
+-IF(NOT Qt5WebEngine_FOUND)
+     MESSAGE(STATUS "Using Qt WebKit")
+     SET(USEWEBENGINE OFF)
 -ELSE()
+-    MESSAGE(STATUS "Using Qt WebEngine")
 -    SET(USEWEBENGINE ON)
 -ENDIF()
 -
@@ -19,7 +22,7 @@ index 50c7391db..30a58e34f 100644
  # Define $bibletime_SOURCES
  INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTSourceFileList.cmake")
  
-@@ -220,8 +210,6 @@ TARGET_LINK_LIBRARIES("bibletime"
+@@ -223,8 +212,6 @@ TARGET_LINK_LIBRARIES("bibletime"
  
  IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE")
    qt5_use_modules("bibletime" Widgets WebKitWidgets Qml Quick Xml Network PrintSupport Svg)
@@ -28,7 +31,8 @@ index 50c7391db..30a58e34f 100644
  ELSE()
    qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network PrintSupport Svg)
  ENDIF()
-@@ -276,13 +264,8 @@ INSTALL(FILES ${INSTALL_TMPL_LIST}
+ 
+@@ -279,13 +267,8 @@ INSTALL(FILES ${INSTALL_TMPL_LIST}
           DESTINATION "${BT_SHARE_PATH}/bibletime/display-templates/")
  
  
-- 
cgit v1.2.3