git » qt5-location.git » commit 785089b

Fix qmake opengl detection (FS#74124)

author Antonio Rojas
2022-03-16 22:06:54 UTC
committer Antonio Rojas
2022-03-16 22:06:54 UTC
parent 314ee8755fc3b112fc3def215ac632e6aeb8fc07

Fix qmake opengl detection (FS#74124)

PKGBUILD +7 -3
fix-opengl-detection.patch +13 -0

diff --git a/PKGBUILD b/PKGBUILD
index 4b0e301..f4ff795 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=qt5-location
 _basever=5.15.3
 pkgver=5.15.3+kde+r0
-pkgrel=1
+pkgrel=2
 _commit=1bf01b84e30aab2b87a19184ce42160e6c92d8b1
 arch=('x86_64')
 url='https://www.qt.io'
@@ -14,8 +14,10 @@ depends=('qt5-declarative')
 makedepends=('git')
 groups=('qt' 'qt5')
 _pkgfqn=${pkgname/5-/}
-source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
-sha256sums=('SKIP')  
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
+        fix-opengl-detection.patch)
+sha256sums=('SKIP'
+            '84954d1bd528852d5cb60a5618bc2f9d34da0f459cde7d54b319b88fa9a4c11c')
 options=(debug)
 
 pkgver() {
@@ -25,6 +27,8 @@ pkgver() {
 
 prepare() {
   mkdir -p build
+
+  patch -d $_pkgfqn -p1 < fix-opengl-detection.patch
 }
 
 build() {
diff --git a/fix-opengl-detection.patch b/fix-opengl-detection.patch
new file mode 100644
index 0000000..63611ee
--- /dev/null
+++ b/fix-opengl-detection.patch
@@ -0,0 +1,13 @@
+diff --git a/src/location/configure.json b/src/location/configure.json
+index 6d01a9a3..d1e623a1 100644
+--- a/src/location/configure.json
++++ b/src/location/configure.json
+@@ -9,7 +9,7 @@
+             "label": "Qt.labs.location experimental QML plugin",
+             "purpose": "Provides experimental QtLocation QML types",
+             "section": "Location",
+-            "condition": "config.opengl",
++            "condition": "features.opengl",
+             "output": [ "privateFeature" ]
+         },
+         "geoservices_osm": {