[arch-commits] Commit in qt5-location/repos/extra-x86_64 (3 files)

[Antonio Rojas]

    Date: Wednesday, March 16, 2022 @ 22:07:13
  Author: arojas
Revision: 439819

archrelease: copy trunk to extra-x86_64

Added:
  qt5-location/repos/extra-x86_64/PKGBUILD
    (from rev 439818, qt5-location/trunk/PKGBUILD)
  qt5-location/repos/extra-x86_64/fix-opengl-detection.patch
    (from rev 439818, qt5-location/trunk/fix-opengl-detection.patch)
Deleted:
  qt5-location/repos/extra-x86_64/PKGBUILD

----------------------------+
 PKGBUILD                   |   98 ++++++++++++++++++++++---------------------
 fix-opengl-detection.patch |   13 +++++
 2 files changed, 64 insertions(+), 47 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-16 22:06:54 UTC (rev 439818)
+++ PKGBUILD	2022-03-16 22:07:13 UTC (rev 439819)
@@ -1,47 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-location
-_basever=5.15.3
-pkgver=5.15.3+kde+r0
-pkgrel=1
-_commit=1bf01b84e30aab2b87a19184ce42160e6c92d8b1
-arch=('x86_64')
-url='https://www.qt.io'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='Provides access to position, satellite and area monitoring classes'
-depends=('qt5-declarative')
-makedepends=('git')
-groups=('qt' 'qt5')
-_pkgfqn=${pkgname/5-/}
-source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
-sha256sums=('SKIP')  
-options=(debug)
-
-pkgver() {
-  cd $_pkgfqn
-  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
-}
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-
-  qmake ../${_pkgfqn}
-  make
-}
-
-package() {
-  cd build
-  make INSTALL_ROOT="$pkgdir" install
-
-  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-  find "$pkgdir/usr/lib" -type f -name '*.prl' \
-    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-  install -d "$pkgdir"/usr/share/licenses
-  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-}

Copied: qt5-location/repos/extra-x86_64/PKGBUILD (from rev 439818, qt5-location/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-03-16 22:07:13 UTC (rev 439819)
@@ -0,0 +1,51 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-location
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=2
+_commit=1bf01b84e30aab2b87a19184ce42160e6c92d8b1
+arch=('x86_64')
+url='https://www.qt.io'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='Provides access to position, satellite and area monitoring classes'
+depends=('qt5-declarative')
+makedepends=('git')
+groups=('qt' 'qt5')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
+        fix-opengl-detection.patch)
+sha256sums=('SKIP'
+            '84954d1bd528852d5cb60a5618bc2f9d34da0f459cde7d54b319b88fa9a4c11c')
+options=(debug)
+
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
+prepare() {
+  mkdir -p build
+
+  patch -d $_pkgfqn -p1 < fix-opengl-detection.patch
+}
+
+build() {
+  cd build
+
+  qmake ../${_pkgfqn}
+  make
+}
+
+package() {
+  cd build
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+  find "$pkgdir/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
+}

Copied: qt5-location/repos/extra-x86_64/fix-opengl-detection.patch (from rev 439818, qt5-location/trunk/fix-opengl-detection.patch)
===================================================================
--- fix-opengl-detection.patch	                        (rev 0)
+++ fix-opengl-detection.patch	2022-03-16 22:07:13 UTC (rev 439819)
@@ -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": {