[packages/qt5-qtwebkit] x32 patch obsolete
glen
glen at pld-linux.org
Thu Jun 11 15:42:53 CEST 2015
commit f5cff1549291b745f7b05fea2a41dc3f13429a1e
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Jun 11 16:42:48 2015 +0300
x32 patch obsolete
qt5-qtwebkit.spec | 4 ----
x32-asm.patch | 11 -----------
2 files changed, 15 deletions(-)
---
diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index 04a5526..e79dcc8 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -32,7 +32,6 @@ License: LGPL v2+
Group: X11/Libraries
Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
# Source0-md5: b711b3f32646d72cd281b3c17ab6d14e
-Patch0: x32-asm.patch
URL: http://qt-project.org/
BuildRequires: OpenGL-devel
BuildRequires: Qt5Core-devel >= %{qtbase_ver}
@@ -170,9 +169,6 @@ Dokumentacja do bibliotek Qt5 WebKit w formacie QCH.
%prep
%setup -q -n %{orgname}-opensource-src-%{version}
-%ifarch x32
-%patch0 -p1
-%endif
%build
qmake-qt5 \
diff --git a/x32-asm.patch b/x32-asm.patch
deleted file mode 100644
index 34a859d..0000000
--- a/x32-asm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtwebkit-opensource-src-5.3.2+dfsg/Source/WTF/wtf/Atomics.h~ 2014-09-11 12:48:11.000000000 +0200
-+++ qtwebkit-opensource-src-5.3.2+dfsg/Source/WTF/wtf/Atomics.h 2015-02-13 22:32:03.647863539 +0100
-@@ -188,7 +188,7 @@
- #if CPU(X86_64)
- bool result;
- asm volatile(
-- "lock; cmpxchgq %3, %2\n\t"
-+ "lock; cmpxchg %3, %2\n\t"
- "sete %1"
- : "+a"(expected), "=q"(result), "+m"(*location)
- : "r"(newValue)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebkit.git/commitdiff/f5cff1549291b745f7b05fea2a41dc3f13429a1e
More information about the pld-cvs-commit
mailing list