[webkitgtk3/f20-gnome-3-12] Update to 2.4.1
Richard Hughes
rhughes at fedoraproject.org
Thu May 8 08:22:18 UTC 2014
commit aa05d7e0c97c2ff32a6832e5f81e5fa0e28e90a7
Author: Richard Hughes <richard at hughsie.com>
Date: Thu May 8 09:22:10 2014 +0100
Update to 2.4.1
.gitignore | 51 +-------------------------------------------
sources | 2 +-
webkitgtk-2.1.1-yarr.patch | 12 ----------
webkitgtk-aarch64.patch | 38 ++++++++++++++++++++++++++++++++
webkitgtk3.spec | 34 +++++++++++++++++++---------
5 files changed, 63 insertions(+), 74 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 25eb0bf..90f2733 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,50 +1 @@
-webkit-1.3.3.tar.gz
-/webkit-1.3.4.tar.gz
-/webkit-1.3.5.tar.gz
-/webkit-1.3.6.tar.gz
-/webkit-1.3.7.tar.gz
-/webkit-1.3.9.tar.gz
-/webkit-1.3.10.tar.gz
-/webkit-1.3.11.tar.gz
-/webkit-1.3.13.tar.gz
-/webkit-1.4.0.tar.gz
-/webkit-1.5.1.tar.gz
-/webkit-1.6.1.tar.gz
-/webkit-1.7.1.tar.gz
-/webkit-1.7.2.tar.xz
-/webkit-1.7.3.tar.xz
-/webkit-1.7.4.tar.xz
-/webkit-1.7.5.tar.xz
-/webkit-1.7.91.tar.xz
-/webkit-1.7.92.tar.xz
-/webkit-1.8.0.tar.xz
-/webkit-1.8.1.tar.xz
-/webkit-1.9.3.tar.xz
-/webkit-1.9.4.tar.xz
-/webkit-1.9.5.tar.xz
-/webkit-1.9.90.tar.xz
-/webkit-1.9.91.tar.xz
-/webkit-1.9.92.tar.xz
-/webkitgtk-1.10.0.tar.xz
-/webkitgtk-1.10.1.tar.xz
-/webkitgtk-1.11.2.tar.xz
-/webkitgtk-1.11.4.tar.xz
-/webkitgtk-1.11.5.tar.xz
-/webkitgtk-1.11.90.tar.xz
-/webkitgtk-1.11.91.tar.xz
-/webkitgtk-1.11.92.tar.xz
-/webkitgtk-2.0.0.tar.xz
-/webkitgtk-2.0.1.tar.xz
-/webkitgtk-2.0.2.tar.xz
-/webkitgtk-2.1.1.tar.xz
-/webkitgtk-2.1.2.tar.xz
-/webkitgtk-2.1.3.tar.xz
-/webkitgtk-2.1.4.tar.xz
-/webkitgtk-2.1.90.tar.xz
-/webkitgtk-2.1.90.1.tar.xz
-/webkitgtk-2.1.91.tar.xz
-/webkitgtk-2.1.92.tar.xz
-/webkitgtk-2.2.0.tar.xz
-/webkitgtk-2.2.1.tar.xz
-/webkitgtk-2.2.2.tar.xz
-/webkitgtk-2.2.3.tar.xz
+/webkitgtk-2.*.tar.xz
diff --git a/sources b/sources
index bdc6def..eda5de3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-613e81c460368ff4d6e02c7887206572 webkitgtk-2.2.3.tar.xz
+c57ebecff1ba7663b303e21a64840c48 webkitgtk-2.4.1.tar.xz
diff --git a/webkitgtk-aarch64.patch b/webkitgtk-aarch64.patch
new file mode 100644
index 0000000..fe54daa
--- /dev/null
+++ b/webkitgtk-aarch64.patch
@@ -0,0 +1,38 @@
+--- webkitgtk-2.3.5/Source/WTF/wtf/Platform.h.orig 2014-02-04 16:38:03.000000000 +0000
++++ webkitgtk-2.3.5/Source/WTF/wtf/Platform.h 2014-02-07 10:50:32.639441614 +0000
+@@ -317,6 +317,14 @@
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+
++/* CPU(AARCH64) - AArch64 */
++#if defined(__aarch64__)
++#define WTF_CPU_AARCH64 1
++#if defined(__AARCH64BE__)
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++#endif
++
+ /* ==== OS() - underlying operating system; only to be used for mandated low-level services like
+ virtual memory, not to choose a GUI toolkit ==== */
+
+@@ -641,7 +649,8 @@
+ || CPU(ALPHA) \
+ || CPU(ARM64) \
+ || CPU(S390X) \
+- || CPU(PPC64)
++ || CPU(PPC64) \
++ || CPU(AARCH64)
+ #define WTF_USE_JSVALUE64 1
+ #else
+ #define WTF_USE_JSVALUE32_64 1
+--- webkitgtk-2.3.5/Source/WTF/wtf/dtoa/utils.h.orig 2014-02-07 10:50:15.238174894 +0000
++++ webkitgtk-2.3.5/Source/WTF/wtf/dtoa/utils.h 2014-02-07 10:50:32.640441629 +0000
+@@ -49,7 +49,7 @@
+ defined(__ARMEL__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(AARCH64) || CPU(HPPA)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__)
+ #if defined(_WIN32)
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index c4acbc9..e3c8569 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,8 +6,8 @@
cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
Name: webkitgtk3
-Version: 2.2.3
-Release: 1%{?dist}
+Version: 2.4.1
+Release: 2%{?dist}
Summary: GTK+ Web content engine library
Group: Development/Libraries
@@ -17,11 +17,9 @@ URL: http://www.webkitgtk.org/
Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
Patch0: webkit-1.1.14-nspluginwrapper.patch
-# workarounds for non-JIT arches
-# https://bugs.webkit.org/show_bug.cgi?id=104270
-Patch1: webkitgtk-2.1.1-yarr.patch
# https://bugs.webkit.org/show_bug.cgi?id=103128
Patch4: webkit-2.1.90-double2intsPPC32.patch
+Patch10: webkitgtk-aarch64.patch
BuildRequires: at-spi2-core-devel
BuildRequires: bison
@@ -31,7 +29,7 @@ BuildRequires: enchant-devel
BuildRequires: flex
BuildRequires: fontconfig-devel >= 2.5
BuildRequires: freetype-devel
-BuildRequires: geoclue-devel
+BuildRequires: geoclue2-devel
BuildRequires: gettext
BuildRequires: gperf
BuildRequires: gstreamer1-devel
@@ -55,6 +53,7 @@ BuildRequires: gobject-introspection-devel >= 1.32.0
BuildRequires: perl-Switch
BuildRequires: ruby
BuildRequires: mesa-libGL-devel
+Requires: geoclue2
%description
WebKitGTK+ is the port of the portable web rendering engine WebKit to the
@@ -66,6 +65,7 @@ This package contains WebKitGTK+ for GTK+ 3.
Summary: The libwebkit2gtk library
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: geoclue2
%description -n libwebkit2gtk
The libwebkit2gtk package contains the libwebkit2gtk library
@@ -75,6 +75,7 @@ that is part of %{name}.
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: libwebkit2gtk%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries, build data, and header
@@ -92,28 +93,32 @@ This package contains developer documentation for %{name}.
%prep
%setup -qn "webkitgtk-%{version}"
%patch0 -p1 -b .nspluginwrapper
-%patch1 -p1 -b .yarr
%ifarch ppc s390
%patch4 -p1 -b .double2intsPPC32
%endif
+%patch10 -p1 -b .aarch64
%build
# Use linker flags to reduce memory consumption
%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-%ifarch s390 s390x %{arm}
+%ifarch s390 %{arm}
# Decrease debuginfo verbosity to reduce memory consumption even more
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif
%ifarch ppc
# Use linker flag -relax to get WebKit2 build under ppc(32) with JIT disabled
-%global optflags %{optflags} -Wl,-relax
+%global optflags %{optflags} -Wl,-relax -latomic
+%endif
+
+%ifarch s390 s390x ppc ppc64 aarch64
+%global optflags %{optflags} -DENABLE_YARR_JIT=0
%endif
%configure \
--with-gtk=3.0 \
-%ifarch s390 s390x ppc ppc64
+%ifarch s390 s390x ppc ppc64 aarch64
--disable-jit \
%else
--enable-jit \
@@ -186,7 +191,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
%{_libdir}/libwebkit2gtk-3.0.so.*
%{_libdir}/webkit2gtk-3.0/
%{_libdir}/girepository-1.0/WebKit2-3.0.typelib
+%{_libdir}/girepository-1.0/WebKit2WebExtension-3.0.typelib
%{_libexecdir}/%{name}/MiniBrowser
+%{_libexecdir}/WebKitNetworkProcess
%{_libexecdir}/WebKitPluginProcess
%{_libexecdir}/WebKitWebProcess
@@ -198,9 +205,11 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
%{_libdir}/libjavascriptcoregtk-3.0.so
%{_libdir}/pkgconfig/webkitgtk-3.0.pc
%{_libdir}/pkgconfig/webkit2gtk-3.0.pc
+%{_libdir}/pkgconfig/webkit2gtk-web-extension-3.0.pc
%{_libdir}/pkgconfig/javascriptcoregtk-3.0.pc
%{_datadir}/gir-1.0/WebKit-3.0.gir
%{_datadir}/gir-1.0/WebKit2-3.0.gir
+%{_datadir}/gir-1.0/WebKit2WebExtension-3.0.gir
%{_datadir}/gir-1.0/JavaScriptCore-3.0.gir
%files doc
@@ -208,9 +217,12 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
%dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/webkitgtk
%{_datadir}/gtk-doc/html/webkit2gtk
-
+%{_datadir}/gtk-doc/html/webkitdomgtk
%changelog
+* Thu May 08 2014 Richard Hughes <richard at hughsie.com> - 2.4.1-2
+- Update to 2.4.1
+
* Wed Dec 4 2013 Tomas Popela <tpopela at redhat.com> - 2.2.3-1
- Update to 2.2.3
More information about the scm-commits
mailing list