git » qt5-declarative.git » commit cdf9ba5

Qt 5.7.1

author Antonio Rojas
2016-12-14 10:16:02 UTC
committer Antonio Rojas
2016-12-14 10:16:02 UTC
parent 9459957abf0df6c1ea32807730f6b2694446a3bd

Qt 5.7.1

PKGBUILD +4 -9
qt5-declarative-gcc6.patch +0 -12

diff --git a/PKGBUILD b/PKGBUILD
index 0a2a72f..d622870 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qt5-declarative
-_qtver=5.7.0
+_qtver=5.7.1
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -15,19 +15,14 @@ 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')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+md5sums=('e8940f4237bcedc67c8e9e753beb10d2')
 
 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() {
diff --git a/qt5-declarative-gcc6.patch b/qt5-declarative-gcc6.patch
deleted file mode 100644
index eaf677e..0000000
--- a/qt5-declarative-gcc6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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