gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-libs/quarter: patch 1.2.1 to not require Qt5UiTools, fixes #925352

Browse Source 
Signed-off-by: Maciej Mrozowski <reavertm@gentoo.org>
Closes: https://bugs.gentoo.org/925352
This commit is contained in:
Maciej Mrozowski
2024-02-29 02:50:36 +01:00
parent 659b603bda
commit ee19808bd1
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
media-libs/quarter/files/quarter-1.2.1-cmake.patch
View File

@@ -1,6 +1,6 @@
diff -ruN quarter/CMakeLists.txt my/CMakeLists.txt
--- quarter/CMakeLists.txt 2024-02-05 00:29:17.000000000 +0100
+++ my/CMakeLists.txt 2024-02-24 05:23:51.451634039 +0100
+++ my/CMakeLists.txt 2024-02-29 02:46:06.768299838 +0100
@@ -96,17 +96,17 @@
if(QUARTER_USE_QT6)
@@ -9,7 +9,7 @@ diff -ruN quarter/CMakeLists.txt my/CMakeLists.txt
+ find_package(Qt6 COMPONENTS Widgets UiTools OpenGL OpenGLWidgets Designer REQUIRED)
else()
- find_package(Qt6 COMPONENTS Widgets UiTools OpenGL OpenGLWidgets QUIET)
+ find_package(Qt6 COMPONENTS Widgets UiTools OpenGL OpenGLWidgets REQUIRED)
+ find_package(Qt6 COMPONENTS Widgets OpenGL OpenGLWidgets REQUIRED)
endif()
endif()
@@ -19,7 +19,24 @@ diff -ruN quarter/CMakeLists.txt my/CMakeLists.txt
+ find_package(Qt5 COMPONENTS Widgets UiTools OpenGL Designer REQUIRED)
else()
- find_package(Qt5 COMPONENTS Widgets UiTools OpenGL QUIET)
+ find_package(Qt5 COMPONENTS Widgets UiTools OpenGL REQUIRED)
+ find_package(Qt5 COMPONENTS Widgets OpenGL REQUIRED)
endif()
endif()
@@ -116,14 +116,14 @@
endif()
if(Qt6_FOUND)
- set(QUARTER_QT_TARGETS Qt6::Widgets Qt6::UiTools Qt6::OpenGL Qt6::OpenGLWidgets)
+ set(QUARTER_QT_TARGETS Qt6::Widgets Qt6::OpenGL Qt6::OpenGLWidgets)
set(QUARTER_PLUGIN_QT_TARGETS Qt6::Designer)
string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${Qt6Core_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${Qt6Core_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${Qt6Core_VERSION_STRING}")
set(QUARTER_PKG_DEPS "${QUARTER_PKG_DEPS} Qt6Widgets Qt6UiTools Qt6OpenGL Qt6OpenGLWidgets Qt6Designer")
elseif(Qt5_FOUND)
- set(QUARTER_QT_TARGETS Qt5::Widgets Qt5::UiTools Qt5::OpenGL)
+ set(QUARTER_QT_TARGETS Qt5::Widgets Qt5::OpenGL)
set(QUARTER_PLUGIN_QT_TARGETS Qt5::Designer)
string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${Qt5Core_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${Qt5Core_VERSION_STRING}")