From 13e23beaf2b024d9cba3efdf9587d47ccbe267c6 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Tue, 21 Jun 2011 14:12:55 -0500
Subject: [PATCH] 20110621 snapshot s390: respin javascriptcore_debuginfo.patch
 to omit -g from CXXFLAGS too

---
 .gitignore                                    |  1 +
 qtwebkit.spec                                 |  8 ++++++--
 sources                                       |  2 +-
 ...twebkit-2.2-javascriptcore_debuginfo.patch | 19 ++++++++++++++++---
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5f9ccc1..781468d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /qtwebkit-developers-qtwebkit-qtwebkit-2.1.1.tar.xz
 /webkit-qtwebkit-2.2-20110513.tar.xz
 /webkit-qtwebkit-2.2-20110603.tar.xz
+/webkit-qtwebkit-2.2-20110621.tar.xz
diff --git a/qtwebkit.spec b/qtwebkit.spec
index 5cd9de9..bf1ee5c 100644
--- a/qtwebkit.spec
+++ b/qtwebkit.spec
@@ -1,9 +1,9 @@
 
-%define snap 20110603
+%define snap 20110621
 
 Name: qtwebkit
 Version: 2.2
-Release: 5.%{snap}%{?dist}
+Release: 6.%{snap}%{?dist}
 Summary: Qt WebKit bindings
 Group: System Environment/Libraries
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -139,6 +139,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jun 21 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-6.20110621
+- 20110621 snapshot
+- s390: respin javascriptcore_debuginfo.patch to omit -g from CXXFLAGS too
+
 * Fri Jun 03 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-5.20110603
 - 20110603 snapshot
 - drop unused/deprecated phonon/gstreamer support snippets
diff --git a/sources b/sources
index 87347ee..9b24148 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5819660b3b0a6a4e46354e76a20a2c98  webkit-qtwebkit-2.2-20110603.tar.xz
+b88fdcaf1d71dc7d8eeacab01b20cdde  webkit-qtwebkit-2.2-20110621.tar.xz
diff --git a/webkit-qtwebkit-2.2-javascriptcore_debuginfo.patch b/webkit-qtwebkit-2.2-javascriptcore_debuginfo.patch
index bc07242..0e7a26f 100644
--- a/webkit-qtwebkit-2.2-javascriptcore_debuginfo.patch
+++ b/webkit-qtwebkit-2.2-javascriptcore_debuginfo.patch
@@ -1,7 +1,7 @@
 diff -up webkit-qtwebkit/Source/JavaScriptCore/JavaScriptCore.pro.javascriptcore_debuginfo webkit-qtwebkit/Source/JavaScriptCore/JavaScriptCore.pro
---- webkit-qtwebkit/Source/JavaScriptCore/JavaScriptCore.pro.javascriptcore_debuginfo	2011-05-10 12:43:19.000000000 -0500
-+++ webkit-qtwebkit/Source/JavaScriptCore/JavaScriptCore.pro	2011-05-13 10:57:21.626144796 -0500
-@@ -22,7 +22,7 @@ contains(QT_CONFIG, embedded):CONFIG += 
+--- webkit-qtwebkit/Source/JavaScriptCore/JavaScriptCore.pro.javascriptcore_debuginfo	2011-06-21 12:13:07.000000000 -0500
++++ webkit-qtwebkit/Source/JavaScriptCore/JavaScriptCore.pro	2011-06-21 13:42:02.919456263 -0500
+@@ -22,12 +22,20 @@ contains(QT_CONFIG, embedded):CONFIG += 
  contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
  unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
  
@@ -10,3 +10,16 @@ diff -up webkit-qtwebkit/Source/JavaScriptCore/JavaScriptCore.pro.javascriptcore
      # Remove the following 2 lines if you want debug information in JavaScriptCore
      CONFIG -= separate_debug_info
      CONFIG += no_debug_info
+ }
+ 
++# optimize for low mem arch s390 (disable debugging, etc...)
++equals(QT_ARCH, s390): {
++    CONFIG -= separate_debug_info
++    CONFIG += no_debug_info
++    QMAKE_CXXFLAGS_RELEASE -= -g
++    QMAKE_CFLAGS_RELEASE -= -g
++}
++
+ *-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
+ *-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
+