[neon/kde/plasma-framework/Neon/release_focal] debian/patches: add patch recommended by maintainer

Jonathan Esk-Riddell null at kde.org
Tue Jun 14 14:13:38 BST 2022


Git commit 697b3afd549dc831ee91176f66c245465e7b3463 by Jonathan Esk-Riddell.
Committed on 14/06/2022 at 13:12.
Pushed by jriddell into branch 'Neon/release_focal'.

add patch recommended by maintainer

A  +35   -0    debian/patches/revert-opengl.diff
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/kde/plasma-framework/commit/697b3afd549dc831ee91176f66c245465e7b3463

diff --git a/debian/patches/revert-opengl.diff b/debian/patches/revert-opengl.diff
new file mode 100644
index 0000000..0887ddf
--- /dev/null
+++ b/debian/patches/revert-opengl.diff
@@ -0,0 +1,35 @@
+commit dff1b034c1162062aa2292099d3d01fc53dafdf6
+Author: Ahmad Samir <a.samirh78 at gmail.com>
+Date:   Tue Jun 14 14:05:32 2022 +0200
+
+    Revert "Use QT_FEATURE_foo to detect opengl* support, and TARGET for glesv2"
+    
+    This reverts commit 31884dc195c815054bfa6b15a90753d2d0ae1ea9.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6698a2091..63229cdfb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -118,7 +118,8 @@ set_package_properties(EGL PROPERTIES
+                        TYPE OPTIONAL
+                       )
+ 
+-if(OpenGL_GLX_FOUND AND X11_FOUND AND QT_FEATURE_opengl)
++get_target_property(QtGui_Enabled_Features Qt${QT_MAJOR_VERSION}::Gui QT_ENABLED_PUBLIC_FEATURES)
++if(OpenGL_GLX_FOUND AND X11_FOUND AND (QtGui_Enabled_Features MATCHES "opengl"))
+     add_feature_info(GLX OpenGL_GLX_FOUND "OpenGL GLX libraries.")
+     set(HAVE_GLX 1)
+ else()
+diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt
+index d08b4c619..2136bb985 100644
+--- a/src/declarativeimports/core/CMakeLists.txt
++++ b/src/declarativeimports/core/CMakeLists.txt
+@@ -70,7 +70,7 @@ else()
+ 
+ endif()
+ 
+-if(TARGET Qt${QT_MAJOR_VERSION}::Gui_GLESv2)
++if(QtGui_Enabled_Features MATCHES "opengles2")
+     target_link_libraries(corebindingsplugin Qt${QT_MAJOR_VERSION}::Gui_GLESv2)
+ endif()
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b5edeea
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+revert-opengl.diff


More information about the Neon-commits mailing list