From 81f31948dc31a998664a509fa62d9357c81bb353 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Sun, 4 Aug 2013 21:20:02 +0200 Subject: [PATCH] update ppc libatomic patch --- webkitgtk-1.11.5-libatomic.patch | 63 -------------------------------- webkitgtk-2.0.4-libatomic.patch | 63 ++++++++++++++++++++++++++++++++ webkitgtk.spec | 7 +++- 3 files changed, 68 insertions(+), 65 deletions(-) delete mode 100644 webkitgtk-1.11.5-libatomic.patch create mode 100644 webkitgtk-2.0.4-libatomic.patch diff --git a/webkitgtk-1.11.5-libatomic.patch b/webkitgtk-1.11.5-libatomic.patch deleted file mode 100644 index 8c2b721..0000000 --- a/webkitgtk-1.11.5-libatomic.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up webkitgtk-1.11.90/GNUmakefile.in.libatomic webkitgtk-1.11.90/GNUmakefile.in ---- webkitgtk-1.11.90/GNUmakefile.in.libatomic 2013-02-21 19:07:19.000000000 +0100 -+++ webkitgtk-1.11.90/GNUmakefile.in 2013-02-25 11:31:34.824149062 +0100 -@@ -20933,6 +20933,7 @@ libWTF_la_CXXFLAGS = \ - $(libWTF_la_CFLAGS) - - libWTF_la_CFLAGS = \ -+ -latomic \ - -fstrict-aliasing \ - -O3 \ - $(global_cflags) \ -@@ -22305,7 +22306,7 @@ Programs_WebKitPluginProcess_SOURCES = \ - - #if ENABLE_SVG - #endif --Programs_WebKitPluginProcess_LDADD = -lpthread \ -+Programs_WebKitPluginProcess_LDADD = -latomic -lpthread \ - libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ - libWebCore.la libWebCoreSVG.la libWebCorePlatform.la \ - libWebCoreGtk2.la $(CAIRO_LIBS) $(COVERAGE_LDFLAGS) \ -diff -up webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am.libatomic webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am ---- webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am.libatomic 2013-02-25 11:28:58.812154709 +0100 -+++ webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am 2013-02-25 11:29:14.906154126 +0100 -@@ -568,6 +568,7 @@ Programs_WebKitPluginProcess_SOURCES = \ - $(webkit2_plugin_process_sources) - - Programs_WebKitPluginProcess_LDADD = \ -+ -latomic \ - -lpthread \ - libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ - libWebCore.la -diff -up webkitgtk-1.11.90/Source/WTF/GNUmakefile.am.libatomic webkitgtk-1.11.90/Source/WTF/GNUmakefile.am ---- webkitgtk-1.11.90/Source/WTF/GNUmakefile.am.libatomic 2012-07-19 12:02:14.000000000 +0200 -+++ webkitgtk-1.11.90/Source/WTF/GNUmakefile.am 2013-02-25 09:21:31.552243859 +0100 -@@ -25,6 +25,7 @@ libWTF_la_CXXFLAGS = \ - $(libWTF_la_CFLAGS) - - libWTF_la_CFLAGS = \ -+ -latomic \ - -fstrict-aliasing \ - -O3 \ - $(global_cflags) \ -diff -up webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h.libatomic webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h ---- webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h.libatomic 2013-01-29 11:00:42.000000000 +0100 -+++ webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h 2013-02-25 09:21:31.553243859 +0100 -@@ -107,6 +107,17 @@ inline int atomicDecrement(int volatile* - inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; } - inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; } - -+#elif COMPILER(GCC) && (__GNUC__ > 4 || (__GNUC__ == 4 \ -+ && (__GNUC_MINOR__ > 8 || (__GNUC_MINOR__ == 8 \ -+ && (__GNUC_PATCHLEVEL__ > 0 || (__GNUC_PATCHLEVEL__ == 0)))))) \ -+ && CPU(PPC) -+#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 -+inline int atomicIncrement(int volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); } -+inline int atomicDecrement(int volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); } -+ -+inline int64_t atomicIncrement(int64_t volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); } -+inline int64_t atomicDecrement(int64_t volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); } -+ - #elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc - #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 - diff --git a/webkitgtk-2.0.4-libatomic.patch b/webkitgtk-2.0.4-libatomic.patch new file mode 100644 index 0000000..052b6ac --- /dev/null +++ b/webkitgtk-2.0.4-libatomic.patch @@ -0,0 +1,63 @@ +diff -up webkitgtk-2.0.4/GNUmakefile.in.ppc webkitgtk-2.0.4/GNUmakefile.in +--- webkitgtk-2.0.4/GNUmakefile.in.ppc 2013-08-04 21:12:16.184460261 +0200 ++++ webkitgtk-2.0.4/GNUmakefile.in 2013-08-04 21:13:31.235462408 +0200 +@@ -20865,6 +20865,7 @@ libWTF_la_CXXFLAGS = \ + $(libWTF_la_CFLAGS) + + libWTF_la_CFLAGS = \ ++ -latomic \ + -fstrict-aliasing \ + -O3 \ + $(global_cflags) \ +@@ -22243,6 +22244,7 @@ Programs_WebKitPluginProcess_SOURCES = \ + $(webkit2_plugin_process_sources) + + Programs_WebKitPluginProcess_LDADD = \ ++ -latomic \ + -lpthread \ + libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ + WebCoreLayerGtk2.a \ +diff -up webkitgtk-2.0.4/Source/WebKit2/GNUmakefile.am.ppc webkitgtk-2.0.4/Source/WebKit2/GNUmakefile.am +--- webkitgtk-2.0.4/Source/WebKit2/GNUmakefile.am.ppc 2013-08-04 21:13:45.056462804 +0200 ++++ webkitgtk-2.0.4/Source/WebKit2/GNUmakefile.am 2013-08-04 21:14:10.076463519 +0200 +@@ -604,6 +604,7 @@ Programs_WebKitPluginProcess_SOURCES = \ + $(webkit2_plugin_process_sources) + + Programs_WebKitPluginProcess_LDADD = \ ++ -latomic \ + -lpthread \ + libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ + WebCoreLayerGtk2.a \ +diff -up webkitgtk-2.0.4/Source/WTF/GNUmakefile.am.ppc webkitgtk-2.0.4/Source/WTF/GNUmakefile.am +--- webkitgtk-2.0.4/Source/WTF/GNUmakefile.am.ppc 2013-08-04 21:14:22.140463865 +0200 ++++ webkitgtk-2.0.4/Source/WTF/GNUmakefile.am 2013-08-04 21:14:50.155464666 +0200 +@@ -25,6 +25,7 @@ libWTF_la_CXXFLAGS = \ + $(libWTF_la_CFLAGS) + + libWTF_la_CFLAGS = \ ++ -latomic \ + -fstrict-aliasing \ + -O3 \ + $(global_cflags) \ +diff -up webkitgtk-2.0.4/Source/WTF/wtf/Atomics.h.ppc webkitgtk-2.0.4/Source/WTF/wtf/Atomics.h +--- webkitgtk-2.0.4/Source/WTF/wtf/Atomics.h.ppc 2013-08-04 21:15:01.142464980 +0200 ++++ webkitgtk-2.0.4/Source/WTF/wtf/Atomics.h 2013-08-04 21:16:59.951468379 +0200 +@@ -107,6 +107,18 @@ inline int atomicDecrement(int volatile* + inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; } + inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; } + ++#elif COMPILER(GCC) && (__GNUC__ > 4 || (__GNUC__ == 4 \ ++ && (__GNUC_MINOR__ > 8 || (__GNUC_MINOR__ == 8 \ ++ && (__GNUC_PATCHLEVEL__ > 0 || (__GNUC_PATCHLEVEL__ == 0)))))) \ ++ && CPU(PPC) ++#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 ++inline int atomicIncrement(int volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); } ++inline int atomicDecrement(int volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); } ++ ++inline int64_t atomicIncrement(int64_t volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); } ++inline int64_t atomicDecrement(int64_t volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); } ++ ++ + #elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc + #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 + diff --git a/webkitgtk.spec b/webkitgtk.spec index f4121e0..0eff8ee 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -10,7 +10,7 @@ Name: webkitgtk Version: 2.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -26,7 +26,7 @@ Patch0: webkit-1.3.10-nspluginwrapper.patch Patch1: webkit-1.11.2-yarr.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch2: webkit-1.11.2-Double2Ints.patch -Patch3: webkitgtk-1.11.5-libatomic.patch +Patch3: webkitgtk-2.0.4-libatomic.patch Patch4: webkit-1.11.90-double2intsPPC32.patch BuildRequires: bison @@ -206,6 +206,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Sun Aug 04 2013 Karsten Hopp 2.0.4-3 +- update ppc libatomic patch + * Sat Jul 27 2013 Kevin Fenzi 2.0.4-2 - Fix for unversioned doc dirs