[webkitgtk3] Add patch that fixes compilation on i686
Tomas Popela
tpopela at fedoraproject.org
Fri Jan 17 06:52:58 UTC 2014
commit b4c792c7a5f74e0f17e82590c390bc8348c09e5b
Author: Tomas Popela <tpopela at redhat.com>
Date: Fri Jan 17 07:52:12 2014 +0100
Add patch that fixes compilation on i686
webkitgtk-2.3.4-atomics_h.patch | 12 ++++++++++++
webkitgtk3.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/webkitgtk-2.3.4-atomics_h.patch b/webkitgtk-2.3.4-atomics_h.patch
new file mode 100644
index 0000000..68dcf87
--- /dev/null
+++ b/webkitgtk-2.3.4-atomics_h.patch
@@ -0,0 +1,12 @@
+diff -up webkitgtk-2.3.4/Source/WTF/wtf/Atomics.h.atomics_h webkitgtk-2.3.4/Source/WTF/wtf/Atomics.h
+--- webkitgtk-2.3.4/Source/WTF/wtf/Atomics.h.atomics_h 2014-01-17 07:49:55.261905005 +0100
++++ webkitgtk-2.3.4/Source/WTF/wtf/Atomics.h 2014-01-17 07:51:12.145846305 +0100
+@@ -295,7 +295,7 @@ inline bool weakCompareAndSwap(uint8_t*
+ "lock; cmpxchgb %3, %2\n\t"
+ "sete %1"
+ : "+a"(expected), "=q"(result), "+m"(*location)
+- : "r"(newValue)
++ : "q"(newValue)
+ : "memory"
+ );
+ return result;
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 043b846..817fdca 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -7,7 +7,7 @@
Name: webkitgtk3
Version: 2.3.4
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: GTK+ Web content engine library
Group: Development/Libraries
@@ -20,6 +20,9 @@ Patch0: webkit-1.1.14-nspluginwrapper.patch
# https://bugs.webkit.org/show_bug.cgi?id=103128
Patch4: webkit-2.1.90-double2intsPPC32.patch
Patch9: webkitgtk-2.3.2-libatomic.patch
+# https://bugs.webkit.org/show_bug.cgi?id=126985
+# Remove when next version will be released
+Patch10: webkitgtk-2.3.4-atomics_h.patch
BuildRequires: at-spi2-core-devel
BuildRequires: bison
@@ -100,6 +103,7 @@ This package contains developer documentation for %{name}.
%ifarch ppc
%patch9 -p1 -b .libatomic
%endif
+%patch10 -p1 -b .atomics_h
%build
# Use linker flags to reduce memory consumption
@@ -221,6 +225,7 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
%changelog
* Mon Jan 13 2014 Tomas Popela <tpopela at redhat.com> - 2.3.4-1
- Update to 2.3.4
+- Add patch that fixes compilation on i686
* Thu Jan 02 2014 Orion Poplawski <orion at cora.nwra.com> - 2.3.3-2
- Rebuild for libwebp soname bump
More information about the scm-commits
mailing list