diff options
| author | Marcouney | 2021-08-04 12:36:48 +0200 |
|---|---|---|
| committer | Marcouney | 2021-08-04 12:36:48 +0200 |
| commit | 98807af45393df5ceb53d7196e3b90daf691b6c6 (patch) | |
| tree | 80f0cb9066367c05547f91983fbd05bb09cd38c0 /010-qt-jpegxl-image-plugin-allow-qt6-coinstall.patch | |
| download | aur-98807af45393df5ceb53d7196e3b90daf691b6c6.tar.gz | |
Initial commit
Diffstat (limited to '010-qt-jpegxl-image-plugin-allow-qt6-coinstall.patch')
| -rw-r--r-- | 010-qt-jpegxl-image-plugin-allow-qt6-coinstall.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/010-qt-jpegxl-image-plugin-allow-qt6-coinstall.patch b/010-qt-jpegxl-image-plugin-allow-qt6-coinstall.patch new file mode 100644 index 000000000000..2289df0af91a --- /dev/null +++ b/010-qt-jpegxl-image-plugin-allow-qt6-coinstall.patch @@ -0,0 +1,39 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,7 +20,15 @@ include(KDECMakeSettings) + include(CheckIncludeFiles) + + set(REQUIRED_QT_VERSION 5.14.0) +-find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) ++string(REGEX MATCH "^[0-9]" REQUIRED_QT_MAJOR "${REQUIRED_QT_VERSION}") ++set(QT_MAJOR ${REQUIRED_QT_MAJOR} CACHE STRING "Qt major version to use") ++ ++if(QT_MAJOR GREATER_EQUAL ${REQUIRED_QT_MAJOR}) ++ message(STATUS "Info: building with Qt${QT_MAJOR}") ++ find_package(Qt${QT_MAJOR}Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) ++else() ++ message(FATAL_ERROR "Qt major version must be at least ${REQUIRED_QT_MAJOR}") ++endif() + + include(FindPkgConfig) + pkg_check_modules(LibJXL REQUIRED IMPORTED_TARGET libjxl>=0.5.0) +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -18,7 +18,7 @@ function(kimageformats_add_plugin plugin) + add_library(${plugin} MODULE ${KIF_ADD_PLUGIN_SOURCES}) + set_property(TARGET ${plugin} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${json}) + set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/imageformats") +- target_link_libraries(${plugin} Qt5::Gui) ++ target_link_libraries(${plugin} Qt${QT_MAJOR}::Gui) + install(TARGETS ${plugin} DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats) + endfunction() + +@@ -27,7 +27,7 @@ endfunction() + if (LibJXL_FOUND) + kimageformats_add_plugin(libqjpegxl JSON "jpegxl.json" SOURCES "main.cpp" "qjpegxlhandler.cpp") + target_link_libraries(libqjpegxl PkgConfig::LibJXL PkgConfig::LibJXLThreads) +- install(FILES jxl.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) ++ install(FILES jxl.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/ RENAME jxl_qt${QT_MAJOR}.desktop) + endif() + + ################################## |