From 1bdbbcda0178915856c56fb4c4d39ba75405b6df Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 15 Jan 2013 18:53:54 +0100 Subject: [PATCH] use SYSTEM_MALLOC on ppc/ppc64 --- qtwebkit-ppc.patch | 9 +++++++++ qtwebkit.spec | 11 ++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 qtwebkit-ppc.patch diff --git a/qtwebkit-ppc.patch b/qtwebkit-ppc.patch new file mode 100644 index 0000000..b184d86 --- /dev/null +++ b/qtwebkit-ppc.patch @@ -0,0 +1,9 @@ +diff -up qtwebkit-2.2.2-source/Source/common.pri.me qtwebkit-2.2.2-source/Source/common.pri +--- qtwebkit-2.2.2-source/Source/common.pri.me 2013-01-15 17:42:21.363617854 +0100 ++++ qtwebkit-2.2.2-source/Source/common.pri 2013-01-15 17:43:48.633859421 +0100 +@@ -13,3 +13,5 @@ contains(JAVASCRIPTCORE_JIT,no): DEFINES + # We use this flag on production branches + # See https://bugs.webkit.org/show_bug.cgi?id=60824 + CONFIG += production ++ ++DEFINES+=USE_SYSTEM_MALLOC=1 diff --git a/qtwebkit.spec b/qtwebkit.spec index 67f0f58..9f2eaf1 100644 --- a/qtwebkit.spec +++ b/qtwebkit.spec @@ -1,7 +1,7 @@ Name: qtwebkit Version: 2.2.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Qt WebKit bindings Group: System Environment/Libraries License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -41,6 +41,9 @@ Patch8: qtwebkit-svg_infinite_loop.patch # fix 64k pagesize issue Patch9: qtwebkit-64k-pagesize.patch +# use SYSTEM_MALLOC on ppc/ppc64 +Patch10: qtwebkit-ppc.patch + ## upstream patches # https://bugzilla.redhat.com/891464 # https://bugs.webkit.org/show_bug.cgi?id=72285 @@ -101,6 +104,9 @@ Provides: qt4-webkit-devel%{?_isa} = 2:%{version}-%{release} %patch7 -p1 -b .ld.gold %patch8 -p1 -b .svn_infinite_loop %patch9 -p1 -b .64kpagesize +%ifarch ppc ppc64 +%patch10 -p1 -b .system-malloc +%endif %patch100 -p1 -b .webkit72285 %patch102 -p1 -b .0002 %patch103 -p1 -b .0003 @@ -157,6 +163,9 @@ rm -rf %{buildroot} %changelog +* Tue Jan 15 2013 Than Ngo - 2.2.2-7 +- use SYSTEM_MALLOC on ppc/ppc64 + * Fri Jan 11 2013 Than Ngo 2.2.2-6 - bz#893447, fix 64k pagesize issue