From 50a432be7cf10fc532bef1bf9e0360df78c033d9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 14 Nov 2009 01:48:44 +0000 Subject: [PATCH] include, but don't apply -fno-var-tracking-assignments hack by default --- ...-4.3.3-khtml_svg_no_var_tracking_assignments.patch | 11 +++++++++++ kdelibs.spec | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch diff --git a/kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch b/kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch new file mode 100644 index 0000000..a3ff253 --- /dev/null +++ b/kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch @@ -0,0 +1,11 @@ +diff -up kdelibs-4.3.3/khtml/CMakeLists.txt.SVGNames kdelibs-4.3.3/khtml/CMakeLists.txt +--- kdelibs-4.3.3/khtml/CMakeLists.txt.SVGNames 2009-08-27 03:19:09.000000000 -0500 ++++ kdelibs-4.3.3/khtml/CMakeLists.txt 2009-11-13 17:43:07.618002091 -0600 +@@ -194,6 +194,7 @@ set(khtmldom_STAT_SRCS + ) + + #set_source_files_properties(${khtmldom_STAT_SRCS} PROPERTIES COMPILE_FLAGS ${KDE4_ENABLE_EXCEPTIONS}) ++set_source_files_properties(${khtmlsvg_STAT_SRCS} PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments ) + + # khtml/misc/Makefile.am: khtmlmisc + diff --git a/kdelibs.spec b/kdelibs.spec index 7e93078..ec00a8f 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -207,7 +207,8 @@ format for easy browsing. %patch24 -p1 -b .drkonq %endif %patch25 -p1 -b .fix-kdefakes-build -%patch26 -p1 -b .khtml_svg_no_var_tracking_assignments +## apply only when doing local builds, helps avoid failures in Rex's box with meager 2mb ram +#patch26 -p1 -b .khtml_svg_no_var_tracking_assignments # upstream patches %patch50 -p1 -b .kaction_qt_keys