[arch-commits] Commit in qt5/trunk (PKGBUILD gcc-5.patch)

[Felix Yan]

Date: Tuesday, July 14, 2015 @ 10:47:09
  Author: fyan
Revision: 242197

update url and remove old patch

Modified:
  qt5/trunk/PKGBUILD
Deleted:
  qt5/trunk/gcc-5.patch

-+
 PKGBUILD|2 +-
 gcc-5.patch |   17 -
 2 files changed, 1 insertion(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-14 07:37:09 UTC (rev 242196)
+++ PKGBUILD2015-07-14 08:47:09 UTC (rev 242197)
@@ -32,7 +32,7 @@
 pkgver=5.5.0
 pkgrel=1
 arch=('i686' 'x86_64')
-url='http://qt-project.org/'
+url='http://www.qt.io/developers'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 
'xcb-util-keysyms'
 'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-base-libs' 
'libjpeg-turbo' 'cups'

Deleted: gcc-5.patch
===
--- gcc-5.patch 2015-07-14 07:37:09 UTC (rev 242196)
+++ gcc-5.patch 2015-07-14 08:47:09 UTC (rev 242197)
@@ -1,17 +0,0 @@
-diff -up 
qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than 
-qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp
 
qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than   
   2015-03-18 10:24:38.683352327 
--0400
-+++ qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp   
2015-03-18 10:25:21.953352327 -0400
-@@ -1909,6 +1909,10 @@ void JSObject::putByIndexBeyondVectorLen
- }
- }
- 
-+template void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributesContiguousShape(ExecState*
 exec, unsigned i, JSValue value);
-+template void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributesDoubleShape(ExecState* 
exec, unsigned i, JSValue value);
-+template void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributesInt32Shape(ExecState* 
exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, 
unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
- VM vm = exec-vm();
-

[arch-commits] Commit in qt5/trunk (PKGBUILD gcc-5.patch)

[Antonio Rojas]

Date: Saturday, May 30, 2015 @ 20:26:49
  Author: arojas
Revision: 239947

Add patch to fix build with GCC 5

Added:
  qt5/trunk/gcc-5.patch
Modified:
  qt5/trunk/PKGBUILD

-+
 PKGBUILD|   10 +++---
 gcc-5.patch |   17 +
 2 files changed, 24 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-30 18:13:30 UTC (rev 239946)
+++ PKGBUILD2015-05-30 18:26:49 UTC (rev 239947)
@@ -48,7 +48,7 @@
 '0001-Try-to-ensure-that-fPIC-is-used-in-CMake-builds.patch'
 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 
'qdbusviewer.desktop' 'glib-2.43.patch'
 'qlockfile-deadlock.patch' 'qnam-corruption.patch' 
'keypad-shortcuts.patch'
-'CVE-2015-0295.patch' 'CVE-2015-1858_1859.patch' 'CVE-2015-1860.patch')
+'CVE-2015-0295.patch' 'CVE-2015-1858_1859.patch' 'CVE-2015-1860.patch' 
'gcc-5.patch')
 md5sums=('7afb5f9235d8d42b5b6e832442a32a5d'
  'fb1459f325a15b15b18afeac51173a1d'
  'ac8fa252868161c676d876b614e24436'
@@ -64,7 +64,8 @@
  '665439088fc7de52a97455c5eaf87889'
  '871ab111d03a640b4d0250388a4307cc'
  'b799130014294cb3c73fc46e7e8889db'
- '64bc4f7d5097438eb6c6f8042378b3a3')
+ '64bc4f7d5097438eb6c6f8042378b3a3'
+ '67d8771036883a1733c812719d9ad17e')
 
 prepare() {
   cd ${_pkgfqn}
@@ -80,6 +81,9 @@
   # for glib 2.43+ https://bugreports.qt.io/browse/QTBUG-44714
   (cd qtwebkit; patch -p1 -i $srcdir/glib-2.43.patch)
 
+  # Fix build with GCC 5 https://bugreports.qt.io/browse/QTBUG-44829
+  (cd qtwebkit; patch -p1 -i $srcdir/gcc-5.patch)
+
   # https://bugs.kde.org/show_bug.cgi?id=345901
   (cd qtbase; patch -p1 -i $srcdir/qlockfile-deadlock.patch)
 
@@ -94,7 +98,7 @@
 
   # http://lists.qt-project.org/pipermail/announce/2015-April/67.html
   (cd qtbase; patch -p1 -i $srcdir/CVE-2015-1858_1859.patch; patch -p1 -i 
$srcdir/CVE-2015-1860.patch)
-
+ 
   # Build qmake using Arch {C,LD}FLAGS
   # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
   sed -i -e s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}| \

Added: gcc-5.patch
===
--- gcc-5.patch (rev 0)
+++ gcc-5.patch 2015-05-30 18:26:49 UTC (rev 239947)
@@ -0,0 +1,17 @@
+diff -up 
qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than 
+qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp
+--- 
qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than   
   2015-03-18 10:24:38.683352327 
+-0400
 qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp   
2015-03-18 10:25:21.953352327 -0400
+@@ -1909,6 +1909,10 @@ void JSObject::putByIndexBeyondVectorLen
+ }
+ }
+ 
++template void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributesContiguousShape(ExecState*
 exec, unsigned i, JSValue value);
++template void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributesDoubleShape(ExecState* 
exec, unsigned i, JSValue value);
++template void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributesInt32Shape(ExecState* 
exec, unsigned i, JSValue value);
++
+ void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, 
unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
+ {
+ VM vm = exec-vm();
+