From 603c0dc09f44f1bf27c43fb6d50ce78dfd453dee Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 11 Apr 2016 08:52:14 +0200 Subject: [PATCH] Update to 2.4.11 --- sources | 2 +- webkitgtk-2.4.10-arm64-asm.patch | 108 -------------------------- webkitgtk-2.4.10-arm64-gcc.patch | 45 ----------- webkitgtk-2.4.10-qualified-name.patch | 12 --- webkitgtk.spec | 18 ++--- 5 files changed, 7 insertions(+), 178 deletions(-) delete mode 100644 webkitgtk-2.4.10-arm64-asm.patch delete mode 100644 webkitgtk-2.4.10-arm64-gcc.patch delete mode 100644 webkitgtk-2.4.10-qualified-name.patch diff --git a/sources b/sources index 65e6d9c..b11eb4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b3f18d4087dfc648e8060c14e16e202 webkitgtk-2.4.10.tar.xz +24a25ccc30a7914ae50922aedf24b7bc webkitgtk-2.4.11.tar.xz diff --git a/webkitgtk-2.4.10-arm64-asm.patch b/webkitgtk-2.4.10-arm64-asm.patch deleted file mode 100644 index c5d8695..0000000 --- a/webkitgtk-2.4.10-arm64-asm.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -up webkitgtk-2.4.10/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp.arm64-asm webkitgtk-2.4.10/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp ---- webkitgtk-2.4.10/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp.arm64-asm 2016-04-05 14:49:20.174877057 +0200 -+++ webkitgtk-2.4.10/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp 2016-04-05 14:49:48.680774345 +0200 -@@ -1040,61 +1040,61 @@ TransformationMatrix& TransformationMatr - const double* rightMatrix = &(mat.m_matrix[0][0]); - asm volatile ( - // First, load the leftMatrix completely in memory. The leftMatrix is in v16-v23. -- "mov x4, %[leftMatrix]\n\t" -- "ld1.2d {v16, v17, v18, v19}, [%[leftMatrix]], #64\n\t" -- "ld1.2d {v20, v21, v22, v23}, [%[leftMatrix]]\n\t" -+ "mov x4, %[leftMatrix]\n\t" -+ "ld1 {v16.2d, v17.2d, v18.2d, v19.2d}, [%[leftMatrix]], #64\n\t" -+ "ld1 {v20.2d, v21.2d, v22.2d, v23.2d}, [%[leftMatrix]]\n\t" - - // First row. -- "ld4r.2d {v24, v25, v26, v27}, [%[rightMatrix]], #32\n\t" -- "fmul.2d v28, v24, v16\n\t" -- "fmul.2d v29, v24, v17\n\t" -- "fmla.2d v28, v25, v18\n\t" -- "fmla.2d v29, v25, v19\n\t" -- "fmla.2d v28, v26, v20\n\t" -- "fmla.2d v29, v26, v21\n\t" -- "fmla.2d v28, v27, v22\n\t" -- "fmla.2d v29, v27, v23\n\t" -+ "ld4r {v24.2d, v25.2d, v26.2d, v27.2d}, [%[rightMatrix]], #32\n\t" -+ "fmul v28.2d, v24.2d, v16.2d\n\t" -+ "fmul v29.2d, v24.2d, v17.2d\n\t" -+ "fmla v28.2d, v25.2d, v18.2d\n\t" -+ "fmla v29.2d, v25.2d, v19.2d\n\t" -+ "fmla v28.2d, v26.2d, v20.2d\n\t" -+ "fmla v29.2d, v26.2d, v21.2d\n\t" -+ "fmla v28.2d, v27.2d, v22.2d\n\t" -+ "fmla v29.2d, v27.2d, v23.2d\n\t" - -- "ld4r.2d {v0, v1, v2, v3}, [%[rightMatrix]], #32\n\t" -- "st1.2d {v28, v29}, [x4], #32\n\t" -+ "ld4r {v0.2d, v1.2d, v2.2d, v3.2d}, [%[rightMatrix]], #32\n\t" -+ "st1 {v28.2d, v29.2d}, [x4], #32\n\t" - - // Second row. -- "fmul.2d v30, v0, v16\n\t" -- "fmul.2d v31, v0, v17\n\t" -- "fmla.2d v30, v1, v18\n\t" -- "fmla.2d v31, v1, v19\n\t" -- "fmla.2d v30, v2, v20\n\t" -- "fmla.2d v31, v2, v21\n\t" -- "fmla.2d v30, v3, v22\n\t" -- "fmla.2d v31, v3, v23\n\t" -+ "fmul v30.2d, v0.2d, v16.2d\n\t" -+ "fmul v31.2d, v0.2d, v17.2d\n\t" -+ "fmla v30.2d, v1.2d, v18.2d\n\t" -+ "fmla v31.2d, v1.2d, v19.2d\n\t" -+ "fmla v30.2d, v2.2d, v20.2d\n\t" -+ "fmla v31.2d, v2.2d, v21.2d\n\t" -+ "fmla v30.2d, v3.2d, v22.2d\n\t" -+ "fmla v31.2d, v3.2d, v23.2d\n\t" - -- "ld4r.2d {v24, v25, v26, v27}, [%[rightMatrix]], #32\n\t" -- "st1.2d {v30, v31}, [x4], #32\n\t" -+ "ld4r {v24.2d, v25.2d, v26.2d, v27.2d}, [%[rightMatrix]], #32\n\t" -+ "st1 {v30.2d, v31.2d}, [x4], #32\n\t" - - // Third row. -- "fmul.2d v28, v24, v16\n\t" -- "fmul.2d v29, v24, v17\n\t" -- "fmla.2d v28, v25, v18\n\t" -- "fmla.2d v29, v25, v19\n\t" -- "fmla.2d v28, v26, v20\n\t" -- "fmla.2d v29, v26, v21\n\t" -- "fmla.2d v28, v27, v22\n\t" -- "fmla.2d v29, v27, v23\n\t" -+ "fmul v28.2d, v24.2d, v16.2d\n\t" -+ "fmul v29.2d, v24.2d, v17.2d\n\t" -+ "fmla v28.2d, v25.2d, v18.2d\n\t" -+ "fmla v29.2d, v25.2d, v19.2d\n\t" -+ "fmla v28.2d, v26.2d, v20.2d\n\t" -+ "fmla v29.2d, v26.2d, v21.2d\n\t" -+ "fmla v28.2d, v27.2d, v22.2d\n\t" -+ "fmla v29.2d, v27.2d, v23.2d\n\t" - -- "ld4r.2d {v0, v1, v2, v3}, [%[rightMatrix]], #32\n\t" -- "st1.2d {v28, v29}, [x4], #32\n\t" -+ "ld4r {v0.2d, v1.2d, v2.2d, v3.2d}, [%[rightMatrix]], #32\n\t" -+ "st1 {v28.2d, v29.2d}, [x4], #32\n\t" - - // Fourth row. -- "fmul.2d v30, v0, v16\n\t" -- "fmul.2d v31, v0, v17\n\t" -- "fmla.2d v30, v1, v18\n\t" -- "fmla.2d v31, v1, v19\n\t" -- "fmla.2d v30, v2, v20\n\t" -- "fmla.2d v31, v2, v21\n\t" -- "fmla.2d v30, v3, v22\n\t" -- "fmla.2d v31, v3, v23\n\t" -+ "fmul v30.2d, v0.2d, v16.2d\n\t" -+ "fmul v31.2d, v0.2d, v17.2d\n\t" -+ "fmla v30.2d, v1.2d, v18.2d\n\t" -+ "fmla v31.2d, v1.2d, v19.2d\n\t" -+ "fmla v30.2d, v2.2d, v20.2d\n\t" -+ "fmla v31.2d, v2.2d, v21.2d\n\t" -+ "fmla v30.2d, v3.2d, v22.2d\n\t" -+ "fmla v31.2d, v3.2d, v23.2d\n\t" - -- "st1.2d {v30, v31}, [x4]\n\t" -+ "st1 {v30.2d, v31.2d}, [x4]\n\t" - - : [leftMatrix]"+r"(leftMatrix), [rightMatrix]"+r"(rightMatrix) - : diff --git a/webkitgtk-2.4.10-arm64-gcc.patch b/webkitgtk-2.4.10-arm64-gcc.patch deleted file mode 100644 index bad1e64..0000000 --- a/webkitgtk-2.4.10-arm64-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up webkitgtk-2.4.10/Source/WTF/wtf/Atomics.h.arm64_gcc webkitgtk-2.4.10/Source/WTF/wtf/Atomics.h ---- webkitgtk-2.4.10/Source/WTF/wtf/Atomics.h.arm64_gcc 2016-04-05 13:17:49.467473861 +0200 -+++ webkitgtk-2.4.10/Source/WTF/wtf/Atomics.h 2016-04-05 13:18:00.812429048 +0200 -@@ -113,6 +113,20 @@ inline bool weakCompareAndSwap(volatile - : "r"(expected), "r"(newValue) - : "memory"); - result = !result; -+#elif CPU(ARM64) && COMPILER(GCC) -+ unsigned tmp; -+ unsigned result; -+ asm volatile( -+ "mov %w1, #1\n\t" -+ "ldxr %w2, [%0]\n\t" -+ "cmp %w3, %w2\n\t" -+ "b.ne 0f\n\t" -+ "stxr %w1, %w4, [%0]\n\t" -+ "0:" -+ : "+r"(location), "=&r"(result), "=&r"(tmp) -+ : "r"(expected), "r"(newValue) -+ : "memory"); -+ result = !result; - #elif CPU(ARM64) - unsigned tmp; - unsigned result; -@@ -153,6 +167,20 @@ inline bool weakCompareAndSwap(void*vola - : "memory" - ); - return result; -+#elif CPU(ARM64) && COMPILER(GCC) -+ bool result; -+ void* tmp; -+ asm volatile( -+ "mov %w1, #1\n\t" -+ "ldxr %x2, [%0]\n\t" -+ "cmp %x3, %x2\n\t" -+ "b.ne 0f\n\t" -+ "stxr %w1, %x4, [%0]\n\t" -+ "0:" -+ : "+r"(location), "=&r"(result), "=&r"(tmp) -+ : "r"(expected), "r"(newValue) -+ : "memory"); -+ return !result; - #elif CPU(ARM64) - bool result; - void* tmp; diff --git a/webkitgtk-2.4.10-qualified-name.patch b/webkitgtk-2.4.10-qualified-name.patch deleted file mode 100644 index 6bd2dd3..0000000 --- a/webkitgtk-2.4.10-qualified-name.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up webkitgtk-2.4.10/Source/WebCore/dom/Element.cpp.qualified-name webkitgtk-2.4.10/Source/WebCore/dom/Element.cpp ---- webkitgtk-2.4.10/Source/WebCore/dom/Element.cpp.qualified-name 2016-04-05 09:58:17.928258276 +0200 -+++ webkitgtk-2.4.10/Source/WebCore/dom/Element.cpp 2016-04-05 09:58:23.240229758 +0200 -@@ -1056,7 +1056,7 @@ inline void Element::setAttributeInterna - const Attribute& attribute = attributeAt(index); - AtomicString oldValue = attribute.value(); - bool valueChanged = newValue != oldValue; -- const QualifiedName& attributeName = (!inSynchronizationOfLazyAttribute || valueChanged) ? attribute.name() : name; -+ QualifiedName attributeName = (!inSynchronizationOfLazyAttribute || valueChanged) ? attribute.name() : name; - - if (!inSynchronizationOfLazyAttribute) - willModifyAttribute(attributeName, oldValue, newValue); diff --git a/webkitgtk.spec b/webkitgtk.spec index c287957..ff29177 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -9,8 +9,8 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk -Version: 2.4.10 -Release: 3%{?dist} +Version: 2.4.11 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -23,12 +23,6 @@ Source0: http://www.webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch0: webkit-1.3.10-nspluginwrapper.patch # https://bugs.webkit.org/show_bug.cgi?id=142074 Patch1: webkitgtk-2.4.8-user-agent.patch -# http://trac.webkit.org/changeset/165044 -Patch2: webkitgtk-2.4.10-qualified-name.patch -# http://trac.webkit.org/changeset/166234 -Patch3: webkitgtk-2.4.10-arm64-gcc.patch -# http://trac.webkit.org/changeset/166233 -Patch4: webkitgtk-2.4.10-arm64-asm.patch BuildRequires: bison BuildRequires: chrpath @@ -93,9 +87,6 @@ This package contains developer documentation for %{name}. %setup -qn "webkitgtk-%{version}" %patch0 -p1 -b .nspluginwrapper %patch1 -p1 -b .user_agent -%patch2 -p1 -b .qualified-name -%patch3 -p1 -b .arm64-gcc.patch -%patch4 -p1 -b .arm64-asm.patch %build # Use linker flags to reduce memory consumption @@ -108,7 +99,7 @@ This package contains developer documentation for %{name}. %ifarch ppc # Use linker flag -relax to get WebKit build under ppc(32) with JIT disabled -%global optflags %{optflags} -Wl,-relax -latomic +%global optflags %{optflags} -Wl,-relax %endif %ifarch s390 s390x ppc %{power64} aarch64 @@ -211,6 +202,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/gtk-doc/html/webkitgtk %changelog +* Mon Apr 11 2016 Tomas Popela - 2.4.11-1 +- Update to 2.4.11 + * Tue Apr 05 2016 Tomas Popela - 2.4.10-3 - Fix the compilation on aarch64