[arch-commits] Commit in qt5-declarative/repos (4 files)
Antonio Rojas
arojas at archlinux.org
Sun May 21 08:18:58 UTC 2017
Date: Sunday, May 21, 2017 @ 08:18:57
Author: arojas
Revision: 296353
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
qt5-declarative/repos/extra-i686/PKGBUILD
(from rev 296352, qt5-declarative/trunk/PKGBUILD)
qt5-declarative/repos/extra-x86_64/PKGBUILD
(from rev 296352, qt5-declarative/trunk/PKGBUILD)
Deleted:
qt5-declarative/repos/extra-i686/PKGBUILD
qt5-declarative/repos/extra-x86_64/PKGBUILD
-----------------------+
/PKGBUILD | 116 ++++++++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 52 ---------------------
extra-x86_64/PKGBUILD | 52 ---------------------
3 files changed, 116 insertions(+), 104 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-05-21 08:18:21 UTC (rev 296352)
+++ extra-i686/PKGBUILD 2017-05-21 08:18:57 UTC (rev 296353)
@@ -1,52 +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.8.0
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='Classes for QML and JavaScript languages'
-depends=('qt5-xmlpatterns')
-makedepends=('python2' 'cmake')
-groups=('qt' 'qt5')
-conflicts=('qtchooser' 'qt5-declarative-render2d')
-replaces=('qt5-declarative-render2d')
-_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('4f55b3617abdff14706d02d761d5a0aa')
-
-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'
-}
-
-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-i686/PKGBUILD (from rev 296352, qt5-declarative/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-05-21 08:18:57 UTC (rev 296353)
@@ -0,0 +1,58 @@
+# $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.8.0
+pkgver=${_qtver/-/}
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='Classes for QML and JavaScript languages'
+depends=('qt5-xmlpatterns')
+makedepends=('python2' 'cmake')
+groups=('qt' 'qt5')
+conflicts=('qtchooser' 'qt5-declarative-render2d')
+replaces=('qt5-declarative-render2d')
+_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+ qtbug-58811.patch::"https://github.com/qt/qtdeclarative/commit/b078939.patch")
+md5sums=('4f55b3617abdff14706d02d761d5a0aa'
+ '8604dec4cc46c1d2139edb640f8e13bb')
+
+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'
+
+# Fix crash on Plasma toolbox https://bugreports.qt.io/browse/QTBUG-58811
+ cd ${_pkgfqn}
+ patch -p1 -i ../qtbug-58811.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}
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-05-21 08:18:21 UTC (rev 296352)
+++ extra-x86_64/PKGBUILD 2017-05-21 08:18:57 UTC (rev 296353)
@@ -1,52 +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.8.0
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='Classes for QML and JavaScript languages'
-depends=('qt5-xmlpatterns')
-makedepends=('python2' 'cmake')
-groups=('qt' 'qt5')
-conflicts=('qtchooser' 'qt5-declarative-render2d')
-replaces=('qt5-declarative-render2d')
-_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('4f55b3617abdff14706d02d761d5a0aa')
-
-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'
-}
-
-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 296352, qt5-declarative/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-05-21 08:18:57 UTC (rev 296353)
@@ -0,0 +1,58 @@
+# $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.8.0
+pkgver=${_qtver/-/}
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='Classes for QML and JavaScript languages'
+depends=('qt5-xmlpatterns')
+makedepends=('python2' 'cmake')
+groups=('qt' 'qt5')
+conflicts=('qtchooser' 'qt5-declarative-render2d')
+replaces=('qt5-declarative-render2d')
+_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+ qtbug-58811.patch::"https://github.com/qt/qtdeclarative/commit/b078939.patch")
+md5sums=('4f55b3617abdff14706d02d761d5a0aa'
+ '8604dec4cc46c1d2139edb640f8e13bb')
+
+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'
+
+# Fix crash on Plasma toolbox https://bugreports.qt.io/browse/QTBUG-58811
+ cd ${_pkgfqn}
+ patch -p1 -i ../qtbug-58811.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}
+}
More information about the arch-commits
mailing list