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

[Antonio Rojas]

    Date: Monday, April 23, 2018 @ 06:36:58
  Author: arojas
Revision: 322788

archrelease: copy trunk to extra-x86_64

Added:
  qt5-declarative/repos/extra-x86_64/PKGBUILD
    (from rev 322787, qt5-declarative/trunk/PKGBUILD)
Deleted:
  qt5-declarative/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  129 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 67 insertions(+), 62 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-23 06:36:31 UTC (rev 322787)
+++ PKGBUILD	2018-04-23 06:36:58 UTC (rev 322788)
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-declarative
-_qtver=5.10.1
-pkgver=${_qtver/-/}
-pkgrel=3
-arch=('x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='Classes for QML and JavaScript languages'
-depends=('qt5-xmlpatterns')
-makedepends=('python2' 'git')
-groups=('qt' 'qt5')
-conflicts=('qtchooser' 'qt5-declarative-render2d')
-replaces=('qt5-declarative-render2d')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-        qtbug-65789-2.patch::"https://github.com/qt/qtdeclarative/commit/602a6589.patch"
-        qtbug-67019.patch::"https://github.com/qt/qtdeclarative/commit/b1243b8c.patch")
-sha256sums=('3af9ed51bce5b5c6f04c4a67a6008f98765ccde897c43fff670621ab70789553'
-            'e516e969dcf9520a4e5f05291ffe4baef1a6e499248f342f66c39147ef06a272'
-            'eed0e2617d4d46452acc79438666bab46c0c797ec4cb9ab447037c4176d83aba')
-
-prepare() {
-  mkdir -p build
-
-  # Use python2 for Python 2.x
-  find -name '*.pro' -o -name '*.pri' | xargs sed -i -e 's|python -c|python2 -c|g' -e 's|python \$|python2 \$|g'
-
-  cd ${_pkgfqn}
-
-  # Fix two issues affecting display of SVG images
-  patch -Np1 -i ../qtbug-65789-2.patch # https://bugreports.qt.io/browse/QTBUG-65789
-  git apply -v ../qtbug-67019.patch    # https://bugreports.qt.io/browse/QTBUG-67019
-}
-
-build() {
-  cd build
-
-  export PYTHON=python2
-  qmake ../${_pkgfqn}
-  make
-}
-
-package() {
-  cd build
-  make INSTALL_ROOT="$pkgdir" install
-
-  # Symlinks for backwards compatibility
-  for b in "$pkgdir"/usr/bin/*; do
-    ln -s /usr/bin/$(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/extra-x86_64/PKGBUILD (from rev 322787, qt5-declarative/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-04-23 06:36:58 UTC (rev 322788)
@@ -0,0 +1,67 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-declarative
+_qtver=5.10.1
+pkgver=${_qtver/-/}
+pkgrel=4
+arch=('x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='Classes for QML and JavaScript languages'
+depends=('qt5-xmlpatterns')
+makedepends=('python2' 'git')
+groups=('qt' 'qt5')
+conflicts=('qtchooser' 'qt5-declarative-render2d')
+replaces=('qt5-declarative-render2d')
+_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+        qtbug-65789-2.patch::"https://github.com/qt/qtdeclarative/commit/602a6589.patch"
+        qtbug-67019.patch::"https://github.com/qt/qtdeclarative/commit/b1243b8c.patch"
+        qtdeclarative-memory-leak.patch::"http://code.qt.io/cgit/qt/qtdeclarative.git/patch?id=839f09c6")
+sha256sums=('3af9ed51bce5b5c6f04c4a67a6008f98765ccde897c43fff670621ab70789553'
+            'e516e969dcf9520a4e5f05291ffe4baef1a6e499248f342f66c39147ef06a272'
+            'eed0e2617d4d46452acc79438666bab46c0c797ec4cb9ab447037c4176d83aba'
+            '30c320f39b145d133aa165991316af7b82934e367f98aa0aaf6bc84eabb0cea8')
+
+prepare() {
+  mkdir -p build
+
+  # Use python2 for Python 2.x
+  find -name '*.pro' -o -name '*.pri' | xargs sed -i -e 's|python -c|python2 -c|g' -e 's|python \$|python2 \$|g'
+
+  cd ${_pkgfqn}
+
+  # Fix two issues affecting display of SVG images
+  patch -Np1 -i ../qtbug-65789-2.patch # https://bugreports.qt.io/browse/QTBUG-65789
+  git apply -v ../qtbug-67019.patch    # https://bugreports.qt.io/browse/QTBUG-67019
+
+  # Fix memory leak
+  patch -p1 -i ../qtdeclarative-memory-leak.patch
+}
+
+build() {
+  cd build
+
+  export PYTHON=python2
+  qmake ../${_pkgfqn}
+  make
+}
+
+package() {
+  cd build
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Symlinks for backwards compatibility
+  for b in "$pkgdir"/usr/bin/*; do
+    ln -s /usr/bin/$(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}
+}