Hello community, here is the log from the commit of package webkitgtk for openSUSE:Factory checked in at 2014-08-07 08:08:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webkitgtk (Old) and /work/SRC/openSUSE:Factory/.webkitgtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webkitgtk" Changes: -------- --- /work/SRC/openSUSE:Factory/webkitgtk/webkitgtk.changes 2014-07-24 07:03:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.webkitgtk.new/webkitgtk.changes 2014-08-07 08:08:13.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 4 10:34:12 UTC 2014 - [email protected] + +- Add webkitgtk-ppc32.patch: Fix ppc32 build; Webkit2 doesnt build + on powerpc 32 bits (webkit#130837). + +------------------------------------------------------------------- webkitgtk3.changes: same change New: ---- webkitgtk-ppc32.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webkitgtk.spec ++++++ --- /var/tmp/diff_new_pack.50bHmn/_old 2014-08-07 08:08:15.000000000 +0200 +++ /var/tmp/diff_new_pack.50bHmn/_new 2014-08-07 08:08:15.000000000 +0200 @@ -71,6 +71,8 @@ Patch8: webkitgtk-commit-size.patch # PATCH-FIX-UPSTREAM webkitgtk-protocall-endian-fix.patch webkit#131449 [email protected] -- fix a Javascript endian issue. Patch9: webkitgtk-protocall-endian-fix.patch +# PATCH-FIX-UPSTREAM webkitgtk-ppc32.patch webkit#130837 [email protected] -- Webkit2 doesnt build on powerpc 32 bits +Patch10: webkitgtk-ppc32.patch BuildRequires: Mesa-devel BuildRequires: bison BuildRequires: chrpath @@ -329,6 +331,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %endif # FIXME: workaround needed in > 1.7.90 to fix build mkdir -p DerivedSources/webkit ++++++ webkitgtk3.spec ++++++ --- /var/tmp/diff_new_pack.50bHmn/_old 2014-08-07 08:08:15.000000000 +0200 +++ /var/tmp/diff_new_pack.50bHmn/_new 2014-08-07 08:08:15.000000000 +0200 @@ -71,6 +71,8 @@ Patch8: webkitgtk-commit-size.patch # PATCH-FIX-UPSTREAM webkitgtk-protocall-endian-fix.patch webkit#131449 [email protected] -- fix a Javascript endian issue. Patch9: webkitgtk-protocall-endian-fix.patch +# PATCH-FIX-UPSTREAM webkitgtk-ppc32.patch webkit#130837 [email protected] -- Webkit2 doesnt build on powerpc 32 bits +Patch10: webkitgtk-ppc32.patch BuildRequires: Mesa-devel BuildRequires: bison BuildRequires: chrpath @@ -329,6 +331,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %endif # FIXME: workaround needed in > 1.7.90 to fix build mkdir -p DerivedSources/webkit ++++++ webkitgtk-ppc32.patch ++++++ >From 4cf6f716f227829b66c60e5dffda4d57d98536a6 Mon Sep 17 00:00:00 2001 From: Dinar Valeev <[email protected]> Date: Mon, 4 Aug 2014 09:49:34 +0000 Subject: [PATCH] fix ppc32 build --- Source/WebKit2/Platform/IPC/Connection.h | 4 ++++ Source/WebKit2/UIProcess/StatisticsRequest.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Source/WebKit2/Platform/IPC/Connection.h b/Source/WebKit2/Platform/IPC/Connection.h index 92df268..18bdc81 100644 --- a/Source/WebKit2/Platform/IPC/Connection.h +++ b/Source/WebKit2/Platform/IPC/Connection.h @@ -216,7 +216,11 @@ private: Client* m_client; bool m_isServer; +#if CPU(PPC) + uint64_t m_syncRequestID; +#else std::atomic<uint64_t> m_syncRequestID; +#endif bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage; bool m_shouldExitOnSyncMessageSendFailure; diff --git a/Source/WebKit2/UIProcess/StatisticsRequest.cpp b/Source/WebKit2/UIProcess/StatisticsRequest.cpp index 3223da5..f8ed21a 100644 --- a/Source/WebKit2/UIProcess/StatisticsRequest.cpp +++ b/Source/WebKit2/UIProcess/StatisticsRequest.cpp @@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest() uint64_t StatisticsRequest::addOutstandingRequest() { +#if CPU(PPC) + static int64_t uniqueRequestID; +#else static std::atomic<int64_t> uniqueRequestID; +#endif uint64_t requestID = ++uniqueRequestID; m_outstandingRequests.add(requestID); -- 1.7.12.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
