File project.diff of Package libQtWebKit4

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package libQtWebKit4

--- do-not-force-optimization-level.diff.orig
+++ do-not-force-optimization-level.diff
@@ -67,23 +67,25 @@
    # We clear the environ after calling gyp.  When the auto-regeneration happens,
 --- Source/WebKit.pri
 +++ Source/WebKit.pri
-@@ -1,5 +1,8 @@
+@@ -1,5 +1,9 @@
  # Include file to make it easy to include WebKit into Qt projects
  
 +QMAKE_CFLAGS_RELEASE = ""
 +QMAKE_CXXFLAGS_RELEASE = ""
++QMAKE_LFLAGS_RELEASE = ""
 +
  contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded
  
  # Detect that we are building as a standalone package by the presence of
 --- Tools/Tools.pro.orig	2011-12-06 08:25:34.777703423 +0100
 +++ Tools/Tools.pro	2011-12-06 08:26:19.511396680 +0100
-@@ -2,6 +2,9 @@
+@@ -2,6 +2,10 @@
  TEMPLATE = subdirs
  CONFIG += ordered
  
 +QMAKE_CFLAGS_RELEASE = ""
 +QMAKE_CXXFLAGS_RELEASE = ""
++QMAKE_LFLAGS_RELEASE = ""
 +
  include($$PWD/../Source/common.pri)
  include($$PWD/../Source/WebCore/features.pri)
--- libQtWebKit4.changes.orig
+++ libQtWebKit4.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Mon Aug 13 16:32:27 UTC 2012 - dmueller@suse.com
+
+- reduce memory usage for arm
+
+-------------------------------------------------------------------
 Thu Jun  7 16:58:17 UTC 2012 - dmueller@suse.com
 
 - Sync with Qt 4.8.2 
--- libQtWebKit4.spec.orig
+++ libQtWebKit4.spec
@@ -106,9 +106,7 @@ This package contains development files
 %patch8 -p1
 %patch9 -p1
 %patch10
-%ifarch %arm
 %patch11
-%endif
 %patch12
 %patch13
 %patch14
@@ -117,21 +115,18 @@ This package contains development files
 %build
 export QTDIR=%{_prefix}
 
-%ifarch armv7l
-# There is a bug in gcc 4.6 that triggers an ICE with vfpv3 and -O2/-O3. We can
-# either work it around by forcing the FPU to neon (which breaks tegra2) or
-# compiling with -O1. We do the latter. Can most likely be removed with gcc 4.7
-#
-#    https://bugs.launchpad.net/gcc-linaro/+bug/795131
-#
-RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-O2/-O1}"
-# debug stuff uses too much memory so linking fails
+%ifarch %arm
+# debug uses crazy amount of memory which we don't have
 RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-g/}"
 %endif
 
 Tools/Scripts/build-webkit \
  --release \
  --qt \
+%ifarch %arm
+ --no-svg \
+ --no-mathml \
+%endif
  --makeargs="%{?_smp_mflags}" \
  --qmakearg="CONFIG+=use_system_icu QMAKE_CFLAGS+=\"${RPM_OPT_FLAGS}\" QMAKE_CXXFLAGS+=\"${RPM_OPT_FLAGS}\" DEFINES+=USE_GSTREAMER=1"
 
--- reduce-link-optimization.diff.orig
+++ reduce-link-optimization.diff
@@ -6,7 +6,7 @@
 -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
 -linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
 +#unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
-+linux*-g++*:QMAKE_LFLAGS += -Wl,--reduce-memory-overheads -Wl,--no-keep-memory
++linux*-g++*:QMAKE_LFLAGS = -Wl,--reduce-memory-overheads -Wl,--no-keep-memory
  
  unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
  unix:!mac:!symbian:CONFIG += link_pkgconfig

Places

File project.diff of Package libQtWebKit4

Places