From 0fa2396dbcf4f81c8388b1de4c89d5da46b4d095 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 8 Mar 2017 01:41:34 -0300 Subject: bibletime: move package from [libre-testing] to [libre] --- libre-testing/bibletime/PKGBUILD | 41 --------------------------------- libre-testing/bibletime/libre.patch | 46 ------------------------------------- libre/bibletime/PKGBUILD | 41 +++++++++++++++++++++++++++++++++ libre/bibletime/libre.patch | 46 +++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 87 deletions(-) delete mode 100644 libre-testing/bibletime/PKGBUILD delete mode 100644 libre-testing/bibletime/libre.patch create mode 100644 libre/bibletime/PKGBUILD create mode 100644 libre/bibletime/libre.patch diff --git a/libre-testing/bibletime/PKGBUILD b/libre-testing/bibletime/PKGBUILD deleted file mode 100644 index 91355030c..000000000 --- a/libre-testing/bibletime/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 208912 2017-01-24 16:42:17Z felixonmars $ -# Maintainer: Felix Yan -# Maintainer: Alexander F Rødseth -# Contributor: SanskritFritz (gmail) -# Contributor: Tobias T. -# Maintainer: André Silva - -pkgname=bibletime -pkgver=2.11.0 -pkgrel=1.parabola1 -pkgdesc='Bible study tool, with qt5-webkit-ng support' -arch=('x86_64' 'i686') -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" - 'libre.patch') -md5sums=('SKIP' - '7364f533a5e4df5edecff95c172a8fc9') - -prepare() { - mkdir -p build - cd bibletime - patch -p1 -i ../libre.patch -} - -build() { - cd build - - cmake ../bibletime \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - make -C build DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/libre-testing/bibletime/libre.patch b/libre-testing/bibletime/libre.patch deleted file mode 100644 index edbef3f8f..000000000 --- a/libre-testing/bibletime/libre.patch +++ /dev/null @@ -1,46 +0,0 @@ -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") - ADD_DEFINITIONS("-DBT_MOBILE") - ENDIF() - --IF(Qt5Core_VERSION VERSION_LESS 5.6.0) -- SET(USEWEBENGINE OFF) --ELSE() -- SET(USEWEBENGINE ON) --ENDIF() -- --IF(USEWEBENGINE) -- ADD_DEFINITIONS("-DUSEWEBENGINE") --ENDIF() -- - # Define $bibletime_SOURCES - INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTSourceFileList.cmake") - -@@ -220,8 +210,6 @@ TARGET_LINK_LIBRARIES("bibletime" - - IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE") - qt5_use_modules("bibletime" Widgets WebKitWidgets Qml Quick Xml Network PrintSupport Svg) --ELSEIF(USEWEBENGINE) -- qt5_use_modules("bibletime" Widgets WebEngine WebEngineWidgets WebChannel Xml Network PrintSupport Svg) - ELSE() - qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network PrintSupport Svg) - ENDIF() -@@ -276,13 +264,8 @@ INSTALL(FILES ${INSTALL_TMPL_LIST} - DESTINATION "${BT_SHARE_PATH}/bibletime/display-templates/") - - --IF(USEWEBENGINE) -- INSTALL(FILES "src/frontend/display/btwebengine.js" -- DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/") --ELSE() -- INSTALL(FILES "src/frontend/display/bthtml.js" -- DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/") --ENDIF() -+INSTALL(FILES "src/frontend/display/bthtml.js" -+ DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/") - - INSTALL(FILES "docs/license.html" - DESTINATION "${BT_SHARE_PATH}/bibletime/license/") diff --git a/libre/bibletime/PKGBUILD b/libre/bibletime/PKGBUILD new file mode 100644 index 000000000..91355030c --- /dev/null +++ b/libre/bibletime/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 208912 2017-01-24 16:42:17Z felixonmars $ +# Maintainer: Felix Yan +# Maintainer: Alexander F Rødseth +# Contributor: SanskritFritz (gmail) +# Contributor: Tobias T. +# Maintainer: André Silva + +pkgname=bibletime +pkgver=2.11.0 +pkgrel=1.parabola1 +pkgdesc='Bible study tool, with qt5-webkit-ng support' +arch=('x86_64' 'i686') +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" + 'libre.patch') +md5sums=('SKIP' + '7364f533a5e4df5edecff95c172a8fc9') + +prepare() { + mkdir -p build + cd bibletime + patch -p1 -i ../libre.patch +} + +build() { + cd build + + cmake ../bibletime \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + make -C build DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/bibletime/libre.patch b/libre/bibletime/libre.patch new file mode 100644 index 000000000..edbef3f8f --- /dev/null +++ b/libre/bibletime/libre.patch @@ -0,0 +1,46 @@ +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") + ADD_DEFINITIONS("-DBT_MOBILE") + ENDIF() + +-IF(Qt5Core_VERSION VERSION_LESS 5.6.0) +- SET(USEWEBENGINE OFF) +-ELSE() +- SET(USEWEBENGINE ON) +-ENDIF() +- +-IF(USEWEBENGINE) +- ADD_DEFINITIONS("-DUSEWEBENGINE") +-ENDIF() +- + # Define $bibletime_SOURCES + INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTSourceFileList.cmake") + +@@ -220,8 +210,6 @@ TARGET_LINK_LIBRARIES("bibletime" + + IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE") + qt5_use_modules("bibletime" Widgets WebKitWidgets Qml Quick Xml Network PrintSupport Svg) +-ELSEIF(USEWEBENGINE) +- qt5_use_modules("bibletime" Widgets WebEngine WebEngineWidgets WebChannel Xml Network PrintSupport Svg) + ELSE() + qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network PrintSupport Svg) + ENDIF() +@@ -276,13 +264,8 @@ INSTALL(FILES ${INSTALL_TMPL_LIST} + DESTINATION "${BT_SHARE_PATH}/bibletime/display-templates/") + + +-IF(USEWEBENGINE) +- INSTALL(FILES "src/frontend/display/btwebengine.js" +- DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/") +-ELSE() +- INSTALL(FILES "src/frontend/display/bthtml.js" +- DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/") +-ENDIF() ++INSTALL(FILES "src/frontend/display/bthtml.js" ++ DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/") + + INSTALL(FILES "docs/license.html" + DESTINATION "${BT_SHARE_PATH}/bibletime/license/") -- cgit v1.2.3