[arch-commits] Commit in qt5-declarative/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Sat Oct 1 08:26:01 UTC 2016
Date: Saturday, October 1, 2016 @ 08:26:01
Author: arojas
Revision: 277487
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
qt5-declarative/repos/testing-i686/
qt5-declarative/repos/testing-i686/PKGBUILD
(from rev 277486, qt5-declarative/trunk/PKGBUILD)
qt5-declarative/repos/testing-i686/qt5-declarative-gcc6.patch
(from rev 277486, qt5-declarative/trunk/qt5-declarative-gcc6.patch)
qt5-declarative/repos/testing-x86_64/
qt5-declarative/repos/testing-x86_64/PKGBUILD
(from rev 277486, qt5-declarative/trunk/PKGBUILD)
qt5-declarative/repos/testing-x86_64/qt5-declarative-gcc6.patch
(from rev 277486, qt5-declarative/trunk/qt5-declarative-gcc6.patch)
-------------------------------------------+
testing-i686/PKGBUILD | 56 ++++++++++++++++++++++++++++
testing-i686/qt5-declarative-gcc6.patch | 12 ++++++
testing-x86_64/PKGBUILD | 56 ++++++++++++++++++++++++++++
testing-x86_64/qt5-declarative-gcc6.patch | 12 ++++++
4 files changed, 136 insertions(+)
Copied: qt5-declarative/repos/testing-i686/PKGBUILD (from rev 277486, qt5-declarative/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-10-01 08:26:01 UTC (rev 277487)
@@ -0,0 +1,56 @@
+# $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.7.0
+pkgver=${_qtver/-/}
+pkgrel=3
+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')
+_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" qt5-declarative-gcc6.patch)
+md5sums=('0d9e461aa54dba4793253fa2eb501f9b'
+ 'fb2a2a118b356a0a4635111f2e0b0ee6')
+
+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 i686 segfaults with GCC 6 https://bugreports.qt.io/browse/QTBUG-52057 (Fedora patch)
+ cd ${_pkgfqn}
+ patch -p1 -i ../qt5-declarative-gcc6.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}
+}
Copied: qt5-declarative/repos/testing-i686/qt5-declarative-gcc6.patch (from rev 277486, qt5-declarative/trunk/qt5-declarative-gcc6.patch)
===================================================================
--- testing-i686/qt5-declarative-gcc6.patch (rev 0)
+++ testing-i686/qt5-declarative-gcc6.patch 2016-10-01 08:26:01 UTC (rev 277487)
@@ -0,0 +1,12 @@
+diff -up qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro.1135 qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro
+--- qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro.1135 2016-06-02 08:43:24.509068141 -0500
++++ qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro 2016-06-02 10:25:28.813766581 -0500
+@@ -21,7 +21,7 @@ exists("qqml_enable_gcov") {
+
+ greaterThan(QT_GCC_MAJOR_VERSION, 5) {
+ # Our code is bad. Temporary workaround.
+- QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks
++ QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse
+ }
+
+ QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
Copied: qt5-declarative/repos/testing-x86_64/PKGBUILD (from rev 277486, qt5-declarative/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-10-01 08:26:01 UTC (rev 277487)
@@ -0,0 +1,56 @@
+# $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.7.0
+pkgver=${_qtver/-/}
+pkgrel=3
+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')
+_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" qt5-declarative-gcc6.patch)
+md5sums=('0d9e461aa54dba4793253fa2eb501f9b'
+ 'fb2a2a118b356a0a4635111f2e0b0ee6')
+
+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 i686 segfaults with GCC 6 https://bugreports.qt.io/browse/QTBUG-52057 (Fedora patch)
+ cd ${_pkgfqn}
+ patch -p1 -i ../qt5-declarative-gcc6.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}
+}
Copied: qt5-declarative/repos/testing-x86_64/qt5-declarative-gcc6.patch (from rev 277486, qt5-declarative/trunk/qt5-declarative-gcc6.patch)
===================================================================
--- testing-x86_64/qt5-declarative-gcc6.patch (rev 0)
+++ testing-x86_64/qt5-declarative-gcc6.patch 2016-10-01 08:26:01 UTC (rev 277487)
@@ -0,0 +1,12 @@
+diff -up qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro.1135 qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro
+--- qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro.1135 2016-06-02 08:43:24.509068141 -0500
++++ qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro 2016-06-02 10:25:28.813766581 -0500
+@@ -21,7 +21,7 @@ exists("qqml_enable_gcov") {
+
+ greaterThan(QT_GCC_MAJOR_VERSION, 5) {
+ # Our code is bad. Temporary workaround.
+- QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks
++ QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse
+ }
+
+ QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
More information about the arch-commits
mailing list