diff options
Diffstat (limited to 'libre/bibletime/libre.patch')
| -rw-r--r-- | libre/bibletime/libre.patch | 25 |
1 files changed, 12 insertions, 13 deletions
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/") |