diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2017-03-08 01:41:34 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2017-03-08 01:58:48 -0300 |
| commit | 0fa2396dbcf4f81c8388b1de4c89d5da46b4d095 (patch) | |
| tree | 14f6674bb3f935e8ee3bc1897d59bfcca853cc5b /libre/bibletime/libre.patch | |
| parent | 1aea7ab4af802cff6a1c031fc3ea86db36734700 (diff) | |
| download | abslibre-0fa2396dbcf4f81c8388b1de4c89d5da46b4d095.tar.gz abslibre-0fa2396dbcf4f81c8388b1de4c89d5da46b4d095.tar.bz2 abslibre-0fa2396dbcf4f81c8388b1de4c89d5da46b4d095.zip | |
bibletime: move package from [libre-testing] to [libre]
Diffstat (limited to 'libre/bibletime/libre.patch')
| -rw-r--r-- | libre/bibletime/libre.patch | 46 |
1 files changed, 46 insertions, 0 deletions
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/") |