[arch-commits] Commit in qt5-declarative/repos/kde-unstable-x86_64 (PKGBUILD PKGBUILD)

[Antonio Rojas]

    Date: Monday, April 6, 2020 @ 21:50:17
  Author: arojas
Revision: 379711

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  qt5-declarative/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 379710, qt5-declarative/kde-unstable/PKGBUILD)
Deleted:
  qt5-declarative/repos/kde-unstable-x86_64/PKGBUILD

----------+
 PKGBUILD |   97 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 51 insertions(+), 46 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-06 21:49:53 UTC (rev 379710)
+++ PKGBUILD	2020-04-06 21:50:17 UTC (rev 379711)
@@ -1,46 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-declarative
-_qtver=5.15.0-beta3
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('x86_64')
-url='https://www.qt.io'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='Classes for QML and JavaScript languages'
-depends=('qt5-base')
-makedepends=('python' 'vulkan-headers')
-groups=('qt' 'qt5')
-conflicts=('qtchooser')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('95accbf0543f75b9d3527f014144663fc101534346ae74ea83fa56331a35b640')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-
-  qmake ../${_pkgfqn}
-  make
-}
-
-package() {
-  cd build
-  make INSTALL_ROOT="$pkgdir" install
-
-  # Symlinks for backwards compatibility
-  for b in "$pkgdir"/usr/bin/*; do
-    ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-  done
-
-  # 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-declarative/repos/kde-unstable-x86_64/PKGBUILD (from rev 379710, qt5-declarative/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-06 21:50:17 UTC (rev 379711)
@@ -0,0 +1,51 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-declarative
+_qtver=5.15.0-beta3
+pkgver=${_qtver/-/}
+pkgrel=2
+arch=('x86_64')
+url='https://www.qt.io'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='Classes for QML and JavaScript languages'
+depends=('qt5-base')
+makedepends=('python' 'vulkan-headers')
+groups=('qt' 'qt5')
+conflicts=('qtchooser')
+_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
+source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+         qtbug-83282c.patch::"https://code.qt.io/cgit/qt/qtdeclarative.git/patch/?id=1a2ab822")
+sha256sums=('95accbf0543f75b9d3527f014144663fc101534346ae74ea83fa56331a35b640'
+            '806295dddba2faf05c7d9ff47ad6c3f7e2d6ad6b205af97d5236d5c1f0b08854')
+
+prepare() {
+  mkdir -p build
+
+  cd $_pkgfqn
+  patch -p1 -i ../qtbug-83282c.patch # Fix double cmake target
+}
+
+build() {
+  cd build
+
+  qmake ../${_pkgfqn}
+  make
+}
+
+package() {
+  cd build
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Symlinks for backwards compatibility
+  for b in "$pkgdir"/usr/bin/*; do
+    ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
+  done
+
+  # 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}
+}