Hello community, here is the log from the commit of package webkit2gtk3 for openSUSE:Factory checked in at 2015-01-21 21:54:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webkit2gtk3 (Old) and /work/SRC/openSUSE:Factory/.webkit2gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webkit2gtk3" Changes: -------- --- /work/SRC/openSUSE:Factory/webkit2gtk3/webkit2gtk3.changes 2014-12-21 12:00:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.webkit2gtk3.new/webkit2gtk3.changes 2015-01-21 21:54:15.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 13 15:27:07 UTC 2015 - [email protected] + +- Add webkitgtk-libatomic.patch: Check if libatomic is needed in + order to use std::atomic; fixes build on ppc. + +------------------------------------------------------------------- New: ---- webkitgtk-libatomic.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webkit2gtk3.spec ++++++ --- /var/tmp/diff_new_pack.IdXQW4/_old 2015-01-21 21:54:16.000000000 +0100 +++ /var/tmp/diff_new_pack.IdXQW4/_new 2015-01-21 21:54:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package webkit2gtk3 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,6 +36,8 @@ Source1: baselibs.conf # PATCH-FIX-OPENSUSE webkitgtk-typelib-sharelib-link.patch [email protected] -- Fixup the .gir file to contain the full library name for libjavascriptcore. Patch0: webkitgtk-typelib-sharelib-link.patch +# PATCH-FIX-UPSTREAM webkitgtk-libatomic.patch webkit#130837 [email protected] -- Check if libatomic is needed in order to use std::atomic +Patch1: webkitgtk-libatomic.patch BuildRequires: bison >= 2.3 BuildRequires: cmake BuildRequires: gcc-c++ @@ -206,6 +208,7 @@ %prep %setup -q -n webkitgtk-%{version} %patch0 -p1 +%patch1 -p1 %build # Use linker flags to reduce memory consumption ++++++ webkitgtk-libatomic.patch ++++++ 2014-11-20 Alberto Garcia <[email protected]> Webkit2 doesnt build on powerpc 32 bits https://bugs.webkit.org/show_bug.cgi?id=130837 Reviewed by NOBODY (OOPS!). Check if libatomic is needed in order to use std::atomic, and add it to the list of WebKit2 libraries. * PlatformGTK.cmake: diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake index 954aa0e..298ec7c 100644 --- a/Source/WebKit2/PlatformGTK.cmake +++ b/Source/WebKit2/PlatformGTK.cmake @@ -467,6 +467,15 @@ list(APPEND NetworkProcess_SOURCES NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp ) +file(WRITE ${CMAKE_BINARY_DIR}/test_atomic.cpp + "#include <atomic>\n" + "int main() { std::atomic<int64_t> i(0); i++; return 0; }\n") +try_compile(ATOMIC_BUILD_SUCCEEDED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/test_atomic.cpp) +if (NOT ATOMIC_BUILD_SUCCEEDED) + list(APPEND WebKit2_LIBRARIES atomic) +endif () +file(REMOVE ${CMAKE_BINARY_DIR}/test_atomic.cpp) + set(SharedWebKit2Libraries ${WebKit2_LIBRARIES} ) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
