From 32e1323d7e54816d0ec65f3d79d92c3ecb805a69 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 26 Apr 2011 15:00:28 -0400 Subject: [PATCH 001/211] 1.4.0 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8a0e318..64fe500 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ webkit-1.3.3.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 diff --git a/sources b/sources index fdf6b18..c94a8c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -984adaafac545a89c24351fd4dbd743c webkit-1.3.13.tar.gz +10c969db3b5484c71df1aa9a338377ff webkit-1.4.0.tar.gz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 0e5256f..06be7ab 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.3.13 +Version: 1.4.0 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -144,6 +144,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Tue Apr 26 2011 Matthias Clasen 1.4.0-1 +- Update to 1.4.0 + * Tue Mar 22 2011 Matthias Clasen 1.3.13-1 - Update to 1.3.13 From 89d2d05f240c4fea23aeb2bedbd18eea3b925c4d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 27 Apr 2011 18:55:53 -0400 Subject: [PATCH 002/211] sync with f15 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8a0e318..64fe500 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ webkit-1.3.3.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 diff --git a/sources b/sources index fdf6b18..c94a8c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -984adaafac545a89c24351fd4dbd743c webkit-1.3.13.tar.gz +10c969db3b5484c71df1aa9a338377ff webkit-1.4.0.tar.gz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 0e5256f..06be7ab 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.3.13 +Version: 1.4.0 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -144,6 +144,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Tue Apr 26 2011 Matthias Clasen 1.4.0-1 +- Update to 1.4.0 + * Tue Mar 22 2011 Matthias Clasen 1.3.13-1 - Update to 1.3.13 From 687ce39743078e25d3a0077f5808ce7521f69587 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 11 May 2011 18:15:37 -0400 Subject: [PATCH 003/211] build a doc subpackage --- webkitgtk3.spec | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 06be7ab..c3836bb 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -29,6 +29,7 @@ BuildRequires: gperf BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: gtk3-devel >= 2.99.0 +BuildRequires: gtk-doc BuildRequires: libsoup-devel >= 2.27.91 BuildRequires: libicu-devel BuildRequires: libjpeg-devel @@ -64,6 +65,14 @@ Requires: gtk3-devel The %{name}-devel package contains libraries, build data, and header files for developing applications that use %{name}. +%package doc +Summary: Documentation files for %{name} +Group: Development/Libraries +BuildArch: noarch + +%description doc +This package contains developer documentation for %{name}. + %prep %setup -qn "webkit-%{version}" %patch1 -p1 -b .no-execmem @@ -79,7 +88,8 @@ CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANA --with-gtk=3.0 \ --enable-jit \ --enable-geolocation \ - --enable-introspection + --enable-introspection \ + --enable-gtk-doc mkdir -p DerivedSources/webkit mkdir -p DerivedSources/WebCore @@ -87,6 +97,11 @@ mkdir -p DerivedSources/WebCore # no %%{_smp_mflags} because of http://bugs.webkit.org/show_bug.cgi?id=34846 make +# docs need to be built separately +pushd Source/WebKit/gtk/docs +make +popd + %install make install DESTDIR=%{buildroot} @@ -144,6 +159,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Wed May 11 2011 Cosimo Cecchi 1.4.0-2 +- Add a doc package for gtk-doc documentation + * Tue Apr 26 2011 Matthias Clasen 1.4.0-1 - Update to 1.4.0 From feceabd1de0e978435b788eb5eb6eae57cd8a1ca Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 14 Jun 2011 12:20:59 +0100 Subject: [PATCH 004/211] Rebuild against newer GTK+ --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index c3836bb..269750f 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -159,6 +159,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Tue Jun 14 2011 Bastien Nocera 1.4.0-3 +- Rebuild against newer GTK+ + * Wed May 11 2011 Cosimo Cecchi 1.4.0-2 - Add a doc package for gtk-doc documentation From f3e73e0d4174ab71c6418a5a8c29e628cbf52232 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Thu, 16 Jun 2011 16:29:20 +0200 Subject: [PATCH 005/211] Update to 1.5.1 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 64fe500..ffdaa0d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ webkit-1.3.3.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 diff --git a/sources b/sources index c94a8c4..c417891 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10c969db3b5484c71df1aa9a338377ff webkit-1.4.0.tar.gz +5ee28c7f7f036c1b4b26cf570e3ec071 webkit-1.5.1.tar.gz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 269750f..3fe431c 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.4.0 -Release: 3%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -28,11 +28,12 @@ BuildRequires: gettext BuildRequires: gperf BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel -BuildRequires: gtk3-devel >= 2.99.0 +BuildRequires: gtk3-devel >= 3.0 BuildRequires: gtk-doc -BuildRequires: libsoup-devel >= 2.27.91 +BuildRequires: libsoup-devel >= 2.33.6 BuildRequires: libicu-devel BuildRequires: libjpeg-devel +BuildRequires: libpng-devel BuildRequires: libxslt-devel BuildRequires: libXt-devel BuildRequires: pcre-devel @@ -159,6 +160,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Thu Jun 16 2011 Tomas Bzatek - 1.5.1-1 +- Update to 1.5.1 + * Tue Jun 14 2011 Bastien Nocera 1.4.0-3 - Rebuild against newer GTK+ From 838962e56e47fffdabf8f3bb4c78a5d9a5a08dd5 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Fri, 17 Jun 2011 11:59:42 +0200 Subject: [PATCH 006/211] Tweak filelist --- webkitgtk3.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 3fe431c..aa62ec0 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -142,19 +142,21 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %doc %{_docdir}/%{name}-%{version}/ %exclude %{_libdir}/*.la %{_libdir}/libwebkitgtk-3.0.so.* +%{_libdir}/libjavascriptcoregtk-3.0.so.* %{_libdir}/girepository-1.0/WebKit-3.0.typelib %{_libdir}/girepository-1.0/JSCore-3.0.typelib %{_libexecdir}/%{name}/ %{_datadir}/glib-2.0/schemas/org.webkitgtk-3.0.gschema.xml %{_datadir}/webkitgtk-3.0 -%{_datadir}/webkit-3.0 %files devel %defattr(-,root,root,-) %{_bindir}/jsc-3 %{_includedir}/webkit-3.0 %{_libdir}/libwebkitgtk-3.0.so +%{_libdir}/libjavascriptcoregtk-3.0.so %{_libdir}/pkgconfig/webkitgtk-3.0.pc +%{_libdir}/pkgconfig/javascriptcoregtk-3.0.pc %{_datadir}/gir-1.0/WebKit-3.0.gir %{_datadir}/gir-1.0/JSCore-3.0.gir From 6a970ed1c1a852fc6beed535cc781522684bbf17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 9 Sep 2011 16:02:29 +0100 Subject: [PATCH 007/211] rebuild for icu 4.8.1 --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index aa62ec0..3a6528f 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -162,6 +162,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Fri Sep 09 2011 Caolán McNamara - 1.5.1-2 +- rebuild for icu 4.8.1 + * Thu Jun 16 2011 Tomas Bzatek - 1.5.1-1 - Update to 1.5.1 From 4112df7ecc038f10db4e7590f9e5e137d66d8523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sun, 11 Sep 2011 15:09:55 +0100 Subject: [PATCH 008/211] add perl-Switch BuildRequires --- webkitgtk3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 3a6528f..0365965 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -39,6 +39,7 @@ BuildRequires: libXt-devel BuildRequires: pcre-devel BuildRequires: sqlite-devel BuildRequires: gobject-introspection-devel +BuildRequires: perl-Switch ## Conditional dependencies... %if %{with pango} From e1cff909b1f586c41652208abe4b980393f07bd8 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 28 Sep 2011 00:05:08 -0400 Subject: [PATCH 009/211] Update to 1.6.1 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ffdaa0d..2fbd464 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ webkit-1.3.3.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 diff --git a/sources b/sources index c417891..5a6b3bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ee28c7f7f036c1b4b26cf570e3ec071 webkit-1.5.1.tar.gz +c11743694b1b71dad287b2e7a9e73b05 webkit-1.6.1.tar.gz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 0365965..f1cfb6b 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.5.1 -Release: 2%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -163,6 +163,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Wed Sep 28 2011 Ray Strode 1.6.1-1 +- Update to 1.6.1 + * Fri Sep 09 2011 Caolán McNamara - 1.5.1-2 - rebuild for icu 4.8.1 From 7e153dac311746027123de08a126d647303d052c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 12 Oct 2011 19:55:41 +0200 Subject: [PATCH 010/211] fix build on s390(x) --- webkit-1.6.1-dtoa-s390.patch | 12 ++++++++++++ webkitgtk3.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 webkit-1.6.1-dtoa-s390.patch diff --git a/webkit-1.6.1-dtoa-s390.patch b/webkit-1.6.1-dtoa-s390.patch new file mode 100644 index 0000000..3cd7806 --- /dev/null +++ b/webkit-1.6.1-dtoa-s390.patch @@ -0,0 +1,12 @@ +diff -up webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h.dtoa webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h +--- webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h.dtoa 2011-10-12 15:28:33.000000000 +0200 ++++ webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h 2011-10-12 15:28:52.000000000 +0200 +@@ -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) ++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) + #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 f1cfb6b..93dd95c 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -18,6 +18,8 @@ Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch +# https://bugs.webkit.org/show_bug.cgi?id=69940 +Patch3: webkit-1.6.1-dtoa-s390.patch BuildRequires: bison BuildRequires: chrpath @@ -79,6 +81,7 @@ This package contains developer documentation for %{name}. %setup -qn "webkit-%{version}" %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper +%patch3 -p1 -b .dtoa-s390 %build %ifarch s390 @@ -163,6 +166,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Wed Oct 12 2011 Dan Horák 1.6.1-2 +- fix build on s390(x) + * Wed Sep 28 2011 Ray Strode 1.6.1-1 - Update to 1.6.1 From d996b7221128dfc2ba3b463afd1b9b9d0cbc7381 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Nov 2011 23:14:03 -0400 Subject: [PATCH 011/211] 1.7.1 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2fbd464..3f1e7ab 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ webkit-1.3.3.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 diff --git a/sources b/sources index 5a6b3bd..4d4cacf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c11743694b1b71dad287b2e7a9e73b05 webkit-1.6.1.tar.gz +cbf70a30dbf46997ac70ab0f548f198d webkit-1.7.1.tar.gz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 93dd95c..9c394c0 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.6.1 -Release: 2%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -166,6 +166,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Wed Nov 2 2011 Matthias Clasen 1.7.1-1 +- Update to 1.7.1 + * Wed Oct 12 2011 Dan Horák 1.6.1-2 - fix build on s390(x) From 2e28d4b03fba4dbd00e45a6c9128ef903c734af5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Nov 2011 23:24:01 -0400 Subject: [PATCH 012/211] drop upstreamed patch --- webkitgtk3.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 9c394c0..352ce01 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -18,8 +18,6 @@ Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch -# https://bugs.webkit.org/show_bug.cgi?id=69940 -Patch3: webkit-1.6.1-dtoa-s390.patch BuildRequires: bison BuildRequires: chrpath @@ -81,7 +79,6 @@ This package contains developer documentation for %{name}. %setup -qn "webkit-%{version}" %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper -%patch3 -p1 -b .dtoa-s390 %build %ifarch s390 From cf501a334b3ef48a68121659d90274640cce6b53 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 7 Nov 2011 13:10:22 -0500 Subject: [PATCH 013/211] rebuild --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 352ce01..b5c6188 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -163,6 +163,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Mon Nov 7 2011 Matthias Clasen 1.7.1-2 +- Rebuild against new libpng + * Wed Nov 2 2011 Matthias Clasen 1.7.1-1 - Update to 1.7.1 From d29214dee1f56f1925ad8a15d94c75c283afd388 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Thu, 24 Nov 2011 14:14:49 +0100 Subject: [PATCH 014/211] Update to 1.7.2 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3f1e7ab..186a050 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ webkit-1.3.3.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 diff --git a/sources b/sources index 4d4cacf..ca0610f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cbf70a30dbf46997ac70ab0f548f198d webkit-1.7.1.tar.gz +792ad116fa09efb738c3ef8e71ae9857 webkit-1.7.2.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index b5c6188..3fae883 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,15 +6,15 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.7.1 -Release: 2%{?dist} +Version: 1.7.2 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries License: LGPLv2+ and BSD URL: http://www.webkitgtk.org/ -Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz +Source0: http://www.webkitgtk.org/webkit-%{version}.tar.xz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch @@ -77,7 +77,8 @@ This package contains developer documentation for %{name}. %prep %setup -qn "webkit-%{version}" -%patch1 -p1 -b .no-execmem +# tbzatek - doesn't apply, is this fixed? +# %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper %build @@ -163,6 +164,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Thu Nov 24 2011 Tomas Bzatek - 1.7.2-1 +- Update to 1.7.2 + * Mon Nov 7 2011 Matthias Clasen 1.7.1-2 - Rebuild against new libpng From 0d75e053b41ab847654bfbd32c32795acfad05e9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 24 Nov 2011 12:20:37 -0500 Subject: [PATCH 015/211] try to fix the build --- webkitgtk3.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 3fae883..628aef4 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -101,9 +101,9 @@ mkdir -p DerivedSources/WebCore make # docs need to be built separately -pushd Source/WebKit/gtk/docs -make -popd +#pushd Source/WebKit/gtk/docs +#make +#popd %install make install DESTDIR=%{buildroot} From 1e52aa54ae953b7f7f35b16c6115b1e265f5530e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 24 Nov 2011 22:54:21 -0500 Subject: [PATCH 016/211] fix file list --- webkitgtk3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 628aef4..4f0eda1 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -154,7 +154,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %files devel %defattr(-,root,root,-) %{_bindir}/jsc-3 -%{_includedir}/webkit-3.0 +%{_includedir}/webkitgtk-3.0 %{_libdir}/libwebkitgtk-3.0.so %{_libdir}/libjavascriptcoregtk-3.0.so %{_libdir}/pkgconfig/webkitgtk-3.0.pc From a181d8450c7a22dba9215f22f413fa693566ae1b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 20 Dec 2011 22:23:03 -0500 Subject: [PATCH 017/211] 1.7.3 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 186a050..16822f9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ webkit-1.3.3.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 diff --git a/sources b/sources index ca0610f..b72184c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -792ad116fa09efb738c3ef8e71ae9857 webkit-1.7.2.tar.xz +229d95ee3c5dd0c7692bc85dee3d3844 webkit-1.7.3.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 4f0eda1..cd90b48 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.7.2 +Version: 1.7.3 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -164,6 +164,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Tue Dec 20 2011 Matthias Clasen - 1.7.3-1 +- Update to 1.7.3 + * Thu Nov 24 2011 Tomas Bzatek - 1.7.2-1 - Update to 1.7.2 From f6658dfc2232f17c6bada045e2da9d29cde41d5f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 20 Dec 2011 22:35:46 -0500 Subject: [PATCH 018/211] fix BRs --- webkitgtk3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index cd90b48..b144afc 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -40,6 +40,7 @@ BuildRequires: pcre-devel BuildRequires: sqlite-devel BuildRequires: gobject-introspection-devel BuildRequires: perl-Switch +BuildRequires: mesa-libGL-devel ## Conditional dependencies... %if %{with pango} From fc6bd6ca9dc9e6c720c53fb6becaac9ca7b764cc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 20 Dec 2011 23:04:27 -0500 Subject: [PATCH 019/211] bump libsoup dep --- webkitgtk3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index b144afc..8b1223f 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -30,7 +30,7 @@ BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: gtk3-devel >= 3.0 BuildRequires: gtk-doc -BuildRequires: libsoup-devel >= 2.33.6 +BuildRequires: libsoup-devel >= 2.37.2.1 BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel From f8a4d98eed3188c579c2d73a5b3a3568d26ad05c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 10 Jan 2012 15:32:17 -0600 Subject: [PATCH 020/211] compile -O1 on arm arches --- webkitgtk3.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 06be7ab..9f382b2 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.4.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: GTK+ Web content engine library Group: Development/Libraries @@ -74,6 +74,10 @@ files for developing applications that use %{name}. # drop -g flag to prevent memory exhaustion by linker %global optflags %(echo %{optflags} | sed 's/-g//') %endif +%ifarch %{arm} +#compile -O1 to avoid gcc ICE +%global optflags %(echo %{optflags} | sed 's/-O2/-O1/') +%endif CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ --with-gtk=3.0 \ @@ -144,6 +148,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Tue Jan 10 2012 Dennis Gilmore 1.4.0-1.1 +- compile -O1 on arm arches + * Tue Apr 26 2011 Matthias Clasen 1.4.0-1 - Update to 1.4.0 From 7ad69075867da86e804d960723544beb3ee1012f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:13:05 -0600 Subject: [PATCH 021/211] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 8b1223f..a27fbe6 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -165,6 +165,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 20 2011 Matthias Clasen - 1.7.3-1 - Update to 1.7.3 From 6c5b2d733a9022fc03b70248646ff27e1657c50a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 17 Jan 2012 19:35:32 -0500 Subject: [PATCH 022/211] 1.7.4 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 16822f9..76a48b6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ webkit-1.3.3.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 diff --git a/sources b/sources index b72184c..6e3b1ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -229d95ee3c5dd0c7692bc85dee3d3844 webkit-1.7.3.tar.xz +5e10c8c7827a57db69ec594473ee2c65 webkit-1.7.4.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index a27fbe6..10a5374 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.7.3 -Release: 2%{?dist} +Version: 1.7.4 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -165,6 +165,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Tue Jan 17 2012 Matthias Clasen - 1.7.4-1 +- Update to 1.7.4 + * Sat Jan 14 2012 Fedora Release Engineering - 1.7.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 67c45696b4d305986a8498cd164524e886a9e924 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 17 Jan 2012 20:17:03 -0500 Subject: [PATCH 023/211] fix build --- webkitgtk3.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 10a5374..333d872 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -97,9 +97,10 @@ CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANA mkdir -p DerivedSources/webkit mkdir -p DerivedSources/WebCore +mkdir -p DerivedSources/ANGLE # no %%{_smp_mflags} because of http://bugs.webkit.org/show_bug.cgi?id=34846 -make +make V=1 # docs need to be built separately #pushd Source/WebKit/gtk/docs From 720173952591ec819e21f2228500292b074c93d6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 18 Jan 2012 06:48:57 -0500 Subject: [PATCH 024/211] Try to fix the build --- webkit-unistd.patch | 12 ++++++++++++ webkitgtk3.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 webkit-unistd.patch diff --git a/webkit-unistd.patch b/webkit-unistd.patch new file mode 100644 index 0000000..6419578 --- /dev/null +++ b/webkit-unistd.patch @@ -0,0 +1,12 @@ +diff -up webkit-1.7.4/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp.unistd webkit-1.7.4/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp +--- webkit-1.7.4/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp.unistd 2012-01-18 06:47:26.757302897 -0500 ++++ webkit-1.7.4/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-01-18 06:47:40.896303817 -0500 +@@ -29,7 +29,7 @@ + #include + #include + +-#if defined(ANDROID) ++#if defined(ANDROID) || defined(__linux__) + #include + #endif + diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 333d872..6e1883b 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -18,6 +18,7 @@ Source0: http://www.webkitgtk.org/webkit-%{version}.tar.xz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch +Patch3: webkit-unistd.patch BuildRequires: bison BuildRequires: chrpath @@ -81,6 +82,7 @@ This package contains developer documentation for %{name}. # tbzatek - doesn't apply, is this fixed? # %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper +%patch3 -p1 -b .unistd %build %ifarch s390 From 67f8845cf5665d10627604116ebfd5f037cbcdea Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 7 Feb 2012 08:51:22 -0500 Subject: [PATCH 025/211] 1.7.5 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 76a48b6..e239b90 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ webkit-1.3.3.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 diff --git a/sources b/sources index 6e3b1ca..ffa9495 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e10c8c7827a57db69ec594473ee2c65 webkit-1.7.4.tar.xz +074c72e937669cada70faaf6802a86e1 webkit-1.7.5.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 6e1883b..28ff28a 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.7.4 +Version: 1.7.5 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -168,6 +168,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Tue Feb 7 2012 Matthias Clasen - 1.7.5-1 +- Update to 1.7.5 + * Tue Jan 17 2012 Matthias Clasen - 1.7.4-1 - Update to 1.7.4 From df014c5eb2b626e13448cff8c2c79a827ae43eb4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 7 Feb 2012 11:06:29 -0500 Subject: [PATCH 026/211] Fix file lists --- webkitgtk3.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 28ff28a..4bd2ab6 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -165,6 +165,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %{_libdir}/pkgconfig/javascriptcoregtk-3.0.pc %{_datadir}/gir-1.0/WebKit-3.0.gir %{_datadir}/gir-1.0/JSCore-3.0.gir +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html +%{_datadir}/gtk-doc/html/webkitgtk %changelog From 1fd0b438248ea681ff55cb22eaeaa7850787e0d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 20 Feb 2012 17:09:41 +0100 Subject: [PATCH 027/211] don't enable jit on s390(x) --- webkitgtk3.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 4bd2ab6..8fc4ff5 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.7.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -92,7 +92,9 @@ This package contains developer documentation for %{name}. CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ --with-gtk=3.0 \ +%ifnarch s390 s390x --enable-jit \ +%endif --enable-geolocation \ --enable-introspection \ --enable-gtk-doc @@ -171,6 +173,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Mon Feb 20 2012 Dan Horák - 1.7.5-2 +- don't enable jit on s390(x) + * Tue Feb 7 2012 Matthias Clasen - 1.7.5-1 - Update to 1.7.5 From ddcf836bb05c4ed447166185fe1c0cbe63bf385b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 28 Feb 2012 22:29:39 +0000 Subject: [PATCH 028/211] Add ARM to and optimise compile flags for low mem arches --- webkitgtk3.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 8fc4ff5..9116ff6 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.7.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -85,9 +85,9 @@ This package contains developer documentation for %{name}. %patch3 -p1 -b .unistd %build -%ifarch s390 -# drop -g flag to prevent memory exhaustion by linker -%global optflags %(echo %{optflags} | sed 's/-g//') +%ifarch s390 %{arm} +# Use linker flags to reduce memory consumption on low-mem architectures +%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads %endif CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ @@ -173,6 +173,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Tue Feb 28 2012 Peter Robinson - 1.7.5-3 +- Add ARM to and optimise compile flags for low mem arches + * Mon Feb 20 2012 Dan Horák - 1.7.5-2 - don't enable jit on s390(x) From 98b014b0eb3e5b82b5e2a8ab58dd81ad1c922c09 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 8 Mar 2012 06:20:07 -0500 Subject: [PATCH 029/211] 1.7.91 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e239b90..740cd70 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ webkit-1.3.3.tar.gz /webkit-1.7.3.tar.xz /webkit-1.7.4.tar.xz /webkit-1.7.5.tar.xz +/webkit-1.7.91.tar.xz diff --git a/sources b/sources index ffa9495..3be8233 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -074c72e937669cada70faaf6802a86e1 webkit-1.7.5.tar.xz +97889ccc90adbb3cff836126615b60ee webkit-1.7.91.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 9116ff6..70a0826 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.7.5 -Release: 3%{?dist} +Version: 1.7.91 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -173,6 +173,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Thu Mar 8 2012 Matthias Clasen - 1.7.91-1 +- Update to 1.7.91 + * Tue Feb 28 2012 Peter Robinson - 1.7.5-3 - Add ARM to and optimise compile flags for low mem arches From d4a14c9aa45f241a182470477b89fecfef8e2164 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 8 Mar 2012 06:42:21 -0500 Subject: [PATCH 030/211] try without this patch --- webkitgtk3.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 70a0826..2169cbc 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -18,7 +18,6 @@ Source0: http://www.webkitgtk.org/webkit-%{version}.tar.xz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch -Patch3: webkit-unistd.patch BuildRequires: bison BuildRequires: chrpath @@ -82,7 +81,6 @@ This package contains developer documentation for %{name}. # tbzatek - doesn't apply, is this fixed? # %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper -%patch3 -p1 -b .unistd %build %ifarch s390 %{arm} From a9db2462ac4fffc5475f8921443aa0a697cce65d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 8 Mar 2012 21:46:45 -0500 Subject: [PATCH 031/211] try again --- webkitgtk3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 2169cbc..83d8d46 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -100,6 +100,7 @@ CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANA mkdir -p DerivedSources/webkit mkdir -p DerivedSources/WebCore mkdir -p DerivedSources/ANGLE +mkdir -p DerivedSources/WebKit2 # no %%{_smp_mflags} because of http://bugs.webkit.org/show_bug.cgi?id=34846 make V=1 From 8542234c546cd6299b5b50f4143243661b4511e4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 8 Mar 2012 22:06:08 -0500 Subject: [PATCH 032/211] try again --- webkitgtk3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 83d8d46..ae5a1a0 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -101,6 +101,7 @@ mkdir -p DerivedSources/webkit mkdir -p DerivedSources/WebCore mkdir -p DerivedSources/ANGLE mkdir -p DerivedSources/WebKit2 +mkdir -p DerivedSources/InjectedBundle # no %%{_smp_mflags} because of http://bugs.webkit.org/show_bug.cgi?id=34846 make V=1 From e5fc24b45c5eddf3e3323f85ede276b1c8587ef0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 9 Mar 2012 00:24:58 -0500 Subject: [PATCH 033/211] try again --- webkitgtk3.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index ae5a1a0..5f94189 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -154,7 +154,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %{_libdir}/girepository-1.0/WebKit-3.0.typelib %{_libdir}/girepository-1.0/JSCore-3.0.typelib %{_libexecdir}/%{name}/ -%{_datadir}/glib-2.0/schemas/org.webkitgtk-3.0.gschema.xml %{_datadir}/webkitgtk-3.0 %files devel From a8353a76b6558e5030245e3f9e32ce2f48a0cb9a Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 15 Mar 2012 18:11:59 +0100 Subject: [PATCH 034/211] disable jit on ppc(64) --- webkitgtk3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 5f94189..215c044 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.7.91 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -90,7 +90,7 @@ This package contains developer documentation for %{name}. CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ --with-gtk=3.0 \ -%ifnarch s390 s390x +%ifnarch s390 s390x ppc ppc64 --enable-jit \ %endif --enable-geolocation \ @@ -172,6 +172,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Thu Mar 15 2012 Karsten Hopp 1.7.91-2 +- disable jit on ppc(64) + * Thu Mar 8 2012 Matthias Clasen - 1.7.91-1 - Update to 1.7.91 From 93e4f9389760350387aea10d6c57f60c8b57c277 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 21 Mar 2012 00:20:10 +0200 Subject: [PATCH 035/211] Drop unused patches --- build-fix.patch | 26 -------------------------- gtk-build.patch | 21 --------------------- webkit-1.3.9-update-policy.patch | 11 ----------- webkit-1.6.1-dtoa-s390.patch | 12 ------------ webkit-unistd.patch | 12 ------------ 5 files changed, 82 deletions(-) delete mode 100644 build-fix.patch delete mode 100644 gtk-build.patch delete mode 100644 webkit-1.3.9-update-policy.patch delete mode 100644 webkit-1.6.1-dtoa-s390.patch delete mode 100644 webkit-unistd.patch diff --git a/build-fix.patch b/build-fix.patch deleted file mode 100644 index 2ca8d1f..0000000 --- a/build-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.c.build-fix webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.c ---- webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.c.build-fix 2011-02-02 19:54:07.056203345 -0500 -+++ webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.c 2011-02-02 19:55:00.157539483 -0500 -@@ -46,7 +46,9 @@ - #include "xembed.h" - #include "gtk2xtbin.h" - #include -+#ifdef GTK_API_VERSION_2 - #include -+#endif - #include - #include - #include -diff -up webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.h.build-fix webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.h ---- webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.h.build-fix 2011-02-02 19:54:16.973079366 -0500 -+++ webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.h 2011-02-02 19:54:35.888842885 -0500 -@@ -41,6 +41,9 @@ - #define __GTK_XTBIN_H__ - - #include -+#ifndef GTK_API_VERSION_2 -+#include -+#endif - #include - #include - #include diff --git a/gtk-build.patch b/gtk-build.patch deleted file mode 100644 index 2919d9c..0000000 --- a/gtk-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up webkit-1.3.5/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp.gtk webkit-1.3.5/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp ---- webkit-1.3.5/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp.gtk 2010-11-03 17:43:58.154241995 -0400 -+++ webkit-1.3.5/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp 2010-11-03 17:44:12.875241996 -0400 -@@ -213,7 +213,7 @@ void FullscreenVideoController::hideHud( - GdkCursor* cursor = blankCursor(); - gdk_window_set_cursor(window, cursor); - -- gtk_widget_hide_all(m_hudWindow); -+ gtk_widget_hide(m_hudWindow); - - if (m_progressBarUpdateId) { - g_source_remove(m_progressBarUpdateId); -@@ -350,7 +350,7 @@ void FullscreenVideoController::exitFull - if (m_mediaElement->platformMedia().type == WebCore::PlatformMedia::GStreamerGWorldType) - m_mediaElement->platformMedia().media.gstreamerGWorld->exitFullscreen(); - -- gtk_widget_hide_all(m_window); -+ gtk_widget_hide(m_window); - - gtk_widget_destroy(m_hudWindow); - m_hudWindow = 0; diff --git a/webkit-1.3.9-update-policy.patch b/webkit-1.3.9-update-policy.patch deleted file mode 100644 index cad1eae..0000000 --- a/webkit-1.3.9-update-policy.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up webkit-1.3.9/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp.update-policy webkit-1.3.9/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp ---- webkit-1.3.9/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp.update-policy 2011-01-09 16:58:27.911902010 -0500 -+++ webkit-1.3.9/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp 2011-01-09 16:58:31.679902010 -0500 -@@ -545,7 +545,6 @@ void FullscreenVideoController::createHu - m_timeHScale = gtk_hscale_new(adjustment); - gtk_scale_set_draw_value(GTK_SCALE(m_timeHScale), FALSE); - gtk_range_set_show_fill_level(GTK_RANGE(m_timeHScale), TRUE); -- gtk_range_set_update_policy(GTK_RANGE(m_timeHScale), GTK_UPDATE_CONTINUOUS); - g_signal_connect(m_timeHScale, "button-press-event", G_CALLBACK(timeScaleButtonPressed), this); - g_signal_connect(m_timeHScale, "button-release-event", G_CALLBACK(timeScaleButtonReleased), this); - m_hscaleUpdateId = g_signal_connect(m_timeHScale, "value-changed", G_CALLBACK(timeScaleValueChanged), this); diff --git a/webkit-1.6.1-dtoa-s390.patch b/webkit-1.6.1-dtoa-s390.patch deleted file mode 100644 index 3cd7806..0000000 --- a/webkit-1.6.1-dtoa-s390.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h.dtoa webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h ---- webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h.dtoa 2011-10-12 15:28:33.000000000 +0200 -+++ webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h 2011-10-12 15:28:52.000000000 +0200 -@@ -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) -+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) - #if defined(_WIN32) diff --git a/webkit-unistd.patch b/webkit-unistd.patch deleted file mode 100644 index 6419578..0000000 --- a/webkit-unistd.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up webkit-1.7.4/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp.unistd webkit-1.7.4/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp ---- webkit-1.7.4/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp.unistd 2012-01-18 06:47:26.757302897 -0500 -+++ webkit-1.7.4/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-01-18 06:47:40.896303817 -0500 -@@ -29,7 +29,7 @@ - #include - #include - --#if defined(ANDROID) -+#if defined(ANDROID) || defined(__linux__) - #include - #endif - From d4dca7bf96a0ecfb80da9784d3887eee00593b50 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 21 Mar 2012 00:25:47 +0200 Subject: [PATCH 036/211] 1.7.92 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 740cd70..83dafc6 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ webkit-1.3.3.tar.gz /webkit-1.7.4.tar.xz /webkit-1.7.5.tar.xz /webkit-1.7.91.tar.xz +/webkit-1.7.92.tar.xz diff --git a/sources b/sources index 3be8233..03c98a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97889ccc90adbb3cff836126615b60ee webkit-1.7.91.tar.xz +520a421566584ea56552ee314de0b671 webkit-1.7.92.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 215c044..cb3c7e7 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.7.91 -Release: 2%{?dist} +Version: 1.7.92 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -93,7 +93,6 @@ CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANA %ifnarch s390 s390x ppc ppc64 --enable-jit \ %endif - --enable-geolocation \ --enable-introspection \ --enable-gtk-doc @@ -172,6 +171,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Wed Mar 21 2012 Kalev Lember - 1.7.92-1 +- Update to 1.7.92 +- Don't pass --enable-geolocation to configure; it's now enabled by default + * Thu Mar 15 2012 Karsten Hopp 1.7.91-2 - disable jit on ppc(64) From 1fb987bd2217782142a3c7d6132023c8b98caaa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Sun, 25 Mar 2012 10:48:37 +0200 Subject: [PATCH 037/211] add ppc to low mem arches - decrease debuginfo verbosity on s390 to save memory --- webkitgtk3.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index cb3c7e7..dc2d4f8 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.7.92 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -83,10 +83,14 @@ This package contains developer documentation for %{name}. %patch2 -p1 -b .nspluginwrapper %build -%ifarch s390 %{arm} +%ifarch s390 %{arm} ppc # Use linker flags to reduce memory consumption on low-mem architectures %global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads %endif +%ifarch s390 +# Decrease debuginfo verbosity to reduce memory consumption even more +%global optflags %(echo %{optflags} | sed 's/-g/-g1/') +%endif CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ --with-gtk=3.0 \ @@ -171,6 +175,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Sat Mar 24 2012 Dan Horák - 1.7.92-2 +- add ppc to low mem arches +- decrease debuginfo verbosity on s390 to save memory + * Wed Mar 21 2012 Kalev Lember - 1.7.92-1 - Update to 1.7.92 - Don't pass --enable-geolocation to configure; it's now enabled by default From 8e67deed7b84c7baee7c29c8ec7167a00239af24 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 28 Mar 2012 13:12:54 +0100 Subject: [PATCH 038/211] Update to 1.8.0. --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 83dafc6..4318045 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ webkit-1.3.3.tar.gz /webkit-1.7.5.tar.xz /webkit-1.7.91.tar.xz /webkit-1.7.92.tar.xz +/webkit-1.8.0.tar.xz diff --git a/sources b/sources index 03c98a3..d2a5b07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -520a421566584ea56552ee314de0b671 webkit-1.7.92.tar.xz +52b2feb0fae01e68432b547bd85e8d74 webkit-1.8.0.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index dc2d4f8..117cc1f 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.7.92 -Release: 2%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -175,6 +175,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Wed Mar 28 2012 Richard Hughes - 1.8.0-1 +- Update to 1.8.0. + * Sat Mar 24 2012 Dan Horák - 1.7.92-2 - add ppc to low mem arches - decrease debuginfo verbosity on s390 to save memory From edf4837461a030966fb7145af34099d6353a0c4b Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 28 Mar 2012 13:12:54 +0100 Subject: [PATCH 039/211] Update to 1.8.0. --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 83dafc6..4318045 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ webkit-1.3.3.tar.gz /webkit-1.7.5.tar.xz /webkit-1.7.91.tar.xz /webkit-1.7.92.tar.xz +/webkit-1.8.0.tar.xz diff --git a/sources b/sources index 03c98a3..d2a5b07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -520a421566584ea56552ee314de0b671 webkit-1.7.92.tar.xz +52b2feb0fae01e68432b547bd85e8d74 webkit-1.8.0.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index dc2d4f8..117cc1f 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.7.92 -Release: 2%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -175,6 +175,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Wed Mar 28 2012 Richard Hughes - 1.8.0-1 +- Update to 1.8.0. + * Sat Mar 24 2012 Dan Horák - 1.7.92-2 - add ppc to low mem arches - decrease debuginfo verbosity on s390 to save memory From 790481f57e3975cacae881dd2e2bfb985ced5fe8 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 9 Apr 2012 13:13:13 +0300 Subject: [PATCH 040/211] Finish splitting out a -doc subpackage (#808917) Most of the work was done in commit 687ce39 but missed a needed %files change. --- webkitgtk3.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 117cc1f..fa43a6f 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -68,12 +68,13 @@ Requires: gtk3-devel The %{name}-devel package contains libraries, build data, and header files for developing applications that use %{name}. -%package doc -Summary: Documentation files for %{name} -Group: Development/Libraries -BuildArch: noarch +%package doc +Summary: Documentation files for %{name} +Group: Documentation +BuildArch: noarch +Requires: %{name} = %{version}-%{release} -%description doc +%description doc This package contains developer documentation for %{name}. %prep @@ -97,8 +98,7 @@ CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANA %ifnarch s390 s390x ppc ppc64 --enable-jit \ %endif - --enable-introspection \ - --enable-gtk-doc + --enable-introspection mkdir -p DerivedSources/webkit mkdir -p DerivedSources/WebCore @@ -109,11 +109,6 @@ mkdir -p DerivedSources/InjectedBundle # no %%{_smp_mflags} because of http://bugs.webkit.org/show_bug.cgi?id=34846 make V=1 -# docs need to be built separately -#pushd Source/WebKit/gtk/docs -#make -#popd - %install make install DESTDIR=%{buildroot} @@ -169,12 +164,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %{_libdir}/pkgconfig/javascriptcoregtk-3.0.pc %{_datadir}/gir-1.0/WebKit-3.0.gir %{_datadir}/gir-1.0/JSCore-3.0.gir + +%files doc %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/webkitgtk %changelog +* Mon Apr 09 2012 Kalev Lember - 1.8.0-2 +- Finish splitting out a -doc subpackage (#808917) + * Wed Mar 28 2012 Richard Hughes - 1.8.0-1 - Update to 1.8.0. From f90557bfdee013d19b2b38e6fd6548010ee54ece Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 9 Apr 2012 13:13:13 +0300 Subject: [PATCH 041/211] Finish splitting out a -doc subpackage (#808917) Most of the work was done in commit 687ce39 but missed a needed %files change. --- webkitgtk3.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 117cc1f..fa43a6f 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -68,12 +68,13 @@ Requires: gtk3-devel The %{name}-devel package contains libraries, build data, and header files for developing applications that use %{name}. -%package doc -Summary: Documentation files for %{name} -Group: Development/Libraries -BuildArch: noarch +%package doc +Summary: Documentation files for %{name} +Group: Documentation +BuildArch: noarch +Requires: %{name} = %{version}-%{release} -%description doc +%description doc This package contains developer documentation for %{name}. %prep @@ -97,8 +98,7 @@ CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANA %ifnarch s390 s390x ppc ppc64 --enable-jit \ %endif - --enable-introspection \ - --enable-gtk-doc + --enable-introspection mkdir -p DerivedSources/webkit mkdir -p DerivedSources/WebCore @@ -109,11 +109,6 @@ mkdir -p DerivedSources/InjectedBundle # no %%{_smp_mflags} because of http://bugs.webkit.org/show_bug.cgi?id=34846 make V=1 -# docs need to be built separately -#pushd Source/WebKit/gtk/docs -#make -#popd - %install make install DESTDIR=%{buildroot} @@ -169,12 +164,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %{_libdir}/pkgconfig/javascriptcoregtk-3.0.pc %{_datadir}/gir-1.0/WebKit-3.0.gir %{_datadir}/gir-1.0/JSCore-3.0.gir + +%files doc %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/webkitgtk %changelog +* Mon Apr 09 2012 Kalev Lember - 1.8.0-2 +- Finish splitting out a -doc subpackage (#808917) + * Wed Mar 28 2012 Richard Hughes - 1.8.0-1 - Update to 1.8.0. From 37728c3c026b26471a6d9c81c236f7eed88b79fe Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 18 Apr 2012 11:17:58 +0100 Subject: [PATCH 042/211] add patches to fix non SSE2 device crashes, flickering when drawing some widgets --- webkit-r113389.diff | 30 ++++++++++++++++++++++++++++++ webkit-r114385.diff | 40 ++++++++++++++++++++++++++++++++++++++++ webkitgtk3.spec | 12 +++++++++++- 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 webkit-r113389.diff create mode 100644 webkit-r114385.diff diff --git a/webkit-r113389.diff b/webkit-r113389.diff new file mode 100644 index 0000000..ac7f728 --- /dev/null +++ b/webkit-r113389.diff @@ -0,0 +1,30 @@ +Index: /trunk/Source/JavaScriptCore/ChangeLog +=================================================================== +--- /trunk/Source/JavaScriptCore/ChangeLog (revision 113365) ++++ /trunk/Source/JavaScriptCore/ChangeLog (revision 113389) +@@ -1,2 +1,14 @@ ++2012-04-05 Oliver Hunt ++ ++ SIGILL in JavaScriptCore on a Geode processor ++ https://bugs.webkit.org/show_bug.cgi?id=82496 ++ ++ Reviewed by Gavin Barraclough. ++ ++ Don't attempt to use the DFG when SSE2 is not available. ++ ++ * dfg/DFGCapabilities.cpp: ++ (JSC::DFG::canCompileOpcodes): ++ + 2012-04-05 Oliver Hunt + +Index: /trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp +=================================================================== +--- /trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (revision 98179) ++++ /trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (revision 113389) +@@ -62,4 +62,6 @@ + bool canCompileOpcodes(CodeBlock* codeBlock) + { ++ if (!MacroAssembler::supportsFloatingPoint()) ++ return false; + return canHandleOpcodes(codeBlock); + } diff --git a/webkit-r114385.diff b/webkit-r114385.diff new file mode 100644 index 0000000..e85dafa --- /dev/null +++ b/webkit-r114385.diff @@ -0,0 +1,40 @@ +Index: /trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp +=================================================================== +--- /trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 113147) ++++ /trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 114385) +@@ -3623,5 +3623,4 @@ + + gtk_widget_set_can_focus(GTK_WIDGET(webView), TRUE); +- gtk_widget_set_double_buffered(GTK_WIDGET(webView), FALSE); + + priv->mainFrame = WEBKIT_WEB_FRAME(webkit_web_frame_new(webView)); +Index: /trunk/Source/WebKit/gtk/ChangeLog +=================================================================== +--- /trunk/Source/WebKit/gtk/ChangeLog (revision 113533) ++++ /trunk/Source/WebKit/gtk/ChangeLog (revision 114385) +@@ -1,2 +1,25 @@ ++2012-04-17 Carlos Garnacho ++ ++ [GTK] Enable back double buffering on WebKitWebView to fix flickering ++ https://bugs.webkit.org/show_bug.cgi?id=84149 ++ ++ Reviewed by Martin Robinson. ++ ++ Despite having WebKitWebView its own backing buffer, calling ++ gtk_widget_set_double_buffered(...,FALSE) may still pose side ++ effects, such as ensuring that all drawing operations are ++ flushed to the X server before rendering a non-double buffered ++ widget, which may translate into flickering of the parent ++ GdkWindow before the WebKitWebView itself is rendered. ++ ++ Enabling back double buffering solves this as all contents are ++ first composited together before getting to the front buffer, ++ but effectively acts as 3rd buffer. This is sort of unavoidable ++ unless GTK+ gains a "let me take ownership of the backing buffer ++ for this widget", which currently lacks. ++ ++ * webkit/webkitwebview.cpp: ++ (webkit_web_view_init): Remove call to gtk_widget_set_double_buffered(..., FALSE) ++ + 2012-04-06 Martin Robinson + diff --git a/webkitgtk3.spec b/webkitgtk3.spec index fa43a6f..b9a398d 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -18,6 +18,10 @@ Source0: http://www.webkitgtk.org/webkit-%{version}.tar.xz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch +# Fix crash when no SSE2: https://bugs.webkit.org/show_bug.cgi?id=82496 +Patch3: webkit-r113389.diff +# Fix flickering when rendering some widgets: https://bugs.webkit.org/show_bug.cgi?id=84149 +Patch4: webkit-r114385.diff BuildRequires: bison BuildRequires: chrpath @@ -82,6 +86,8 @@ This package contains developer documentation for %{name}. # tbzatek - doesn't apply, is this fixed? # %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper +%patch3 -p1 -b .fix-no-sse2 +%patch4 -p1 -b .fix-flicker %build %ifarch s390 %{arm} ppc @@ -172,6 +178,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Wed Apr 18 2012 Peter Robinson - 1.8.0-3 +- Add upstream patch to fix crash when SSE2 isn't present +- Add upstream patch to flickering when some widgets are drawn + * Mon Apr 09 2012 Kalev Lember - 1.8.0-2 - Finish splitting out a -doc subpackage (#808917) From 410abb9ad54934d3fc9dba5fafc0214a2abbfc27 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 18 Apr 2012 11:31:20 +0100 Subject: [PATCH 043/211] fix patches so they apply within the rpm --- webkit-r113389.diff | 25 +++---------------------- webkit-r114385.diff | 36 +++--------------------------------- 2 files changed, 6 insertions(+), 55 deletions(-) diff --git a/webkit-r113389.diff b/webkit-r113389.diff index ac7f728..9b95825 100644 --- a/webkit-r113389.diff +++ b/webkit-r113389.diff @@ -1,26 +1,7 @@ -Index: /trunk/Source/JavaScriptCore/ChangeLog +Index: trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp =================================================================== ---- /trunk/Source/JavaScriptCore/ChangeLog (revision 113365) -+++ /trunk/Source/JavaScriptCore/ChangeLog (revision 113389) -@@ -1,2 +1,14 @@ -+2012-04-05 Oliver Hunt -+ -+ SIGILL in JavaScriptCore on a Geode processor -+ https://bugs.webkit.org/show_bug.cgi?id=82496 -+ -+ Reviewed by Gavin Barraclough. -+ -+ Don't attempt to use the DFG when SSE2 is not available. -+ -+ * dfg/DFGCapabilities.cpp: -+ (JSC::DFG::canCompileOpcodes): -+ - 2012-04-05 Oliver Hunt - -Index: /trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp -=================================================================== ---- /trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (revision 98179) -+++ /trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (revision 113389) +--- trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (revision 98179) ++++ trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (revision 113389) @@ -62,4 +62,6 @@ bool canCompileOpcodes(CodeBlock* codeBlock) { diff --git a/webkit-r114385.diff b/webkit-r114385.diff index e85dafa..3b28d83 100644 --- a/webkit-r114385.diff +++ b/webkit-r114385.diff @@ -1,40 +1,10 @@ -Index: /trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp +Index: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp =================================================================== ---- /trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 113147) -+++ /trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 114385) +--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 113147) ++++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 114385) @@ -3623,5 +3623,4 @@ gtk_widget_set_can_focus(GTK_WIDGET(webView), TRUE); - gtk_widget_set_double_buffered(GTK_WIDGET(webView), FALSE); priv->mainFrame = WEBKIT_WEB_FRAME(webkit_web_frame_new(webView)); -Index: /trunk/Source/WebKit/gtk/ChangeLog -=================================================================== ---- /trunk/Source/WebKit/gtk/ChangeLog (revision 113533) -+++ /trunk/Source/WebKit/gtk/ChangeLog (revision 114385) -@@ -1,2 +1,25 @@ -+2012-04-17 Carlos Garnacho -+ -+ [GTK] Enable back double buffering on WebKitWebView to fix flickering -+ https://bugs.webkit.org/show_bug.cgi?id=84149 -+ -+ Reviewed by Martin Robinson. -+ -+ Despite having WebKitWebView its own backing buffer, calling -+ gtk_widget_set_double_buffered(...,FALSE) may still pose side -+ effects, such as ensuring that all drawing operations are -+ flushed to the X server before rendering a non-double buffered -+ widget, which may translate into flickering of the parent -+ GdkWindow before the WebKitWebView itself is rendered. -+ -+ Enabling back double buffering solves this as all contents are -+ first composited together before getting to the front buffer, -+ but effectively acts as 3rd buffer. This is sort of unavoidable -+ unless GTK+ gains a "let me take ownership of the backing buffer -+ for this widget", which currently lacks. -+ -+ * webkit/webkitwebview.cpp: -+ (webkit_web_view_init): Remove call to gtk_widget_set_double_buffered(..., FALSE) -+ - 2012-04-06 Martin Robinson - From 40a1aba4ae9ad8ca32f38fee438581c51b104556 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 24 Apr 2012 19:36:35 +0300 Subject: [PATCH 044/211] Update to 1.8.1 ... and dropped the backported patches; both are in 1.8.1. --- .gitignore | 1 + sources | 2 +- webkit-r113389.diff | 11 ----------- webkit-r114385.diff | 10 ---------- webkitgtk3.spec | 16 +++++++--------- 5 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 webkit-r113389.diff delete mode 100644 webkit-r114385.diff diff --git a/.gitignore b/.gitignore index 4318045..533770b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ webkit-1.3.3.tar.gz /webkit-1.7.91.tar.xz /webkit-1.7.92.tar.xz /webkit-1.8.0.tar.xz +/webkit-1.8.1.tar.xz diff --git a/sources b/sources index d2a5b07..9c7b052 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52b2feb0fae01e68432b547bd85e8d74 webkit-1.8.0.tar.xz +f2f01b1fdc7262a2eede81ebed0970b2 webkit-1.8.1.tar.xz diff --git a/webkit-r113389.diff b/webkit-r113389.diff deleted file mode 100644 index 9b95825..0000000 --- a/webkit-r113389.diff +++ /dev/null @@ -1,11 +0,0 @@ -Index: trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp -=================================================================== ---- trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (revision 98179) -+++ trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (revision 113389) -@@ -62,4 +62,6 @@ - bool canCompileOpcodes(CodeBlock* codeBlock) - { -+ if (!MacroAssembler::supportsFloatingPoint()) -+ return false; - return canHandleOpcodes(codeBlock); - } diff --git a/webkit-r114385.diff b/webkit-r114385.diff deleted file mode 100644 index 3b28d83..0000000 --- a/webkit-r114385.diff +++ /dev/null @@ -1,10 +0,0 @@ -Index: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp -=================================================================== ---- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 113147) -+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 114385) -@@ -3623,5 +3623,4 @@ - - gtk_widget_set_can_focus(GTK_WIDGET(webView), TRUE); -- gtk_widget_set_double_buffered(GTK_WIDGET(webView), FALSE); - - priv->mainFrame = WEBKIT_WEB_FRAME(webkit_web_frame_new(webView)); diff --git a/webkitgtk3.spec b/webkitgtk3.spec index b9a398d..82ce7fc 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,22 +6,18 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.8.0 -Release: 3%{?dist} +Version: 1.8.1 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries License: LGPLv2+ and BSD URL: http://www.webkitgtk.org/ -Source0: http://www.webkitgtk.org/webkit-%{version}.tar.xz +Source0: http://webkitgtk.org/releases/webkit-%{version}.tar.xz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch -# Fix crash when no SSE2: https://bugs.webkit.org/show_bug.cgi?id=82496 -Patch3: webkit-r113389.diff -# Fix flickering when rendering some widgets: https://bugs.webkit.org/show_bug.cgi?id=84149 -Patch4: webkit-r114385.diff BuildRequires: bison BuildRequires: chrpath @@ -86,8 +82,6 @@ This package contains developer documentation for %{name}. # tbzatek - doesn't apply, is this fixed? # %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper -%patch3 -p1 -b .fix-no-sse2 -%patch4 -p1 -b .fix-flicker %build %ifarch s390 %{arm} ppc @@ -178,6 +172,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Tue Apr 24 2012 Kalev Lember - 1.8.1-1 +- Update to 1.8.1 +- Dropped the backported patches + * Wed Apr 18 2012 Peter Robinson - 1.8.0-3 - Add upstream patch to fix crash when SSE2 isn't present - Add upstream patch to flickering when some widgets are drawn From 74802c2970915b367763701c7f22e28ce1fc0c99 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 24 Apr 2012 20:51:33 +0300 Subject: [PATCH 045/211] Remove lib64 rpaths with chrpath --- webkitgtk3.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 82ce7fc..f39f32b 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -112,10 +112,14 @@ make V=1 %install make install DESTDIR=%{buildroot} -chrpath --delete Programs/GtkLauncher install -d -m 755 %{buildroot}%{_libexecdir}/%{name} install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name} +# Remove lib64 rpaths +chrpath --delete %{buildroot}%{_bindir}/jsc-3 +chrpath --delete %{buildroot}%{_libdir}/libwebkitgtk-3.0.so +chrpath --delete %{buildroot}%{_libexecdir}/%{name}/GtkLauncher + # for some reason translations don't get installed in 1.3.7 %find_lang webkit-3.0 @@ -175,6 +179,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas * Tue Apr 24 2012 Kalev Lember - 1.8.1-1 - Update to 1.8.1 - Dropped the backported patches +- Remove lib64 rpaths with chrpath * Wed Apr 18 2012 Peter Robinson - 1.8.0-3 - Add upstream patch to fix crash when SSE2 isn't present From 530f799174b9b2ec208a44843eae642a2ac8e1c0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 24 Apr 2012 21:17:04 +0300 Subject: [PATCH 046/211] Update gsettings rpm scriptlets Most importantly, redirect glib-compile-schemas output to /dev/null to make sure end users don't see its developer-oriented warning messages with each yum update. Also move the 2nd glib-compile-schemas invocation to %posttrans as per http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#GSettings_Schema --- webkitgtk3.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index f39f32b..79f2d8d 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -140,11 +140,15 @@ chrpath --delete %{buildroot}%{_libexecdir}/%{name}/GtkLauncher %post /sbin/ldconfig -glib-compile-schemas %{_datadir}/glib-2.0/schemas %postun /sbin/ldconfig -glib-compile-schemas %{_datadir}/glib-2.0/schemas +if [ $1 -eq 0 ] ; then + glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : +fi + +%posttrans +glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %files -f webkit-3.0.lang @@ -180,6 +184,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas - Update to 1.8.1 - Dropped the backported patches - Remove lib64 rpaths with chrpath +- Update gsettings rpm scriptlets * Wed Apr 18 2012 Peter Robinson - 1.8.0-3 - Add upstream patch to fix crash when SSE2 isn't present From d8d691bee19888d78eee4195a89743cc9276ff25 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 15 May 2012 00:24:05 +0100 Subject: [PATCH 047/211] Explicitly disable JIT on ARM as it's not currently stable with JS heavy pages --- webkitgtk3.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 79f2d8d..eac5345 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -93,10 +93,15 @@ This package contains developer documentation for %{name}. %global optflags %(echo %{optflags} | sed 's/-g/-g1/') %endif +# explicitly disable JIT on ARM https://bugs.webkit.org/show_bug.cgi?id=85076 CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ --with-gtk=3.0 \ +%ifarch %{arm} + --disable-jit \ +%else %ifnarch s390 s390x ppc ppc64 --enable-jit \ +%endif %endif --enable-introspection @@ -180,6 +185,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Mon May 14 2012 Peter Robinson - 1.8.1-2 +- Explicitly disable JIT on ARM as it's not currently stable with JS heavy pages + * Tue Apr 24 2012 Kalev Lember - 1.8.1-1 - Update to 1.8.1 - Dropped the backported patches From 323ae5b6032425a434606eee341ded10678b269a Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 15 May 2012 18:07:31 +0200 Subject: [PATCH 048/211] disable JIT on PPC(64) as the autodetection enables it even if not supported --- webkitgtk3.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index eac5345..8295e4e 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -96,12 +96,10 @@ This package contains developer documentation for %{name}. # explicitly disable JIT on ARM https://bugs.webkit.org/show_bug.cgi?id=85076 CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ --with-gtk=3.0 \ -%ifarch %{arm} +%ifarch %{arm} s390 s390x ppc ppc64 --disable-jit \ %else -%ifnarch s390 s390x ppc ppc64 --enable-jit \ -%endif %endif --enable-introspection @@ -185,6 +183,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Tue May 15 2012 Karsten Hopp 1.8.1-3 +- disable JIT on PPC(64) as the autodetection enables it even if not supported + * Mon May 14 2012 Peter Robinson - 1.8.1-2 - Explicitly disable JIT on ARM as it's not currently stable with JS heavy pages From 43fa955c74ea7b8ae18850bdd5c801172ee4be03 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 7 Jun 2012 17:15:41 +0300 Subject: [PATCH 049/211] Update to 1.9.3 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 18 ++++++++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 533770b..7c834f5 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ webkit-1.3.3.tar.gz /webkit-1.7.92.tar.xz /webkit-1.8.0.tar.xz /webkit-1.8.1.tar.xz +/webkit-1.9.3.tar.xz diff --git a/sources b/sources index 9c7b052..e6d6e1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f2f01b1fdc7262a2eede81ebed0970b2 webkit-1.8.1.tar.xz +2d7df8b07af0b10789baec14d9015a2b webkit-1.9.3.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 8295e4e..9865c10 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.8.1 -Release: 3%{?dist} +Version: 1.9.3 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -121,7 +121,10 @@ install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name} # Remove lib64 rpaths chrpath --delete %{buildroot}%{_bindir}/jsc-3 chrpath --delete %{buildroot}%{_libdir}/libwebkitgtk-3.0.so +chrpath --delete %{buildroot}%{_libdir}/libwebkit2gtk-3.0.so chrpath --delete %{buildroot}%{_libexecdir}/%{name}/GtkLauncher +chrpath --delete %{buildroot}%{_libexecdir}/WebKitPluginProcess +chrpath --delete %{buildroot}%{_libexecdir}/WebKitWebProcess # for some reason translations don't get installed in 1.3.7 %find_lang webkit-3.0 @@ -155,23 +158,26 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %files -f webkit-3.0.lang -%defattr(-,root,root,-) %doc %{_docdir}/%{name}-%{version}/ %exclude %{_libdir}/*.la %{_libdir}/libwebkitgtk-3.0.so.* +%{_libdir}/libwebkit2gtk-3.0.so.* %{_libdir}/libjavascriptcoregtk-3.0.so.* %{_libdir}/girepository-1.0/WebKit-3.0.typelib %{_libdir}/girepository-1.0/JSCore-3.0.typelib %{_libexecdir}/%{name}/ +%{_libexecdir}/WebKitPluginProcess +%{_libexecdir}/WebKitWebProcess %{_datadir}/webkitgtk-3.0 %files devel -%defattr(-,root,root,-) %{_bindir}/jsc-3 %{_includedir}/webkitgtk-3.0 %{_libdir}/libwebkitgtk-3.0.so +%{_libdir}/libwebkit2gtk-3.0.so %{_libdir}/libjavascriptcoregtk-3.0.so %{_libdir}/pkgconfig/webkitgtk-3.0.pc +%{_libdir}/pkgconfig/webkit2gtk-3.0.pc %{_libdir}/pkgconfig/javascriptcoregtk-3.0.pc %{_datadir}/gir-1.0/WebKit-3.0.gir %{_datadir}/gir-1.0/JSCore-3.0.gir @@ -180,9 +186,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/webkitgtk +%{_datadir}/gtk-doc/html/webkit2gtk %changelog +* Thu Jun 07 2012 Kalev Lember - 1.9.3-1 +- Update to 1.9.3 + * Tue May 15 2012 Karsten Hopp 1.8.1-3 - disable JIT on PPC(64) as the autodetection enables it even if not supported From c8ea829bac926996d294671ab6365ecd69a8ed2c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 8 Jun 2012 01:28:04 +0300 Subject: [PATCH 050/211] BR gtk2-devel for webkit2gtk plugin process --- webkitgtk3.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 9865c10..9787b72 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -28,6 +28,7 @@ BuildRequires: gettext BuildRequires: gperf BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel +BuildRequires: gtk2-devel BuildRequires: gtk3-devel >= 3.0 BuildRequires: gtk-doc BuildRequires: libsoup-devel >= 2.37.2.1 @@ -192,6 +193,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog * Thu Jun 07 2012 Kalev Lember - 1.9.3-1 - Update to 1.9.3 +- Build webkit2gtk and BR gtk2-devel for its plugin process * Tue May 15 2012 Karsten Hopp 1.8.1-3 - disable JIT on PPC(64) as the autodetection enables it even if not supported From aae7eddd88283fee2985d00c7dd1a0deae6890cb Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 28 Jun 2012 21:04:19 +0300 Subject: [PATCH 051/211] Update to 1.9.4 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7c834f5..98d1a5f 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ webkit-1.3.3.tar.gz /webkit-1.8.0.tar.xz /webkit-1.8.1.tar.xz /webkit-1.9.3.tar.xz +/webkit-1.9.4.tar.xz diff --git a/sources b/sources index e6d6e1a..bc6c350 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d7df8b07af0b10789baec14d9015a2b webkit-1.9.3.tar.xz +bdea69ee17621b69939a9e5d32464805 webkit-1.9.4.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 9787b72..3428e6b 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.9.3 +Version: 1.9.4 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -191,6 +191,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Thu Jun 28 2012 Kalev Lember - 1.9.4-1 +- Update to 1.9.4 + * Thu Jun 07 2012 Kalev Lember - 1.9.3-1 - Update to 1.9.3 - Build webkit2gtk and BR gtk2-devel for its plugin process From e5fb7b9dce565ad729857e896034304c529d979d Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 28 Jun 2012 21:49:48 +0300 Subject: [PATCH 052/211] BR ruby to fix the build --- webkitgtk3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 3428e6b..80fdaee 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -41,6 +41,7 @@ BuildRequires: pcre-devel BuildRequires: sqlite-devel BuildRequires: gobject-introspection-devel BuildRequires: perl-Switch +BuildRequires: ruby BuildRequires: mesa-libGL-devel ## Conditional dependencies... From 7de80d481b6cd60c79bd4aa114fb41cb90e91723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 4 Jul 2012 10:51:42 +0200 Subject: [PATCH 053/211] apply workaround for s390x until #835957 is resolved (static library archive > 4 GB) --- webkitgtk3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 80fdaee..f017874 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -90,7 +90,7 @@ This package contains developer documentation for %{name}. # Use linker flags to reduce memory consumption on low-mem architectures %global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads %endif -%ifarch s390 +%ifarch s390 s390x # Decrease debuginfo verbosity to reduce memory consumption even more %global optflags %(echo %{optflags} | sed 's/-g/-g1/') %endif @@ -192,6 +192,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Jul 04 2012 Dan Horák - 1.9.4-2 +- apply workaround for s390x until #835957 is resolved (static library archive > 4 GB) + * Thu Jun 28 2012 Kalev Lember - 1.9.4-1 - Update to 1.9.4 From 64536d256c879e642ed1a26942ec8f9b6a737ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 11 Jul 2012 23:42:55 +0300 Subject: [PATCH 054/211] Fix %post scriptlet dependencies. --- webkitgtk3.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index f017874..621eca4 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.9.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -146,8 +146,7 @@ chrpath --delete %{buildroot}%{_libexecdir}/WebKitWebProcess %add_to_doc_files Source/JavaScriptCore/icu/LICENSE -%post -/sbin/ldconfig +%post -p /sbin/ldconfig %postun /sbin/ldconfig @@ -192,6 +191,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Jul 11 2012 Ville Skyttä - 1.9.4-3 +- Fix %%post scriptlet dependencies. + * Wed Jul 04 2012 Dan Horák - 1.9.4-2 - apply workaround for s390x until #835957 is resolved (static library archive > 4 GB) From 517f3609ca4858c607dc5d74bd72b7e46e5cef46 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 18 Jul 2012 20:23:53 +0300 Subject: [PATCH 055/211] Update to 1.9.5 - Build with -g1 to avoid running into 4 GB ar format limit --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 12 ++++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 98d1a5f..9173cf2 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ webkit-1.3.3.tar.gz /webkit-1.8.1.tar.xz /webkit-1.9.3.tar.xz /webkit-1.9.4.tar.xz +/webkit-1.9.5.tar.xz diff --git a/sources b/sources index bc6c350..85bee3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bdea69ee17621b69939a9e5d32464805 webkit-1.9.4.tar.xz +506e8d1e01e7aae92274a8bce8602a5a webkit-1.9.5.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 621eca4..67b5398 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.9.4 -Release: 3%{?dist} +Version: 1.9.5 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -95,6 +95,10 @@ This package contains developer documentation for %{name}. %global optflags %(echo %{optflags} | sed 's/-g/-g1/') %endif +# Build with -g1 on all platforms to avoid running into 4 GB ar format limit +# https://bugs.webkit.org/show_bug.cgi?id=91154 +%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') + # explicitly disable JIT on ARM https://bugs.webkit.org/show_bug.cgi?id=85076 CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ --with-gtk=3.0 \ @@ -191,6 +195,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Jul 18 2012 Kalev Lember - 1.9.5-1 +- Update to 1.9.5 +- Build with -g1 to avoid running into 4 GB ar format limit + * Wed Jul 11 2012 Ville Skyttä - 1.9.4-3 - Fix %%post scriptlet dependencies. From 2e8103d4e016b8ab0a5baea72f4d5081e0c3c8f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 14 Aug 2012 16:49:13 +0200 Subject: [PATCH 056/211] Add upstream patch to fix build without JIT (#843428) - Add upstream patch to fix build with latest gcc/bison --- webkit-1.9.5-compile-without-jit.patch | 59 +++ webkit-1.9.5-new-bison.patch | 487 +++++++++++++++++++++++++ webkitgtk3.spec | 10 +- 3 files changed, 555 insertions(+), 1 deletion(-) create mode 100644 webkit-1.9.5-compile-without-jit.patch create mode 100644 webkit-1.9.5-new-bison.patch diff --git a/webkit-1.9.5-compile-without-jit.patch b/webkit-1.9.5-compile-without-jit.patch new file mode 100644 index 0000000..57cce6e --- /dev/null +++ b/webkit-1.9.5-compile-without-jit.patch @@ -0,0 +1,59 @@ +From http://trac.webkit.org/changeset/123107 + +Fix compile with --disable-jit + +Index: /trunk/Source/JavaScriptCore/bytecode/Watchpoint.cpp +=================================================================== +--- /trunk/Source/JavaScriptCore/bytecode/Watchpoint.cpp (revision 123106) ++++ /trunk/Source/JavaScriptCore/bytecode/Watchpoint.cpp (revision 123107) +@@ -28,4 +28,5 @@ + + #include "LinkBuffer.h" ++#include + + namespace JSC { +Index: /trunk/Source/JavaScriptCore/heap/JITStubRoutineSet.h +=================================================================== +--- /trunk/Source/JavaScriptCore/heap/JITStubRoutineSet.h (revision 123106) ++++ /trunk/Source/JavaScriptCore/heap/JITStubRoutineSet.h (revision 123107) +@@ -29,6 +29,4 @@ + #include + +-#if ENABLE(JIT) +- + #include "JITStubRoutine.h" + #include +@@ -40,4 +38,6 @@ + class GCAwareJITStubRoutine; + class SlotVisitor; ++ ++#if ENABLE(JIT) + + class JITStubRoutineSet { +@@ -73,7 +73,24 @@ + }; + ++#else // !ENABLE(JIT) ++ ++class JITStubRoutineSet { ++ WTF_MAKE_NONCOPYABLE(JITStubRoutineSet); ++ WTF_MAKE_FAST_ALLOCATED; ++ ++public: ++ JITStubRoutineSet() { } ++ ~JITStubRoutineSet() { } ++ ++ void add(GCAwareJITStubRoutine*) { } ++ void clearMarks() { } ++ void mark(void*) { } ++ void deleteUnmarkedJettisonedStubRoutines() { } ++ void traceMarkedStubRoutines(SlotVisitor&) { } ++}; ++ ++#endif // !ENABLE(JIT) ++ + } // namespace JSC +- +-#endif // ENABLE(JIT) + + #endif // JITStubRoutineSet_h diff --git a/webkit-1.9.5-new-bison.patch b/webkit-1.9.5-new-bison.patch new file mode 100644 index 0000000..133e53f --- /dev/null +++ b/webkit-1.9.5-new-bison.patch @@ -0,0 +1,487 @@ +http://trac.webkit.org/changeset/124099 +fixes build. +https://bugs.webkit.org/show_bug.cgi?id=92264 + +Index: /trunk/Source/WebCore/css/CSSParser.cpp +=================================================================== +--- /trunk/Source/WebCore/css/CSSParser.cpp (revision 124098) ++++ /trunk/Source/WebCore/css/CSSParser.cpp (revision 124099) +@@ -115,5 +115,5 @@ + #endif + +-extern int cssyyparse(void* parser); ++extern int cssyyparse(WebCore::CSSParser*); + + using namespace std; +Index: /trunk/Source/WebCore/css/CSSGrammar.y +=================================================================== +--- /trunk/Source/WebCore/css/CSSGrammar.y (revision 124098) ++++ /trunk/Source/WebCore/css/CSSGrammar.y (revision 124099) +@@ -54,11 +54,10 @@ + #define YYDEBUG 0 + +-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x +-#define YYPARSE_PARAM parser +-#define YYLEX_PARAM parser +- + %} + + %pure_parser ++ ++%parse-param { CSSParser* parser } ++%lex-param { CSSParser* parser } + + %union { +@@ -90,5 +89,5 @@ + %{ + +-static inline int cssyyerror(const char*) ++static inline int cssyyerror(void*, const char*) + { + return 1; +Index: /trunk/Source/WebCore/xml/XPathParser.cpp +=================================================================== +--- /trunk/Source/WebCore/xml/XPathParser.cpp (revision 124098) ++++ /trunk/Source/WebCore/xml/XPathParser.cpp (revision 124099) +@@ -33,22 +33,19 @@ + #include "XPathException.h" + #include "XPathNSResolver.h" ++#include "XPathPath.h" + #include "XPathStep.h" + #include + #include + +-int xpathyyparse(void*); +- ++using namespace WebCore; + using namespace WTF; + using namespace Unicode; +- +-namespace WebCore { +-namespace XPath { +- +-class LocationPath; +- +-#include "XPathGrammar.h" ++using namespace XPath; ++ ++extern int xpathyyparse(WebCore::XPath::Parser*); ++#include "XPathGrammar.h" + + Parser* Parser::currentParser = 0; +- ++ + enum XMLCat { NameStart, NameCont, NotPartOfName }; + +@@ -631,4 +628,2 @@ + } + +-} +-} +Index: /trunk/Source/WebCore/xml/XPathGrammar.y +=================================================================== +--- /trunk/Source/WebCore/xml/XPathGrammar.y (revision 124098) ++++ /trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099) +@@ -35,4 +35,5 @@ + #include "XPathPath.h" + #include "XPathPredicate.h" ++#include "XPathStep.h" + #include "XPathVariableReference.h" + #include +@@ -45,6 +46,4 @@ + #define YYDEBUG 0 + #define YYMAXDEPTH 10000 +-#define YYPARSE_PARAM parserParameter +-#define PARSER static_cast(parserParameter) + + using namespace WebCore; +@@ -54,4 +53,5 @@ + + %pure_parser ++%parse-param { WebCore::XPath::Parser* parser } + + %union +@@ -72,5 +72,5 @@ + + static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } +-static void xpathyyerror(const char*) { } ++static void xpathyyerror(void*, const char*) { } + + %} +@@ -119,5 +119,5 @@ + OrExpr + { +- PARSER->m_topExpr = $1; ++ parser->m_topExpr = $1; + } + ; +@@ -139,5 +139,5 @@ + { + $$ = new LocationPath; +- PARSER->registerParseNode($$); ++ parser->registerParseNode($$); + } + | +@@ -151,5 +151,5 @@ + $$ = $2; + $$->insertFirstStep($1); +- PARSER->unregisterParseNode($1); ++ parser->unregisterParseNode($1); + } + ; +@@ -160,6 +160,6 @@ + $$ = new LocationPath; + $$->appendStep($1); +- PARSER->unregisterParseNode($1); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->registerParseNode($$); + } + | +@@ -167,5 +167,5 @@ + { + $$->appendStep($3); +- PARSER->unregisterParseNode($3); ++ parser->unregisterParseNode($3); + } + | +@@ -174,6 +174,6 @@ + $$->appendStep($2); + $$->appendStep($3); +- PARSER->unregisterParseNode($2); +- PARSER->unregisterParseNode($3); ++ parser->unregisterParseNode($2); ++ parser->unregisterParseNode($3); + } + ; +@@ -184,9 +184,9 @@ + if ($2) { + $$ = new Step(Step::ChildAxis, *$1, *$2); +- PARSER->deletePredicateVector($2); ++ parser->deletePredicateVector($2); + } else + $$ = new Step(Step::ChildAxis, *$1); +- PARSER->deleteNodeTest($1); +- PARSER->registerParseNode($$); ++ parser->deleteNodeTest($1); ++ parser->registerParseNode($$); + } + | +@@ -195,6 +195,6 @@ + String localName; + String namespaceURI; +- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { +- PARSER->m_gotNamespaceError = true; ++ if (!parser->expandQName(*$1, localName, namespaceURI)) { ++ parser->m_gotNamespaceError = true; + YYABORT; + } +@@ -202,9 +202,9 @@ + if ($2) { + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); +- PARSER->deletePredicateVector($2); ++ parser->deletePredicateVector($2); + } else + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | +@@ -213,9 +213,9 @@ + if ($3) { + $$ = new Step($1, *$2, *$3); +- PARSER->deletePredicateVector($3); ++ parser->deletePredicateVector($3); + } else + $$ = new Step($1, *$2); +- PARSER->deleteNodeTest($2); +- PARSER->registerParseNode($$); ++ parser->deleteNodeTest($2); ++ parser->registerParseNode($$); + } + | +@@ -224,6 +224,6 @@ + String localName; + String namespaceURI; +- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { +- PARSER->m_gotNamespaceError = true; ++ if (!parser->expandQName(*$2, localName, namespaceURI)) { ++ parser->m_gotNamespaceError = true; + YYABORT; + } +@@ -231,9 +231,9 @@ + if ($3) { + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); +- PARSER->deletePredicateVector($3); ++ parser->deletePredicateVector($3); + } else + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); +- PARSER->deleteString($2); +- PARSER->registerParseNode($$); ++ parser->deleteString($2); ++ parser->registerParseNode($$); + } + | +@@ -260,6 +260,6 @@ + $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); + +- PARSER->deleteString($1); +- PARSER->registerNodeTest($$); ++ parser->deleteString($1); ++ parser->registerNodeTest($$); + } + | +@@ -267,6 +267,6 @@ + { + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); +- PARSER->deleteString($1); +- PARSER->registerNodeTest($$); ++ parser->deleteString($1); ++ parser->registerNodeTest($$); + } + | +@@ -274,7 +274,7 @@ + { + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); +- PARSER->deleteString($1); +- PARSER->deleteString($3); +- PARSER->registerNodeTest($$); ++ parser->deleteString($1); ++ parser->deleteString($3); ++ parser->registerNodeTest($$); + } + ; +@@ -294,6 +294,6 @@ + $$ = new Vector; + $$->append(new Predicate($1)); +- PARSER->unregisterParseNode($1); +- PARSER->registerPredicateVector($$); ++ parser->unregisterParseNode($1); ++ parser->registerPredicateVector($$); + } + | +@@ -301,5 +301,5 @@ + { + $$->append(new Predicate($2)); +- PARSER->unregisterParseNode($2); ++ parser->unregisterParseNode($2); + } + ; +@@ -316,5 +316,5 @@ + { + $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); +- PARSER->registerParseNode($$); ++ parser->registerParseNode($$); + } + ; +@@ -324,5 +324,5 @@ + { + $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); +- PARSER->registerParseNode($$); ++ parser->registerParseNode($$); + } + | +@@ -330,5 +330,5 @@ + { + $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); +- PARSER->registerParseNode($$); ++ parser->registerParseNode($$); + } + ; +@@ -338,6 +338,6 @@ + { + $$ = new VariableReference(*$1); +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | +@@ -350,6 +350,6 @@ + { + $$ = new StringExpression(*$1); +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | +@@ -357,6 +357,6 @@ + { + $$ = new Number($1->toDouble()); +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | +@@ -370,6 +370,6 @@ + if (!$$) + YYABORT; +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | +@@ -379,7 +379,7 @@ + if (!$$) + YYABORT; +- PARSER->deleteString($1); +- PARSER->deleteExpressionVector($3); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->deleteExpressionVector($3); ++ parser->registerParseNode($$); + } + ; +@@ -390,6 +390,6 @@ + $$ = new Vector; + $$->append($1); +- PARSER->unregisterParseNode($1); +- PARSER->registerExpressionVector($$); ++ parser->unregisterParseNode($1); ++ parser->registerExpressionVector($$); + } + | +@@ -397,5 +397,5 @@ + { + $$->append($3); +- PARSER->unregisterParseNode($3); ++ parser->unregisterParseNode($3); + } + ; +@@ -413,7 +413,7 @@ + $$->addSubExpression($1); + $$->addSubExpression($3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -431,7 +431,7 @@ + $3->setAbsolute(true); + $$ = new Path(static_cast($1), $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + | +@@ -441,8 +441,8 @@ + $3->setAbsolute(true); + $$ = new Path(static_cast($1), $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($2); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($2); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -454,7 +454,7 @@ + { + $$ = new Filter($1, *$2); +- PARSER->unregisterParseNode($1); +- PARSER->deletePredicateVector($2); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->deletePredicateVector($2); ++ parser->registerParseNode($$); + } + ; +@@ -466,7 +466,7 @@ + { + $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -478,7 +478,7 @@ + { + $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -490,7 +490,7 @@ + { + $$ = new EqTestOp($2, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -502,7 +502,7 @@ + { + $$ = new EqTestOp($2, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -514,7 +514,7 @@ + { + $$ = new NumericOp(NumericOp::OP_Add, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + | +@@ -522,7 +522,7 @@ + { + $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -534,7 +534,7 @@ + { + $$ = new NumericOp($2, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -547,6 +547,6 @@ + $$ = new Negative; + $$->addSubExpression($2); +- PARSER->unregisterParseNode($2); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($2); ++ parser->registerParseNode($$); + } + ; diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 67b5398..e1a0f5f 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.9.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -18,6 +18,8 @@ Source0: http://webkitgtk.org/releases/webkit-%{version}.tar.xz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch +Patch3: webkit-1.9.5-compile-without-jit.patch +Patch4: webkit-1.9.5-new-bison.patch BuildRequires: bison BuildRequires: chrpath @@ -84,6 +86,8 @@ This package contains developer documentation for %{name}. # tbzatek - doesn't apply, is this fixed? # %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper +%patch3 -p2 -b .nojit +%patch4 -p2 -b .bison %build %ifarch s390 %{arm} ppc @@ -195,6 +199,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Thu Aug 9 2012 Daniel Drake - 1.9.5-2 +- Add upstream patch to fix build without JIT (#843428) +- Add upstream patch to fix build with latest gcc/bison + * Wed Jul 18 2012 Kalev Lember - 1.9.5-1 - Update to 1.9.5 - Build with -g1 to avoid running into 4 GB ar format limit From 01a3a9d10ade27599ad02a0772b956afe0f3060a Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Wed, 29 Aug 2012 12:49:26 -0600 Subject: [PATCH 057/211] v1.9.90 --- webkit-1.9.5-compile-without-jit.patch | 59 --- webkit-1.9.5-new-bison.patch | 487 ------------------------- webkitgtk3.spec | 11 +- 3 files changed, 5 insertions(+), 552 deletions(-) delete mode 100644 webkit-1.9.5-compile-without-jit.patch delete mode 100644 webkit-1.9.5-new-bison.patch diff --git a/webkit-1.9.5-compile-without-jit.patch b/webkit-1.9.5-compile-without-jit.patch deleted file mode 100644 index 57cce6e..0000000 --- a/webkit-1.9.5-compile-without-jit.patch +++ /dev/null @@ -1,59 +0,0 @@ -From http://trac.webkit.org/changeset/123107 - -Fix compile with --disable-jit - -Index: /trunk/Source/JavaScriptCore/bytecode/Watchpoint.cpp -=================================================================== ---- /trunk/Source/JavaScriptCore/bytecode/Watchpoint.cpp (revision 123106) -+++ /trunk/Source/JavaScriptCore/bytecode/Watchpoint.cpp (revision 123107) -@@ -28,4 +28,5 @@ - - #include "LinkBuffer.h" -+#include - - namespace JSC { -Index: /trunk/Source/JavaScriptCore/heap/JITStubRoutineSet.h -=================================================================== ---- /trunk/Source/JavaScriptCore/heap/JITStubRoutineSet.h (revision 123106) -+++ /trunk/Source/JavaScriptCore/heap/JITStubRoutineSet.h (revision 123107) -@@ -29,6 +29,4 @@ - #include - --#if ENABLE(JIT) -- - #include "JITStubRoutine.h" - #include -@@ -40,4 +38,6 @@ - class GCAwareJITStubRoutine; - class SlotVisitor; -+ -+#if ENABLE(JIT) - - class JITStubRoutineSet { -@@ -73,7 +73,24 @@ - }; - -+#else // !ENABLE(JIT) -+ -+class JITStubRoutineSet { -+ WTF_MAKE_NONCOPYABLE(JITStubRoutineSet); -+ WTF_MAKE_FAST_ALLOCATED; -+ -+public: -+ JITStubRoutineSet() { } -+ ~JITStubRoutineSet() { } -+ -+ void add(GCAwareJITStubRoutine*) { } -+ void clearMarks() { } -+ void mark(void*) { } -+ void deleteUnmarkedJettisonedStubRoutines() { } -+ void traceMarkedStubRoutines(SlotVisitor&) { } -+}; -+ -+#endif // !ENABLE(JIT) -+ - } // namespace JSC -- --#endif // ENABLE(JIT) - - #endif // JITStubRoutineSet_h diff --git a/webkit-1.9.5-new-bison.patch b/webkit-1.9.5-new-bison.patch deleted file mode 100644 index 133e53f..0000000 --- a/webkit-1.9.5-new-bison.patch +++ /dev/null @@ -1,487 +0,0 @@ -http://trac.webkit.org/changeset/124099 -fixes build. -https://bugs.webkit.org/show_bug.cgi?id=92264 - -Index: /trunk/Source/WebCore/css/CSSParser.cpp -=================================================================== ---- /trunk/Source/WebCore/css/CSSParser.cpp (revision 124098) -+++ /trunk/Source/WebCore/css/CSSParser.cpp (revision 124099) -@@ -115,5 +115,5 @@ - #endif - --extern int cssyyparse(void* parser); -+extern int cssyyparse(WebCore::CSSParser*); - - using namespace std; -Index: /trunk/Source/WebCore/css/CSSGrammar.y -=================================================================== ---- /trunk/Source/WebCore/css/CSSGrammar.y (revision 124098) -+++ /trunk/Source/WebCore/css/CSSGrammar.y (revision 124099) -@@ -54,11 +54,10 @@ - #define YYDEBUG 0 - --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x --#define YYPARSE_PARAM parser --#define YYLEX_PARAM parser -- - %} - - %pure_parser -+ -+%parse-param { CSSParser* parser } -+%lex-param { CSSParser* parser } - - %union { -@@ -90,5 +89,5 @@ - %{ - --static inline int cssyyerror(const char*) -+static inline int cssyyerror(void*, const char*) - { - return 1; -Index: /trunk/Source/WebCore/xml/XPathParser.cpp -=================================================================== ---- /trunk/Source/WebCore/xml/XPathParser.cpp (revision 124098) -+++ /trunk/Source/WebCore/xml/XPathParser.cpp (revision 124099) -@@ -33,22 +33,19 @@ - #include "XPathException.h" - #include "XPathNSResolver.h" -+#include "XPathPath.h" - #include "XPathStep.h" - #include - #include - --int xpathyyparse(void*); -- -+using namespace WebCore; - using namespace WTF; - using namespace Unicode; -- --namespace WebCore { --namespace XPath { -- --class LocationPath; -- --#include "XPathGrammar.h" -+using namespace XPath; -+ -+extern int xpathyyparse(WebCore::XPath::Parser*); -+#include "XPathGrammar.h" - - Parser* Parser::currentParser = 0; -- -+ - enum XMLCat { NameStart, NameCont, NotPartOfName }; - -@@ -631,4 +628,2 @@ - } - --} --} -Index: /trunk/Source/WebCore/xml/XPathGrammar.y -=================================================================== ---- /trunk/Source/WebCore/xml/XPathGrammar.y (revision 124098) -+++ /trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099) -@@ -35,4 +35,5 @@ - #include "XPathPath.h" - #include "XPathPredicate.h" -+#include "XPathStep.h" - #include "XPathVariableReference.h" - #include -@@ -45,6 +46,4 @@ - #define YYDEBUG 0 - #define YYMAXDEPTH 10000 --#define YYPARSE_PARAM parserParameter --#define PARSER static_cast(parserParameter) - - using namespace WebCore; -@@ -54,4 +53,5 @@ - - %pure_parser -+%parse-param { WebCore::XPath::Parser* parser } - - %union -@@ -72,5 +72,5 @@ - - static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } --static void xpathyyerror(const char*) { } -+static void xpathyyerror(void*, const char*) { } - - %} -@@ -119,5 +119,5 @@ - OrExpr - { -- PARSER->m_topExpr = $1; -+ parser->m_topExpr = $1; - } - ; -@@ -139,5 +139,5 @@ - { - $$ = new LocationPath; -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - | -@@ -151,5 +151,5 @@ - $$ = $2; - $$->insertFirstStep($1); -- PARSER->unregisterParseNode($1); -+ parser->unregisterParseNode($1); - } - ; -@@ -160,6 +160,6 @@ - $$ = new LocationPath; - $$->appendStep($1); -- PARSER->unregisterParseNode($1); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->registerParseNode($$); - } - | -@@ -167,5 +167,5 @@ - { - $$->appendStep($3); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($3); - } - | -@@ -174,6 +174,6 @@ - $$->appendStep($2); - $$->appendStep($3); -- PARSER->unregisterParseNode($2); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($2); -+ parser->unregisterParseNode($3); - } - ; -@@ -184,9 +184,9 @@ - if ($2) { - $$ = new Step(Step::ChildAxis, *$1, *$2); -- PARSER->deletePredicateVector($2); -+ parser->deletePredicateVector($2); - } else - $$ = new Step(Step::ChildAxis, *$1); -- PARSER->deleteNodeTest($1); -- PARSER->registerParseNode($$); -+ parser->deleteNodeTest($1); -+ parser->registerParseNode($$); - } - | -@@ -195,6 +195,6 @@ - String localName; - String namespaceURI; -- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { -- PARSER->m_gotNamespaceError = true; -+ if (!parser->expandQName(*$1, localName, namespaceURI)) { -+ parser->m_gotNamespaceError = true; - YYABORT; - } -@@ -202,9 +202,9 @@ - if ($2) { - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); -- PARSER->deletePredicateVector($2); -+ parser->deletePredicateVector($2); - } else - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | -@@ -213,9 +213,9 @@ - if ($3) { - $$ = new Step($1, *$2, *$3); -- PARSER->deletePredicateVector($3); -+ parser->deletePredicateVector($3); - } else - $$ = new Step($1, *$2); -- PARSER->deleteNodeTest($2); -- PARSER->registerParseNode($$); -+ parser->deleteNodeTest($2); -+ parser->registerParseNode($$); - } - | -@@ -224,6 +224,6 @@ - String localName; - String namespaceURI; -- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { -- PARSER->m_gotNamespaceError = true; -+ if (!parser->expandQName(*$2, localName, namespaceURI)) { -+ parser->m_gotNamespaceError = true; - YYABORT; - } -@@ -231,9 +231,9 @@ - if ($3) { - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); -- PARSER->deletePredicateVector($3); -+ parser->deletePredicateVector($3); - } else - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); -- PARSER->deleteString($2); -- PARSER->registerParseNode($$); -+ parser->deleteString($2); -+ parser->registerParseNode($$); - } - | -@@ -260,6 +260,6 @@ - $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); - -- PARSER->deleteString($1); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->registerNodeTest($$); - } - | -@@ -267,6 +267,6 @@ - { - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); -- PARSER->deleteString($1); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->registerNodeTest($$); - } - | -@@ -274,7 +274,7 @@ - { - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); -- PARSER->deleteString($1); -- PARSER->deleteString($3); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->deleteString($3); -+ parser->registerNodeTest($$); - } - ; -@@ -294,6 +294,6 @@ - $$ = new Vector; - $$->append(new Predicate($1)); -- PARSER->unregisterParseNode($1); -- PARSER->registerPredicateVector($$); -+ parser->unregisterParseNode($1); -+ parser->registerPredicateVector($$); - } - | -@@ -301,5 +301,5 @@ - { - $$->append(new Predicate($2)); -- PARSER->unregisterParseNode($2); -+ parser->unregisterParseNode($2); - } - ; -@@ -316,5 +316,5 @@ - { - $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - ; -@@ -324,5 +324,5 @@ - { - $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - | -@@ -330,5 +330,5 @@ - { - $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - ; -@@ -338,6 +338,6 @@ - { - $$ = new VariableReference(*$1); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | -@@ -350,6 +350,6 @@ - { - $$ = new StringExpression(*$1); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | -@@ -357,6 +357,6 @@ - { - $$ = new Number($1->toDouble()); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | -@@ -370,6 +370,6 @@ - if (!$$) - YYABORT; -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | -@@ -379,7 +379,7 @@ - if (!$$) - YYABORT; -- PARSER->deleteString($1); -- PARSER->deleteExpressionVector($3); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->deleteExpressionVector($3); -+ parser->registerParseNode($$); - } - ; -@@ -390,6 +390,6 @@ - $$ = new Vector; - $$->append($1); -- PARSER->unregisterParseNode($1); -- PARSER->registerExpressionVector($$); -+ parser->unregisterParseNode($1); -+ parser->registerExpressionVector($$); - } - | -@@ -397,5 +397,5 @@ - { - $$->append($3); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($3); - } - ; -@@ -413,7 +413,7 @@ - $$->addSubExpression($1); - $$->addSubExpression($3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; -@@ -431,7 +431,7 @@ - $3->setAbsolute(true); - $$ = new Path(static_cast($1), $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - | -@@ -441,8 +441,8 @@ - $3->setAbsolute(true); - $$ = new Path(static_cast($1), $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($2); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($2); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; -@@ -454,7 +454,7 @@ - { - $$ = new Filter($1, *$2); -- PARSER->unregisterParseNode($1); -- PARSER->deletePredicateVector($2); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->deletePredicateVector($2); -+ parser->registerParseNode($$); - } - ; -@@ -466,7 +466,7 @@ - { - $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; -@@ -478,7 +478,7 @@ - { - $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; -@@ -490,7 +490,7 @@ - { - $$ = new EqTestOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; -@@ -502,7 +502,7 @@ - { - $$ = new EqTestOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; -@@ -514,7 +514,7 @@ - { - $$ = new NumericOp(NumericOp::OP_Add, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - | -@@ -522,7 +522,7 @@ - { - $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; -@@ -534,7 +534,7 @@ - { - $$ = new NumericOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; -@@ -547,6 +547,6 @@ - $$ = new Negative; - $$->addSubExpression($2); -- PARSER->unregisterParseNode($2); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($2); -+ parser->registerParseNode($$); - } - ; diff --git a/webkitgtk3.spec b/webkitgtk3.spec index e1a0f5f..44c476a 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.9.5 -Release: 2%{?dist} +Version: 1.9.90 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -18,8 +18,6 @@ Source0: http://webkitgtk.org/releases/webkit-%{version}.tar.xz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch -Patch3: webkit-1.9.5-compile-without-jit.patch -Patch4: webkit-1.9.5-new-bison.patch BuildRequires: bison BuildRequires: chrpath @@ -86,8 +84,6 @@ This package contains developer documentation for %{name}. # tbzatek - doesn't apply, is this fixed? # %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper -%patch3 -p2 -b .nojit -%patch4 -p2 -b .bison %build %ifarch s390 %{arm} ppc @@ -199,6 +195,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Aug 29 2012 Daniel Drake - 1.9.90-1 +- Update to latest release (#850520) + * Thu Aug 9 2012 Daniel Drake - 1.9.5-2 - Add upstream patch to fix build without JIT (#843428) - Add upstream patch to fix build with latest gcc/bison From a059f430fea1fd6ac6814d3c1f4e3ccca59ff47b Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Wed, 29 Aug 2012 12:56:19 -0600 Subject: [PATCH 058/211] v1.9.90 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9173cf2..13463d2 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ webkit-1.3.3.tar.gz /webkit-1.9.3.tar.xz /webkit-1.9.4.tar.xz /webkit-1.9.5.tar.xz +/webkit-1.9.90.tar.xz diff --git a/sources b/sources index 85bee3d..389a3c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -506e8d1e01e7aae92274a8bce8602a5a webkit-1.9.5.tar.xz +01071dcff0f4754f4108dab9ef8aba21 webkit-1.9.90.tar.xz From 4866f4a89b66069f34bc7bd9117beda034728b26 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 2 Sep 2012 08:06:12 -0400 Subject: [PATCH 059/211] rebuild --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 44c476a..304c38d 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.9.90 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -195,6 +195,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Sun Sep 2 2012 Matthias Clasen - 1.9.90-2 +- Rebuild + * Wed Aug 29 2012 Daniel Drake - 1.9.90-1 - Update to latest release (#850520) From 6acad42715e1a7ecbe5059a1adad0b2f80aabd92 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 5 Sep 2012 19:09:47 +0200 Subject: [PATCH 060/211] Update to 1.9.91 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 13463d2..f0b1d59 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ webkit-1.3.3.tar.gz /webkit-1.9.4.tar.xz /webkit-1.9.5.tar.xz /webkit-1.9.90.tar.xz +/webkit-1.9.91.tar.xz diff --git a/sources b/sources index 389a3c5..07eeb87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01071dcff0f4754f4108dab9ef8aba21 webkit-1.9.90.tar.xz +83082e8956923fa5265bdfcf498af7c8 webkit-1.9.91.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 304c38d..4d583d8 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.9.90 -Release: 2%{?dist} +Version: 1.9.91 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -195,6 +195,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Sep 05 2012 Kalev Lember - 1.9.91-1 +- Update to 1.9.91 + * Sun Sep 2 2012 Matthias Clasen - 1.9.90-2 - Rebuild From 59d2b0627c0ab2f9e21c432a6a3e171d9c54122a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 19 Sep 2012 16:19:55 +0200 Subject: [PATCH 061/211] Update to 1.9.92 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f0b1d59..ed55837 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ webkit-1.3.3.tar.gz /webkit-1.9.5.tar.xz /webkit-1.9.90.tar.xz /webkit-1.9.91.tar.xz +/webkit-1.9.92.tar.xz diff --git a/sources b/sources index 07eeb87..60f85f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83082e8956923fa5265bdfcf498af7c8 webkit-1.9.91.tar.xz +7b5b34ec13679cbd0b00fe3406a30011 webkit-1.9.92.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 4d583d8..c59c1de 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.9.91 +Version: 1.9.92 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -195,6 +195,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Sep 19 2012 Kalev Lember - 1.9.92-1 +- Update to 1.9.92 + * Wed Sep 05 2012 Kalev Lember - 1.9.91-1 - Update to 1.9.91 From aa69009ce7f96d09ec5a013728069d9ace01705c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 19 Sep 2012 17:32:40 +0200 Subject: [PATCH 062/211] Build with gstreamer1 --- webkitgtk3.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index c59c1de..87831d7 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.9.92 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -26,8 +26,8 @@ BuildRequires: flex BuildRequires: geoclue-devel BuildRequires: gettext BuildRequires: gperf -BuildRequires: gstreamer-devel -BuildRequires: gstreamer-plugins-base-devel +BuildRequires: gstreamer1-devel +BuildRequires: gstreamer1-plugins-base-devel BuildRequires: gtk2-devel BuildRequires: gtk3-devel >= 3.0 BuildRequires: gtk-doc @@ -101,6 +101,7 @@ This package contains developer documentation for %{name}. # explicitly disable JIT on ARM https://bugs.webkit.org/show_bug.cgi?id=85076 CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ + --with-gstreamer=1.0 \ --with-gtk=3.0 \ %ifarch %{arm} s390 s390x ppc ppc64 --disable-jit \ @@ -195,6 +196,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Sep 19 2012 Kalev Lember - 1.9.92-2 +- Build with gstreamer1 + * Wed Sep 19 2012 Kalev Lember - 1.9.92-1 - Update to 1.9.92 From b709cfcc50771e25c65f035066ced69514d5d50c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 24 Sep 2012 14:22:12 +0200 Subject: [PATCH 063/211] Update to 1.10.0 ... and adjust for webkit -> webkitgtk upstream tarball rename. --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 16 ++++++++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ed55837..12d1e90 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ webkit-1.3.3.tar.gz /webkit-1.9.90.tar.xz /webkit-1.9.91.tar.xz /webkit-1.9.92.tar.xz +/webkitgtk-1.10.0.tar.xz diff --git a/sources b/sources index 60f85f3..fb7de36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b5b34ec13679cbd0b00fe3406a30011 webkit-1.9.92.tar.xz +6da450ec7793c0a7873d8c8c2cae4eb8 webkitgtk-1.10.0.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 87831d7..3ffa16d 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,15 +6,15 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.9.92 -Release: 2%{?dist} +Version: 1.10.0 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries License: LGPLv2+ and BSD URL: http://www.webkitgtk.org/ -Source0: http://webkitgtk.org/releases/webkit-%{version}.tar.xz +Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch @@ -80,7 +80,7 @@ Requires: %{name} = %{version}-%{release} This package contains developer documentation for %{name}. %prep -%setup -qn "webkit-%{version}" +%setup -qn "webkitgtk-%{version}" # tbzatek - doesn't apply, is this fixed? # %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper @@ -134,7 +134,7 @@ chrpath --delete %{buildroot}%{_libexecdir}/WebKitPluginProcess chrpath --delete %{buildroot}%{_libexecdir}/WebKitWebProcess # for some reason translations don't get installed in 1.3.7 -%find_lang webkit-3.0 +%find_lang webkitgtk-3.0 ## Finally, copy over and rename the various files for %%doc inclusion. %add_to_doc_files Source/WebKit/LICENSE @@ -163,7 +163,7 @@ fi glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : -%files -f webkit-3.0.lang +%files -f webkitgtk-3.0.lang %doc %{_docdir}/%{name}-%{version}/ %exclude %{_libdir}/*.la %{_libdir}/libwebkitgtk-3.0.so.* @@ -196,6 +196,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Mon Sep 24 2012 Kalev Lember - 1.10.0-1 +- Update to 1.10.0 +- Adjust for webkit -> webkitgtk upstream tarball rename + * Wed Sep 19 2012 Kalev Lember - 1.9.92-2 - Build with gstreamer1 From 7a5c155ce2cbda5055e2a7facd48c771f4353796 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Fri, 5 Oct 2012 15:17:00 -0600 Subject: [PATCH 064/211] Restore compatibility with AMD Geode processors --- webkit-1.10-geode-compat.patch | 30 ++++++++++++++++++++++++++++++ webkitgtk3.spec | 7 ++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 webkit-1.10-geode-compat.patch diff --git a/webkit-1.10-geode-compat.patch b/webkit-1.10-geode-compat.patch new file mode 100644 index 0000000..40bed7b --- /dev/null +++ b/webkit-1.10-geode-compat.patch @@ -0,0 +1,30 @@ +2012-10-01 Daniel Drake + + Another SIGILL in JavaScriptCore on a Geode processor + https://bugs.webkit.org/show_bug.cgi?id=96286 + + Reviewed by Filip Pizlo. + + Disable LLint for the GTK build where the build target does not + support SSE2 instructions. Restores support for non-SSE2 processors + such as the AMD Geode. + + * wtf/Platform.h: + +Index: /trunk/Source/WTF/wtf/Platform.h +=================================================================== +--- /trunk/Source/WTF/wtf/Platform.h (revision 130075) ++++ /trunk/Source/WTF/wtf/Platform.h (revision 130076) +@@ -900,4 +900,12 @@ + #endif + ++/* On the GTK+ port we take an extra precaution for LLINT support: ++ * We disable it on x86 builds if the build target doesn't support SSE2 ++ * instructions (LLINT requires SSE2 on this platform). */ ++#if !defined(ENABLE_LLINT) && PLATFORM(GTK) && CPU(X86) && COMPILER(GCC) \ ++ && !defined(__SSE2__) ++#define ENABLE_LLINT 0 ++#endif ++ + /* On some of the platforms where we have a JIT, we want to also have the + low-level interpreter. */ diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 3ffa16d..12dabba 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -18,6 +18,7 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch +Patch3: webkit-1.10-geode-compat.patch BuildRequires: bison BuildRequires: chrpath @@ -84,6 +85,7 @@ This package contains developer documentation for %{name}. # tbzatek - doesn't apply, is this fixed? # %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper +%patch3 -p2 -b .geode %build %ifarch s390 %{arm} ppc @@ -196,6 +198,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Fri Oct 5 2012 Daniel Drake - 1.10.0-2 +- Restore compatibility with AMD Geode processors + * Mon Sep 24 2012 Kalev Lember - 1.10.0-1 - Update to 1.10.0 - Adjust for webkit -> webkitgtk upstream tarball rename From ffac96c5577709b10e2c6aae7ddd4380c103ce21 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 17 Oct 2012 09:23:39 +0200 Subject: [PATCH 065/211] Update to 1.10.1 - Enable the parallel build - Drop the upstreamed Geode-compatibility patch --- .gitignore | 1 + sources | 2 +- webkit-1.10-geode-compat.patch | 30 ------------------------------ webkitgtk3.spec | 14 ++++++++------ 4 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 webkit-1.10-geode-compat.patch diff --git a/.gitignore b/.gitignore index 12d1e90..ffcc1e9 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ webkit-1.3.3.tar.gz /webkit-1.9.91.tar.xz /webkit-1.9.92.tar.xz /webkitgtk-1.10.0.tar.xz +/webkitgtk-1.10.1.tar.xz diff --git a/sources b/sources index fb7de36..968b8be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6da450ec7793c0a7873d8c8c2cae4eb8 webkitgtk-1.10.0.tar.xz +28c930cda012391453c476cdacfaca65 webkitgtk-1.10.1.tar.xz diff --git a/webkit-1.10-geode-compat.patch b/webkit-1.10-geode-compat.patch deleted file mode 100644 index 40bed7b..0000000 --- a/webkit-1.10-geode-compat.patch +++ /dev/null @@ -1,30 +0,0 @@ -2012-10-01 Daniel Drake - - Another SIGILL in JavaScriptCore on a Geode processor - https://bugs.webkit.org/show_bug.cgi?id=96286 - - Reviewed by Filip Pizlo. - - Disable LLint for the GTK build where the build target does not - support SSE2 instructions. Restores support for non-SSE2 processors - such as the AMD Geode. - - * wtf/Platform.h: - -Index: /trunk/Source/WTF/wtf/Platform.h -=================================================================== ---- /trunk/Source/WTF/wtf/Platform.h (revision 130075) -+++ /trunk/Source/WTF/wtf/Platform.h (revision 130076) -@@ -900,4 +900,12 @@ - #endif - -+/* On the GTK+ port we take an extra precaution for LLINT support: -+ * We disable it on x86 builds if the build target doesn't support SSE2 -+ * instructions (LLINT requires SSE2 on this platform). */ -+#if !defined(ENABLE_LLINT) && PLATFORM(GTK) && CPU(X86) && COMPILER(GCC) \ -+ && !defined(__SSE2__) -+#define ENABLE_LLINT 0 -+#endif -+ - /* On some of the platforms where we have a JIT, we want to also have the - low-level interpreter. */ diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 12dabba..2a9a3ba 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.10.0 -Release: 2%{?dist} +Version: 1.10.1 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -18,7 +18,6 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch -Patch3: webkit-1.10-geode-compat.patch BuildRequires: bison BuildRequires: chrpath @@ -85,7 +84,6 @@ This package contains developer documentation for %{name}. # tbzatek - doesn't apply, is this fixed? # %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper -%patch3 -p2 -b .geode %build %ifarch s390 %{arm} ppc @@ -118,8 +116,7 @@ mkdir -p DerivedSources/ANGLE mkdir -p DerivedSources/WebKit2 mkdir -p DerivedSources/InjectedBundle -# no %%{_smp_mflags} because of http://bugs.webkit.org/show_bug.cgi?id=34846 -make V=1 +make %{_smp_mflags} V=1 %install make install DESTDIR=%{buildroot} @@ -198,6 +195,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Oct 17 2012 Kalev Lember - 1.10.1-1 +- Update to 1.10.1 +- Enable the parallel build +- Drop the upstreamed Geode-compatibility patch + * Fri Oct 5 2012 Daniel Drake - 1.10.0-2 - Restore compatibility with AMD Geode processors From 7c2f3ef72001f656dfc56275f843214f67b324ea Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 24 Nov 2012 23:02:50 +0100 Subject: [PATCH 066/211] Update to 1.11.2 - Add a patch to explicitly link with librt --- .gitignore | 1 + sources | 2 +- webkitgtk-librt.patch | 32 ++++++++++++++++++++++++++++++++ webkitgtk3.spec | 16 +++++++++++++++- 4 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 webkitgtk-librt.patch diff --git a/.gitignore b/.gitignore index ffcc1e9..ca68e09 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ webkit-1.3.3.tar.gz /webkit-1.9.92.tar.xz /webkitgtk-1.10.0.tar.xz /webkitgtk-1.10.1.tar.xz +/webkitgtk-1.11.2.tar.xz diff --git a/sources b/sources index 968b8be..d83e5a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28c930cda012391453c476cdacfaca65 webkitgtk-1.10.1.tar.xz +5db53912982617b952bd2722d56ba74f webkitgtk-1.11.2.tar.xz diff --git a/webkitgtk-librt.patch b/webkitgtk-librt.patch new file mode 100644 index 0000000..22d1c1e --- /dev/null +++ b/webkitgtk-librt.patch @@ -0,0 +1,32 @@ +diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am +index 9a02bbd..c775990 100644 +--- a/Source/WebKit2/GNUmakefile.am ++++ b/Source/WebKit2/GNUmakefile.am +@@ -572,6 +572,7 @@ Programs_WebKitPluginProcess_LDADD += \ + $(PANGO_LIBS) \ + $(PNG_LIBS) \ + $(SHLWAPI_LIBS) \ ++ $(SHM_LIBS) \ + $(SQLITE3_LIBS) \ + $(UNICODE_LIBS) \ + $(XRENDER_LIBS) \ +diff --git a/configure.ac b/configure.ac +index 4e1f0e8..1fa99f0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1118,6 +1118,15 @@ if test "$enable_webkit2" = "yes"; then + if test "$have_gtk_unix_printing" = "yes"; then + AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available]) + fi ++ ++ # On some Linux/Unix platforms, shm_* may only be available if linking ++ # against librt ++ if test "$os_win32" = "no"; then ++ save_LIBS="$LIBS" ++ AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"]) ++ AC_SUBST(SHM_LIBS) ++ LIBS="$save_LIBS" ++ fi + fi + + # Plugin Process diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 2a9a3ba..76d7b1b 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.10.1 +Version: 1.11.2 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -18,6 +18,9 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch +# Explicitly link with -lrt +# https://bugs.webkit.org/show_bug.cgi?id=103194 +Patch3: webkitgtk-librt.patch BuildRequires: bison BuildRequires: chrpath @@ -35,6 +38,7 @@ BuildRequires: libsoup-devel >= 2.37.2.1 BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: libsecret-devel BuildRequires: libxslt-devel BuildRequires: libXt-devel BuildRequires: pcre-devel @@ -84,6 +88,10 @@ This package contains developer documentation for %{name}. # tbzatek - doesn't apply, is this fixed? # %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper +%patch3 -p1 -b .librt + +# For patch3 +autoreconf --verbose --install -I Source/autotools %build %ifarch s390 %{arm} ppc @@ -169,6 +177,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libdir}/libwebkit2gtk-3.0.so.* %{_libdir}/libjavascriptcoregtk-3.0.so.* %{_libdir}/girepository-1.0/WebKit-3.0.typelib +%{_libdir}/girepository-1.0/WebKit2-3.0.typelib %{_libdir}/girepository-1.0/JSCore-3.0.typelib %{_libexecdir}/%{name}/ %{_libexecdir}/WebKitPluginProcess @@ -185,6 +194,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libdir}/pkgconfig/webkit2gtk-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/JSCore-3.0.gir %files doc @@ -195,6 +205,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Sat Nov 24 2012 Kalev Lember - 1.11.2-1 +- Update to 1.11.2 +- Add a patch to explicitly link with librt + * Wed Oct 17 2012 Kalev Lember - 1.10.1-1 - Update to 1.10.1 - Enable the parallel build From afdc706613a7d0a7013b866d5034943db798552d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 18 Dec 2012 17:22:19 +0100 Subject: [PATCH 067/211] fix build for non-JIT arches --- webkit-1.11.2-includes.patch | 11 +++++++++++ webkit-1.11.2-yarr.patch | 12 ++++++++++++ webkitgtk3.spec | 12 +++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 webkit-1.11.2-includes.patch create mode 100644 webkit-1.11.2-yarr.patch diff --git a/webkit-1.11.2-includes.patch b/webkit-1.11.2-includes.patch new file mode 100644 index 0000000..ccc11a1 --- /dev/null +++ b/webkit-1.11.2-includes.patch @@ -0,0 +1,11 @@ +diff -up webkitgtk-1.11.2/Source/JavaScriptCore/runtime/ArrayConstructor.h.includes webkitgtk-1.11.2/Source/JavaScriptCore/runtime/ArrayConstructor.h +--- webkitgtk-1.11.2/Source/JavaScriptCore/runtime/ArrayConstructor.h.includes 2012-12-16 23:12:06.000000000 +0100 ++++ webkitgtk-1.11.2/Source/JavaScriptCore/runtime/ArrayConstructor.h 2012-12-16 23:12:21.000000000 +0100 +@@ -21,6 +21,7 @@ + #ifndef ArrayConstructor_h + #define ArrayConstructor_h + ++#include "ArrayAllocationProfile.h" + #include "InternalFunction.h" + + namespace JSC { diff --git a/webkit-1.11.2-yarr.patch b/webkit-1.11.2-yarr.patch new file mode 100644 index 0000000..4653594 --- /dev/null +++ b/webkit-1.11.2-yarr.patch @@ -0,0 +1,12 @@ +diff -up webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig webkitgtk-1.11.2/Source/WTF/wtf/Platform.h +--- webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig 2012-12-16 21:27:29.000000000 +0100 ++++ webkitgtk-1.11.2/Source/WTF/wtf/Platform.h 2012-12-16 23:16:19.000000000 +0100 +@@ -1001,7 +1001,7 @@ + #define ENABLE_REGEXP_TRACING 0 + + /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ +-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM) ++#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && !PLATFORM(CHROMIUM) + #define ENABLE_YARR_JIT 1 + + /* Setting this flag compares JIT results with interpreter results. */ diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 76d7b1b..760665c 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -21,6 +21,11 @@ Patch2: webkit-1.1.14-nspluginwrapper.patch # Explicitly link with -lrt # https://bugs.webkit.org/show_bug.cgi?id=103194 Patch3: webkitgtk-librt.patch +# workarounds for non-JIT arches +# https://bugs.webkit.org/show_bug.cgi?id=104270 +Patch4: webkit-1.11.2-yarr.patch +# https://bugs.webkit.org/show_bug.cgi?id=105295 +Patch5: webkit-1.11.2-includes.patch BuildRequires: bison BuildRequires: chrpath @@ -89,6 +94,8 @@ This package contains developer documentation for %{name}. # %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper %patch3 -p1 -b .librt +%patch4 -p1 -b .yarr +%patch5 -p1 -b .includes # For patch3 autoreconf --verbose --install -I Source/autotools @@ -205,6 +212,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Tue Dec 18 2012 Dan Horák - 1.11.2-2 +- fix build for non-JIT arches + * Sat Nov 24 2012 Kalev Lember - 1.11.2-1 - Update to 1.11.2 - Add a patch to explicitly link with librt From 34229148bca349bc22b0a37f5a90d61fe1cbda9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 18 Dec 2012 22:49:08 +0100 Subject: [PATCH 068/211] fix 32-bit non-JIT arches --- webkit-1.11.2-Double2Ints.patch | 22 ++++++++++++++++++++++ webkitgtk3.spec | 8 +++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 webkit-1.11.2-Double2Ints.patch diff --git a/webkit-1.11.2-Double2Ints.patch b/webkit-1.11.2-Double2Ints.patch new file mode 100644 index 0000000..c602985 --- /dev/null +++ b/webkit-1.11.2-Double2Ints.patch @@ -0,0 +1,22 @@ +Index: Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +=================================================================== +--- webkitgtk-1.11.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (Revision 137796) ++++ webkitgtk-1.11.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (Arbeitskopie) +@@ -116,6 +116,17 @@ + u.ival64 = (static_cast(hi) << 32) | lo; + return u.dval; + } ++ ++static void Double2Ints(double input, intptr_t lo, intptr_t hi) ++{ ++ union { ++ double dval; ++ int64_t ival64; ++ } u; ++ u.dval = input; ++ *(reinterpret_cast(hi)) = static_cast(u.ival64 >> 32); ++ *(reinterpret_cast(lo)) = static_cast(u.ival64); ++} + #endif // USE(JSVALUE32_64) + + } // namespace LLint diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 760665c..8fc3169 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.11.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -26,6 +26,8 @@ Patch3: webkitgtk-librt.patch Patch4: webkit-1.11.2-yarr.patch # https://bugs.webkit.org/show_bug.cgi?id=105295 Patch5: webkit-1.11.2-includes.patch +# https://bugs.webkit.org/show_bug.cgi?id=103128 +Patch6: webkit-1.11.2-Double2Ints.patch BuildRequires: bison BuildRequires: chrpath @@ -96,6 +98,7 @@ This package contains developer documentation for %{name}. %patch3 -p1 -b .librt %patch4 -p1 -b .yarr %patch5 -p1 -b .includes +%patch6 -p1 -b .double2ints # For patch3 autoreconf --verbose --install -I Source/autotools @@ -212,6 +215,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Tue Dec 18 2012 Dan Horák - 1.11.2-3 +- fix 32-bit non-JIT arches + * Tue Dec 18 2012 Dan Horák - 1.11.2-2 - fix build for non-JIT arches From 856779dc52c0175b89cf9158e53bb5a8c5004d4a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 16 Jan 2013 10:00:35 +0100 Subject: [PATCH 069/211] Update to 1.11.4 - Remove conditional pango deps; the build now uses harfbuzz directly - BR libwebp-devel - Drop upstreamed librt linking patch --- .gitignore | 1 + sources | 2 +- webkit-1.11.2-yarr.patch | 4 ++-- webkitgtk3.spec | 37 ++++++++++++++++++------------------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index ca68e09..1760b7c 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ webkit-1.3.3.tar.gz /webkitgtk-1.10.0.tar.xz /webkitgtk-1.10.1.tar.xz /webkitgtk-1.11.2.tar.xz +/webkitgtk-1.11.4.tar.xz diff --git a/sources b/sources index d83e5a7..dd4b1a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5db53912982617b952bd2722d56ba74f webkitgtk-1.11.2.tar.xz +b0c54b7ffcebb978e5d83cd8745b704e webkitgtk-1.11.4.tar.xz diff --git a/webkit-1.11.2-yarr.patch b/webkit-1.11.2-yarr.patch index 4653594..494e5a8 100644 --- a/webkit-1.11.2-yarr.patch +++ b/webkit-1.11.2-yarr.patch @@ -5,8 +5,8 @@ diff -up webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig webkitgtk-1.11.2/Source #define ENABLE_REGEXP_TRACING 0 /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ --#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM) -+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && !PLATFORM(CHROMIUM) +-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT)) ++#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT)) #define ENABLE_YARR_JIT 1 /* Setting this flag compares JIT results with interpreter results. */ diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 8fc3169..0b470dc 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.11.2 -Release: 3%{?dist} +Version: 1.11.4 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -18,9 +18,6 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch1: webkit-1.3.4-no-execmem.patch Patch2: webkit-1.1.14-nspluginwrapper.patch -# Explicitly link with -lrt -# https://bugs.webkit.org/show_bug.cgi?id=103194 -Patch3: webkitgtk-librt.patch # workarounds for non-JIT arches # https://bugs.webkit.org/show_bug.cgi?id=104270 Patch4: webkit-1.11.2-yarr.patch @@ -30,9 +27,12 @@ Patch5: webkit-1.11.2-includes.patch Patch6: webkit-1.11.2-Double2Ints.patch BuildRequires: bison +BuildRequires: cairo-devel BuildRequires: chrpath BuildRequires: enchant-devel BuildRequires: flex +BuildRequires: fontconfig-devel +BuildRequires: freetype-devel BuildRequires: geoclue-devel BuildRequires: gettext BuildRequires: gperf @@ -41,11 +41,13 @@ BuildRequires: gstreamer1-plugins-base-devel BuildRequires: gtk2-devel BuildRequires: gtk3-devel >= 3.0 BuildRequires: gtk-doc +BuildRequires: harfbuzz-devel BuildRequires: libsoup-devel >= 2.37.2.1 BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libsecret-devel +BuildRequires: libwebp-devel BuildRequires: libxslt-devel BuildRequires: libXt-devel BuildRequires: pcre-devel @@ -55,15 +57,6 @@ BuildRequires: perl-Switch BuildRequires: ruby BuildRequires: mesa-libGL-devel -## Conditional dependencies... -%if %{with pango} -BuildRequires: pango-devel -%else -BuildRequires: cairo-devel -BuildRequires: fontconfig-devel -BuildRequires: freetype-devel -%endif - %description WebKitGTK+ is the port of the portable web rendering engine WebKit to the GTK+ platform. @@ -95,14 +88,10 @@ This package contains developer documentation for %{name}. # tbzatek - doesn't apply, is this fixed? # %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper -%patch3 -p1 -b .librt %patch4 -p1 -b .yarr %patch5 -p1 -b .includes %patch6 -p1 -b .double2ints -# For patch3 -autoreconf --verbose --install -I Source/autotools - %build %ifarch s390 %{arm} ppc # Use linker flags to reduce memory consumption on low-mem architectures @@ -132,6 +121,7 @@ mkdir -p DerivedSources/webkit mkdir -p DerivedSources/WebCore mkdir -p DerivedSources/ANGLE mkdir -p DerivedSources/WebKit2 +mkdir -p DerivedSources/webkitdom/ mkdir -p DerivedSources/InjectedBundle make %{_smp_mflags} V=1 @@ -150,6 +140,9 @@ chrpath --delete %{buildroot}%{_libexecdir}/%{name}/GtkLauncher chrpath --delete %{buildroot}%{_libexecdir}/WebKitPluginProcess chrpath --delete %{buildroot}%{_libexecdir}/WebKitWebProcess +# Remove .la files +find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete + # for some reason translations don't get installed in 1.3.7 %find_lang webkitgtk-3.0 @@ -182,13 +175,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %files -f webkitgtk-3.0.lang %doc %{_docdir}/%{name}-%{version}/ -%exclude %{_libdir}/*.la %{_libdir}/libwebkitgtk-3.0.so.* %{_libdir}/libwebkit2gtk-3.0.so.* %{_libdir}/libjavascriptcoregtk-3.0.so.* %{_libdir}/girepository-1.0/WebKit-3.0.typelib %{_libdir}/girepository-1.0/WebKit2-3.0.typelib %{_libdir}/girepository-1.0/JSCore-3.0.typelib +%{_libdir}/webkit2gtk-3.0/ %{_libexecdir}/%{name}/ %{_libexecdir}/WebKitPluginProcess %{_libexecdir}/WebKitWebProcess @@ -215,6 +208,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Jan 16 2013 Kalev Lember - 1.11.4-1 +- Update to 1.11.4 +- Remove conditional pango deps; the build now uses harfbuzz directly +- BR libwebp-devel +- Drop upstreamed librt linking patch + * Tue Dec 18 2012 Dan Horák - 1.11.2-3 - fix 32-bit non-JIT arches From dd622815056eacd560a31216ee0d91d447fd91e5 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 21 Jan 2013 17:57:42 +0100 Subject: [PATCH 070/211] Rebuild due to "jpeg8-ABI" feature drop Signed-off-by: Adam Tkac --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 0b470dc..258b304 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.11.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -208,6 +208,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Mon Jan 21 2013 Adam Tkac - 1.11.4-2 +- rebuild due to "jpeg8-ABI" feature drop + * Wed Jan 16 2013 Kalev Lember - 1.11.4-1 - Update to 1.11.4 - Remove conditional pango deps; the build now uses harfbuzz directly From b9bc690037e0cf85c389f098ee312d827b84c3de Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 25 Jan 2013 10:57:06 +0100 Subject: [PATCH 071/211] Drop an unused patch --- webkitgtk-librt.patch | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 webkitgtk-librt.patch diff --git a/webkitgtk-librt.patch b/webkitgtk-librt.patch deleted file mode 100644 index 22d1c1e..0000000 --- a/webkitgtk-librt.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am -index 9a02bbd..c775990 100644 ---- a/Source/WebKit2/GNUmakefile.am -+++ b/Source/WebKit2/GNUmakefile.am -@@ -572,6 +572,7 @@ Programs_WebKitPluginProcess_LDADD += \ - $(PANGO_LIBS) \ - $(PNG_LIBS) \ - $(SHLWAPI_LIBS) \ -+ $(SHM_LIBS) \ - $(SQLITE3_LIBS) \ - $(UNICODE_LIBS) \ - $(XRENDER_LIBS) \ -diff --git a/configure.ac b/configure.ac -index 4e1f0e8..1fa99f0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1118,6 +1118,15 @@ if test "$enable_webkit2" = "yes"; then - if test "$have_gtk_unix_printing" = "yes"; then - AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available]) - fi -+ -+ # On some Linux/Unix platforms, shm_* may only be available if linking -+ # against librt -+ if test "$os_win32" = "no"; then -+ save_LIBS="$LIBS" -+ AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"]) -+ AC_SUBST(SHM_LIBS) -+ LIBS="$save_LIBS" -+ fi - fi - - # Plugin Process From 2a30073f0f4832950d300ab3cc9eec34481061df Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 25 Jan 2013 10:57:37 +0100 Subject: [PATCH 072/211] Backport a fix for a crash in AccessibilityTableCell::parentTable() Thanks to yaneti for pointing this out on IRC. --- ...-1.11.4-AccessibilityTableCell-crash.patch | 96 +++++++++++++++++++ webkitgtk3.spec | 8 +- 2 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-1.11.4-AccessibilityTableCell-crash.patch diff --git a/webkitgtk-1.11.4-AccessibilityTableCell-crash.patch b/webkitgtk-1.11.4-AccessibilityTableCell-crash.patch new file mode 100644 index 0000000..fd9f05c --- /dev/null +++ b/webkitgtk-1.11.4-AccessibilityTableCell-crash.patch @@ -0,0 +1,96 @@ +From 57621d76f5d522fe9460f2fbdcfa041c59960524 Mon Sep 17 00:00:00 2001 +From: "commit-queue@webkit.org" + +Date: Mon, 21 Jan 2013 16:57:38 +0000 +Subject: [PATCH] Crash in AccessibilityTableCell::parentTable() + https://bugs.webkit.org/show_bug.cgi?id=107261 + +Patch by Joanmarie Diggs on 2013-01-21 +Reviewed by Chris Fleizach. + +Source/WebCore: + +Test: accessibility/table-destroyed-crash.html + +Getting the parent table in order to get the role value should not be +done when objects are being destroyed. Also, it does not seem safe to +assume we have an AXObjectCache. + +Moving the logic from roleValue() to determineAccessibilityRole() has +the side effect of not being able to verify the cell is in an AXTable +when that AXTable has not yet been created. Therefore isTableCell() +should look to see if it is the descendant of an AXRow. + +* accessibility/AccessibilityTableCell.cpp: +(WebCore::AccessibilityTableCell::parentTable): +(WebCore::AccessibilityTableCell::isTableCell): +(WebCore::AccessibilityTableCell::determineAccessibilityRole): +* accessibility/AccessibilityTableCell.h: +(AccessibilityTableCell): + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@140340 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + .../accessibility/AccessibilityTableCell.cpp | 12 +++++--- + .../WebCore/accessibility/AccessibilityTableCell.h | 2 +- + 6 files changed, 93 insertions(+), 5 deletions(-) + +diff --git a/Source/WebCore/accessibility/AccessibilityTableCell.cpp b/Source/WebCore/accessibility/AccessibilityTableCell.cpp +index f2b1c95..b30409b 100644 +--- a/Source/WebCore/accessibility/AccessibilityTableCell.cpp ++++ b/Source/WebCore/accessibility/AccessibilityTableCell.cpp +@@ -74,6 +74,10 @@ AccessibilityObject* AccessibilityTableCell::parentTable() const + { + if (!m_renderer || !m_renderer->isTableCell()) + return 0; ++ ++ // If the document no longer exists, we might not have an axObjectCache. ++ if (!axObjectCache()) ++ return 0; + + // Do not use getOrCreate. parentTable() can be called while the render tree is being modified + // by javascript, and creating a table element may try to access the render tree while in a bad state. +@@ -85,17 +89,17 @@ AccessibilityObject* AccessibilityTableCell::parentTable() const + + bool AccessibilityTableCell::isTableCell() const + { +- AccessibilityObject* table = parentTable(); +- if (!table || !table->isAccessibilityTable()) ++ AccessibilityObject* parent = parentObjectUnignored(); ++ if (!parent || !parent->isTableRow()) + return false; + + return true; + } + +-AccessibilityRole AccessibilityTableCell::roleValue() const ++AccessibilityRole AccessibilityTableCell::determineAccessibilityRole() + { + if (!isTableCell()) +- return AccessibilityRenderObject::roleValue(); ++ return AccessibilityRenderObject::determineAccessibilityRole(); + + return CellRole; + } +diff --git a/Source/WebCore/accessibility/AccessibilityTableCell.h b/Source/WebCore/accessibility/AccessibilityTableCell.h +index 0430715..9341634 100644 +--- a/Source/WebCore/accessibility/AccessibilityTableCell.h ++++ b/Source/WebCore/accessibility/AccessibilityTableCell.h +@@ -42,7 +42,6 @@ public: + virtual ~AccessibilityTableCell(); + + virtual bool isTableCell() const; +- virtual AccessibilityRole roleValue() const; + + virtual bool accessibilityIsIgnored() const; + +@@ -54,6 +53,7 @@ public: + protected: + virtual AccessibilityObject* parentTable() const; + int m_rowIndex; ++ virtual AccessibilityRole determineAccessibilityRole(); + + private: + // If a table cell is not exposed as a table cell, a TH element can serve as its title UI element. +-- +1.8.1 + diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 258b304..37807e7 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.11.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -25,6 +25,8 @@ Patch4: webkit-1.11.2-yarr.patch Patch5: webkit-1.11.2-includes.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch6: webkit-1.11.2-Double2Ints.patch +# https://bugs.webkit.org/show_bug.cgi?id=107261 +Patch7: webkitgtk-1.11.4-AccessibilityTableCell-crash.patch BuildRequires: bison BuildRequires: cairo-devel @@ -91,6 +93,7 @@ This package contains developer documentation for %{name}. %patch4 -p1 -b .yarr %patch5 -p1 -b .includes %patch6 -p1 -b .double2ints +%patch7 -p1 -b .AccessibilityTableCell %build %ifarch s390 %{arm} ppc @@ -208,6 +211,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Fri Jan 25 2013 Kalev Lember - 1.11.4-3 +- Backport a fix for a crash in AccessibilityTableCell::parentTable() + * Mon Jan 21 2013 Adam Tkac - 1.11.4-2 - rebuild due to "jpeg8-ABI" feature drop From d8eab127283e7fecadbf0b93460f714b69a9dfb2 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 26 Jan 2013 16:54:45 +0100 Subject: [PATCH 073/211] Rebuilt for icu 50 --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 37807e7..6fb7841 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.11.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -211,6 +211,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Sat Jan 26 2013 Kalev Lember - 1.11.4-4 +- Rebuilt for icu 50 + * Fri Jan 25 2013 Kalev Lember - 1.11.4-3 - Backport a fix for a crash in AccessibilityTableCell::parentTable() From 2f8221cc722471698e2372a9344c1f2fee1f6eb2 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 27 Jan 2013 18:01:25 +0100 Subject: [PATCH 074/211] Fix the build with new icu 50 --- webkitgtk-1.11.4-icu-cppflags.patch | 26 ++++++++++++++++++++++++++ webkitgtk3.spec | 7 +++++++ 2 files changed, 33 insertions(+) create mode 100644 webkitgtk-1.11.4-icu-cppflags.patch diff --git a/webkitgtk-1.11.4-icu-cppflags.patch b/webkitgtk-1.11.4-icu-cppflags.patch new file mode 100644 index 0000000..83c6295 --- /dev/null +++ b/webkitgtk-1.11.4-icu-cppflags.patch @@ -0,0 +1,26 @@ +From 00593fa55c16deb22304bbe7316911570e7c33b9 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Sun, 27 Jan 2013 16:15:01 +0100 +Subject: [PATCH] [GTK] Pass ICU cppflags to libWebCoreSVG.la build + +--- + Source/WebCore/GNUmakefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am +index 95a23ed..d3463ca 100644 +--- a/Source/WebCore/GNUmakefile.am ++++ b/Source/WebCore/GNUmakefile.am +@@ -253,7 +253,8 @@ libWebCoreSVG_la_CPPFLAGS = \ + -fno-strict-aliasing \ + $(CAIRO_CFLAGS) \ + $(FREETYPE_CFLAGS) \ +- $(LIBSOUP_CFLAGS) ++ $(LIBSOUP_CFLAGS) \ ++ $(UNICODE_CFLAGS) + + feature_defines_overrides += ENABLE_SVG=1 + WEBCORE_CSS_PROPERTY_NAMES += $(WebCore)/css/SVGCSSPropertyNames.in +-- +1.8.1 + diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 6fb7841..f250b83 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -27,6 +27,8 @@ Patch5: webkit-1.11.2-includes.patch Patch6: webkit-1.11.2-Double2Ints.patch # https://bugs.webkit.org/show_bug.cgi?id=107261 Patch7: webkitgtk-1.11.4-AccessibilityTableCell-crash.patch +# https://bugs.webkit.org/show_bug.cgi?id=108032 +Patch8: webkitgtk-1.11.4-icu-cppflags.patch BuildRequires: bison BuildRequires: cairo-devel @@ -94,6 +96,11 @@ This package contains developer documentation for %{name}. %patch5 -p1 -b .includes %patch6 -p1 -b .double2ints %patch7 -p1 -b .AccessibilityTableCell +%patch8 -p1 -b .icu_cppflags + +# For patch8 +autoreconf --verbose --install -I Source/autotools + %build %ifarch s390 %{arm} ppc From 2007d33231398626ac097840471c49e23f33cd21 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Wed, 30 Jan 2013 14:47:30 +0900 Subject: [PATCH 075/211] Rebuild against new icu again --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index f250b83..6d18996 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.11.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -218,6 +218,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Jan 30 2013 Mamoru TASAKA - 1.11.4-5 +- Rebuild against new icu again + * Sat Jan 26 2013 Kalev Lember - 1.11.4-4 - Rebuilt for icu 50 From 2f21f7bef0ce536acde10ffc9b6d1ace7f75ca18 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 5 Feb 2013 23:37:01 +0100 Subject: [PATCH 076/211] Update to 1.11.5 ... and drop upstreamed patches. --- .gitignore | 1 + sources | 2 +- ...-1.11.4-AccessibilityTableCell-crash.patch | 96 ------------------- webkitgtk-1.11.4-icu-cppflags.patch | 26 ----- webkitgtk3.spec | 17 ++-- 5 files changed, 8 insertions(+), 134 deletions(-) delete mode 100644 webkitgtk-1.11.4-AccessibilityTableCell-crash.patch delete mode 100644 webkitgtk-1.11.4-icu-cppflags.patch diff --git a/.gitignore b/.gitignore index 1760b7c..c3afe7b 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ webkit-1.3.3.tar.gz /webkitgtk-1.10.1.tar.xz /webkitgtk-1.11.2.tar.xz /webkitgtk-1.11.4.tar.xz +/webkitgtk-1.11.5.tar.xz diff --git a/sources b/sources index dd4b1a9..81d69a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0c54b7ffcebb978e5d83cd8745b704e webkitgtk-1.11.4.tar.xz +d49302d36afcd84bafed180e23f091ae webkitgtk-1.11.5.tar.xz diff --git a/webkitgtk-1.11.4-AccessibilityTableCell-crash.patch b/webkitgtk-1.11.4-AccessibilityTableCell-crash.patch deleted file mode 100644 index fd9f05c..0000000 --- a/webkitgtk-1.11.4-AccessibilityTableCell-crash.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 57621d76f5d522fe9460f2fbdcfa041c59960524 Mon Sep 17 00:00:00 2001 -From: "commit-queue@webkit.org" - -Date: Mon, 21 Jan 2013 16:57:38 +0000 -Subject: [PATCH] Crash in AccessibilityTableCell::parentTable() - https://bugs.webkit.org/show_bug.cgi?id=107261 - -Patch by Joanmarie Diggs on 2013-01-21 -Reviewed by Chris Fleizach. - -Source/WebCore: - -Test: accessibility/table-destroyed-crash.html - -Getting the parent table in order to get the role value should not be -done when objects are being destroyed. Also, it does not seem safe to -assume we have an AXObjectCache. - -Moving the logic from roleValue() to determineAccessibilityRole() has -the side effect of not being able to verify the cell is in an AXTable -when that AXTable has not yet been created. Therefore isTableCell() -should look to see if it is the descendant of an AXRow. - -* accessibility/AccessibilityTableCell.cpp: -(WebCore::AccessibilityTableCell::parentTable): -(WebCore::AccessibilityTableCell::isTableCell): -(WebCore::AccessibilityTableCell::determineAccessibilityRole): -* accessibility/AccessibilityTableCell.h: -(AccessibilityTableCell): - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@140340 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - .../accessibility/AccessibilityTableCell.cpp | 12 +++++--- - .../WebCore/accessibility/AccessibilityTableCell.h | 2 +- - 6 files changed, 93 insertions(+), 5 deletions(-) - -diff --git a/Source/WebCore/accessibility/AccessibilityTableCell.cpp b/Source/WebCore/accessibility/AccessibilityTableCell.cpp -index f2b1c95..b30409b 100644 ---- a/Source/WebCore/accessibility/AccessibilityTableCell.cpp -+++ b/Source/WebCore/accessibility/AccessibilityTableCell.cpp -@@ -74,6 +74,10 @@ AccessibilityObject* AccessibilityTableCell::parentTable() const - { - if (!m_renderer || !m_renderer->isTableCell()) - return 0; -+ -+ // If the document no longer exists, we might not have an axObjectCache. -+ if (!axObjectCache()) -+ return 0; - - // Do not use getOrCreate. parentTable() can be called while the render tree is being modified - // by javascript, and creating a table element may try to access the render tree while in a bad state. -@@ -85,17 +89,17 @@ AccessibilityObject* AccessibilityTableCell::parentTable() const - - bool AccessibilityTableCell::isTableCell() const - { -- AccessibilityObject* table = parentTable(); -- if (!table || !table->isAccessibilityTable()) -+ AccessibilityObject* parent = parentObjectUnignored(); -+ if (!parent || !parent->isTableRow()) - return false; - - return true; - } - --AccessibilityRole AccessibilityTableCell::roleValue() const -+AccessibilityRole AccessibilityTableCell::determineAccessibilityRole() - { - if (!isTableCell()) -- return AccessibilityRenderObject::roleValue(); -+ return AccessibilityRenderObject::determineAccessibilityRole(); - - return CellRole; - } -diff --git a/Source/WebCore/accessibility/AccessibilityTableCell.h b/Source/WebCore/accessibility/AccessibilityTableCell.h -index 0430715..9341634 100644 ---- a/Source/WebCore/accessibility/AccessibilityTableCell.h -+++ b/Source/WebCore/accessibility/AccessibilityTableCell.h -@@ -42,7 +42,6 @@ public: - virtual ~AccessibilityTableCell(); - - virtual bool isTableCell() const; -- virtual AccessibilityRole roleValue() const; - - virtual bool accessibilityIsIgnored() const; - -@@ -54,6 +53,7 @@ public: - protected: - virtual AccessibilityObject* parentTable() const; - int m_rowIndex; -+ virtual AccessibilityRole determineAccessibilityRole(); - - private: - // If a table cell is not exposed as a table cell, a TH element can serve as its title UI element. --- -1.8.1 - diff --git a/webkitgtk-1.11.4-icu-cppflags.patch b/webkitgtk-1.11.4-icu-cppflags.patch deleted file mode 100644 index 83c6295..0000000 --- a/webkitgtk-1.11.4-icu-cppflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 00593fa55c16deb22304bbe7316911570e7c33b9 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Sun, 27 Jan 2013 16:15:01 +0100 -Subject: [PATCH] [GTK] Pass ICU cppflags to libWebCoreSVG.la build - ---- - Source/WebCore/GNUmakefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am -index 95a23ed..d3463ca 100644 ---- a/Source/WebCore/GNUmakefile.am -+++ b/Source/WebCore/GNUmakefile.am -@@ -253,7 +253,8 @@ libWebCoreSVG_la_CPPFLAGS = \ - -fno-strict-aliasing \ - $(CAIRO_CFLAGS) \ - $(FREETYPE_CFLAGS) \ -- $(LIBSOUP_CFLAGS) -+ $(LIBSOUP_CFLAGS) \ -+ $(UNICODE_CFLAGS) - - feature_defines_overrides += ENABLE_SVG=1 - WEBCORE_CSS_PROPERTY_NAMES += $(WebCore)/css/SVGCSSPropertyNames.in --- -1.8.1 - diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 6d18996..98a6148 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.11.4 -Release: 5%{?dist} +Version: 1.11.5 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -25,10 +25,6 @@ Patch4: webkit-1.11.2-yarr.patch Patch5: webkit-1.11.2-includes.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch6: webkit-1.11.2-Double2Ints.patch -# https://bugs.webkit.org/show_bug.cgi?id=107261 -Patch7: webkitgtk-1.11.4-AccessibilityTableCell-crash.patch -# https://bugs.webkit.org/show_bug.cgi?id=108032 -Patch8: webkitgtk-1.11.4-icu-cppflags.patch BuildRequires: bison BuildRequires: cairo-devel @@ -95,11 +91,6 @@ This package contains developer documentation for %{name}. %patch4 -p1 -b .yarr %patch5 -p1 -b .includes %patch6 -p1 -b .double2ints -%patch7 -p1 -b .AccessibilityTableCell -%patch8 -p1 -b .icu_cppflags - -# For patch8 -autoreconf --verbose --install -I Source/autotools %build @@ -218,6 +209,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Feb 06 2013 Kalev Lember - 1.11.5-1 +- Update to 1.11.5 +- Drop upstreamed patches + * Wed Jan 30 2013 Mamoru TASAKA - 1.11.4-5 - Rebuild against new icu again From 00853d55b9a5a05c8aa2d424e9bc491cd4e24dd3 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 7 Feb 2013 09:53:39 +0100 Subject: [PATCH 077/211] Fix a linking failure with the 32 bit build https://bugs.webkit.org/show_bug.cgi?id=109171 --- webkitgtk-1.11.5-i686-linking.patch | 12 ++++++++++++ webkitgtk3.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 webkitgtk-1.11.5-i686-linking.patch diff --git a/webkitgtk-1.11.5-i686-linking.patch b/webkitgtk-1.11.5-i686-linking.patch new file mode 100644 index 0000000..665ce4e --- /dev/null +++ b/webkitgtk-1.11.5-i686-linking.patch @@ -0,0 +1,12 @@ +diff --git a/Source/autotools/symbols.filter b/Source/autotools/symbols.filter +index 9d730b3..2edefaf 100644 +--- a/Source/autotools/symbols.filter ++++ b/Source/autotools/symbols.filter +@@ -57,6 +57,7 @@ _ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELj0EEE; + _ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELm0EEE; + _ZN7WebCore11MemoryCache14resourceForURLERKNS_4KURLE; + _ZN7WebCore12TextIterator26rangeFromLocationAndLengthEPNS_13ContainerNodeEiib; ++_ZN7WebCore12TextIterator29getLocationAndLengthFromRangeEPNS_4NodeEPKNS_5RangeERjS6_; + _ZN7WebCore12TextIterator29getLocationAndLengthFromRangeEPNS_4NodeEPKNS_5RangeERmS6_; + _ZN7WebCore12PrintContext20pageNumberForElementEPNS_7ElementERKNS_9FloatSizeE; + _ZN7WebCore13createWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_4NodeE; diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 98a6148..955ca13 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -25,6 +25,8 @@ Patch4: webkit-1.11.2-yarr.patch Patch5: webkit-1.11.2-includes.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch6: webkit-1.11.2-Double2Ints.patch +# https://bugs.webkit.org/show_bug.cgi?id=109171 +Patch7: webkitgtk-1.11.5-i686-linking.patch BuildRequires: bison BuildRequires: cairo-devel @@ -91,6 +93,7 @@ This package contains developer documentation for %{name}. %patch4 -p1 -b .yarr %patch5 -p1 -b .includes %patch6 -p1 -b .double2ints +%patch7 -p1 -b .i686 %build From 3bfbdb931e40b499de2637c62e6df4a092edb61a Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 14 Feb 2013 17:01:53 +0100 Subject: [PATCH 078/211] Add upstream patch for RH bug #908143 - AccessibilityTableRow::parentTable crash --- webkitgtk-1.11.5-atkFix.patch | 19 +++++++++++++++++++ webkitgtk3.spec | 6 ++++++ 2 files changed, 25 insertions(+) create mode 100644 webkitgtk-1.11.5-atkFix.patch diff --git a/webkitgtk-1.11.5-atkFix.patch b/webkitgtk-1.11.5-atkFix.patch new file mode 100644 index 0000000..9e52c40 --- /dev/null +++ b/webkitgtk-1.11.5-atkFix.patch @@ -0,0 +1,19 @@ +diff -up webkitgtk-1.11.5/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp.atkFix webkitgtk-1.11.5/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp +--- webkitgtk-1.11.5/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp.atkFix 2013-02-04 15:01:45.000000000 +0100 ++++ webkitgtk-1.11.5/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp 2013-02-14 14:50:18.266622024 +0100 +@@ -94,7 +94,14 @@ static AtkObject* webkitAccessibleTableR + AccessibilityTableCell* axCell = cell(table, row, column); + if (!axCell) + return 0; +- return axCell->wrapper(); ++ ++ AtkObject* cell = axCell->wrapper(); ++ if (!cell) ++ return 0; ++ ++ // This method transfers full ownership over the returned ++ // AtkObject, so an extra reference is needed here. ++ return ATK_OBJECT(g_object_ref(cell)); + } + + static gint webkitAccessibleTableGetIndexAt(AtkTable* table, gint row, gint column) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 955ca13..8e013f9 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -27,6 +27,8 @@ Patch5: webkit-1.11.2-includes.patch Patch6: webkit-1.11.2-Double2Ints.patch # https://bugs.webkit.org/show_bug.cgi?id=109171 Patch7: webkitgtk-1.11.5-i686-linking.patch +# https://bugs.webkit.org/show_bug.cgi?id=106903 +Patch8: webkitgtk-1.11.5-atkFix.patch BuildRequires: bison BuildRequires: cairo-devel @@ -94,6 +96,7 @@ This package contains developer documentation for %{name}. %patch5 -p1 -b .includes %patch6 -p1 -b .double2ints %patch7 -p1 -b .i686 +%patch8 -p1 -b .atkFix %build @@ -212,6 +215,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Thu Feb 14 2013 Tomas Popela 1.11.5-2 +- Add upstream patch for RH bug #908143 - AccessibilityTableRow::parentTable crash + * Wed Feb 06 2013 Kalev Lember - 1.11.5-1 - Update to 1.11.5 - Drop upstreamed patches From b28e3d33c50989fa9b61ae1d1d0a6a064c7ada0d Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 14 Feb 2013 17:03:24 +0100 Subject: [PATCH 079/211] Version bump --- webkitgtk3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 8e013f9..6a3f836 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.11.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries From 08ad5279c95ae01b4b66044ef7f84c064c91379f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Feb 2013 22:55:20 +0000 Subject: [PATCH 080/211] Re-enable JIT on ARM (hopefully the gmail crash is fixed) --- webkitgtk3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 6a3f836..84f5640 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.11.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -117,7 +117,7 @@ This package contains developer documentation for %{name}. CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ --with-gstreamer=1.0 \ --with-gtk=3.0 \ -%ifarch %{arm} s390 s390x ppc ppc64 +%ifarch s390 s390x ppc ppc64 --disable-jit \ %else --enable-jit \ @@ -215,6 +215,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Sat Feb 16 2013 Peter Robinson 1.11.5-3 +- Re-enable JIT on ARM (hopefully the gmail crash is fixed) + * Thu Feb 14 2013 Tomas Popela 1.11.5-2 - Add upstream patch for RH bug #908143 - AccessibilityTableRow::parentTable crash From 5f96013cbb0272abe3b560a9b67eb55872961676 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 18 Feb 2013 17:06:22 +0100 Subject: [PATCH 081/211] Added fixes for building webkitgtk with JIT disabled --- webkitgtk-1.11.5-JSCJSValueFix.patch | 11 +++ webkitgtk-1.11.5-ppcFetch8Fix.patch | 128 +++++++++++++++++++++++++++ webkitgtk3.spec | 16 +++- 3 files changed, 153 insertions(+), 2 deletions(-) create mode 100644 webkitgtk-1.11.5-JSCJSValueFix.patch create mode 100644 webkitgtk-1.11.5-ppcFetch8Fix.patch diff --git a/webkitgtk-1.11.5-JSCJSValueFix.patch b/webkitgtk-1.11.5-JSCJSValueFix.patch new file mode 100644 index 0000000..62156f4 --- /dev/null +++ b/webkitgtk-1.11.5-JSCJSValueFix.patch @@ -0,0 +1,11 @@ +diff -up webkitgtk-1.11.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.JSCJSValueFix webkitgtk-1.11.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +--- webkitgtk-1.11.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.JSCJSValueFix 2013-02-15 11:26:57.432824944 +0100 ++++ webkitgtk-1.11.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-02-15 11:24:00.320680911 +0100 +@@ -35,6 +35,7 @@ + #include "CodeBlock.h" + #include "LLIntCLoop.h" + #include "LLIntSlowPaths.h" ++#include "Operations.h" + #include "VMInspector.h" + #include + #include diff --git a/webkitgtk-1.11.5-ppcFetch8Fix.patch b/webkitgtk-1.11.5-ppcFetch8Fix.patch new file mode 100644 index 0000000..9b80923 --- /dev/null +++ b/webkitgtk-1.11.5-ppcFetch8Fix.patch @@ -0,0 +1,128 @@ +diff --git a/Source/WTF/GNUmakefile.list.am b/Source/WTF/GNUmakefile.list.am +index 0c01579..0408450 100644 +--- a/Source/WTF/GNUmakefile.list.am ++++ b/Source/WTF/GNUmakefile.list.am +@@ -12,6 +12,7 @@ wtf_sources += \ + Source/WTF/wtf/Assertions.cpp \ + Source/WTF/wtf/Assertions.h \ + Source/WTF/wtf/Atomics.h \ ++ Source/WTF/wtf/Atomics.cpp \ + Source/WTF/wtf/BitArray.h \ + Source/WTF/wtf/BitVector.cpp \ + Source/WTF/wtf/BitVector.h \ +diff --git a/Source/WTF/wtf/Atomics.cpp b/Source/WTF/wtf/Atomics.cpp +new file mode 100644 +index 0000000..0feea15 +--- /dev/null ++++ b/Source/WTF/wtf/Atomics.cpp +@@ -0,0 +1,110 @@ ++/* ++ * Copyright (C) 2007, 2008, 2010, 2012 Apple Inc. All rights reserved. ++ * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com) ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of ++ * its contributors may be used to endorse or promote products derived ++ * from this software without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY ++ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY ++ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ++ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * ++ * Note: The implementations of InterlockedIncrement and InterlockedDecrement are based ++ * on atomic_increment and atomic_exchange_and_add from the Boost C++ Library. The license ++ * is virtually identical to the Apple license above but is included here for completeness. ++ * ++ * Boost Software License - Version 1.0 - August 17th, 2003 ++ * ++ * Permission is hereby granted, free of charge, to any person or organization ++ * obtaining a copy of the software and accompanying documentation covered by ++ * this license (the "Software") to use, reproduce, display, distribute, ++ * execute, and transmit the Software, and to prepare derivative works of the ++ * Software, and to permit third-parties to whom the Software is furnished to ++ * do so, all subject to the following: ++ * ++ * The copyright notices in the Software and this entire statement, including ++ * the above license grant, this restriction and the following disclaimer, ++ * must be included in all copies of the Software, in whole or in part, and ++ * all derivative works of the Software, unless such copies or derivative ++ * works are solely in the form of machine-executable object code generated by ++ * a source language processor. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT ++ * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE ++ * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ */ ++ ++#include "config.h" ++#include "Atomics.h" ++ ++// Some architectures, like MIPS32, don't have GCC implementation for builtin __sync_* functions ++// with 64 bits variable size. Official GCC answer for the problem: If a target doesn't support ++// atomic operations on certain variable sizes, you are out of luck with atomicity in that case ++// (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56296). GCC >= 4.8 will support __atomic_* builtin ++// functions for this purpose for all the GCC targets, but for current compilers we have to include ++// our own implementation. ++#if COMPILER(GCC) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && USE(LOCKFREE_THREADSAFEREFCOUNTED) && USE(PTHREADS) ++ ++#include "ThreadingPrimitives.h" ++ ++namespace WTF { ++ ++static const size_t kSwapLockCount = 32; ++static Mutex s_swapLocks[kSwapLockCount]; ++ ++static inline Mutex& getSwapLock(const volatile int64_t* addr) ++{ ++ return s_swapLocks[(reinterpret_cast(addr) >> 3U) % kSwapLockCount]; ++} ++ ++static int64_t atomicStep(int64_t volatile* addend, int64_t step) ++{ ++ Mutex& mutex = getSwapLock(addend); ++ ++ mutex.lock(); ++ int64_t value = *addend + step; ++ *addend = value; ++ mutex.unlock(); ++ ++ return value; ++} ++ ++extern "C" { ++ ++int64_t __sync_add_and_fetch_8(int64_t volatile* addend, int64_t value) ++{ ++ return atomicStep(addend, value); ++} ++ ++int64_t __sync_sub_and_fetch_8(int64_t volatile* addend, int64_t value) ++{ ++ return atomicStep(addend, -value); ++} ++ ++} // extern "C" ++ ++} // namespace WTF ++ ++#endif diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 84f5640..bedd9c0 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.11.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -29,6 +29,9 @@ Patch6: webkit-1.11.2-Double2Ints.patch Patch7: webkitgtk-1.11.5-i686-linking.patch # https://bugs.webkit.org/show_bug.cgi?id=106903 Patch8: webkitgtk-1.11.5-atkFix.patch +# Fix for not building with JIT disabled +Patch9: webkitgtk-1.11.5-JSCJSValueFix.patch +Patch10: webkitgtk-1.11.5-ppcFetch8Fix.patch BuildRequires: bison BuildRequires: cairo-devel @@ -97,7 +100,8 @@ This package contains developer documentation for %{name}. %patch6 -p1 -b .double2ints %patch7 -p1 -b .i686 %patch8 -p1 -b .atkFix - +%patch9 -p1 -b .JSCJSValueFix +%patch10 -p1 -b .ppcFetch8Fix %build %ifarch s390 %{arm} ppc @@ -109,6 +113,11 @@ This package contains developer documentation for %{name}. %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 +%endif + # Build with -g1 on all platforms to avoid running into 4 GB ar format limit # https://bugs.webkit.org/show_bug.cgi?id=91154 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') @@ -215,6 +224,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Mon Feb 18 2013 Tomas Popela 1.11.5-4 +- Backported fixes for not building with disabled JIT + * Sat Feb 16 2013 Peter Robinson 1.11.5-3 - Re-enable JIT on ARM (hopefully the gmail crash is fixed) From c834dbb2edac47b6c6618c0e6a9e88cd554f8f2f Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 22 Feb 2013 10:07:44 +0100 Subject: [PATCH 082/211] Fix for not building on ppc32 with JIT disabled --- webkitgtk-1.11.5-libatomic.patch | 43 ++++++++++ webkitgtk-1.11.5-ppcFetch8Fix.patch | 128 ---------------------------- webkitgtk3.spec | 18 +++- 3 files changed, 57 insertions(+), 132 deletions(-) create mode 100644 webkitgtk-1.11.5-libatomic.patch delete mode 100644 webkitgtk-1.11.5-ppcFetch8Fix.patch diff --git a/webkitgtk-1.11.5-libatomic.patch b/webkitgtk-1.11.5-libatomic.patch new file mode 100644 index 0000000..d9c571f --- /dev/null +++ b/webkitgtk-1.11.5-libatomic.patch @@ -0,0 +1,43 @@ +diff -up webkitgtk-1.11.5/GNUmakefile.in.libatomic webkitgtk-1.11.5/GNUmakefile.in +--- webkitgtk-1.11.5/GNUmakefile.in.libatomic 2013-02-05 10:19:17.000000000 +0100 ++++ webkitgtk-1.11.5/GNUmakefile.in 2013-02-21 11:46:22.174606897 +0100 +@@ -20924,6 +20924,7 @@ libWTF_la_CXXFLAGS = \ + $(libWTF_la_CFLAGS) + + libWTF_la_CFLAGS = \ ++ -latomic \ + -fstrict-aliasing \ + -O3 \ + $(global_cflags) \ +diff -up webkitgtk-1.11.5/Source/WTF/GNUmakefile.am.libatomic webkitgtk-1.11.5/Source/WTF/GNUmakefile.am +--- webkitgtk-1.11.5/Source/WTF/GNUmakefile.am.libatomic 2013-02-02 15:44:07.000000000 +0100 ++++ webkitgtk-1.11.5/Source/WTF/GNUmakefile.am 2013-02-21 11:44:37.170481443 +0100 +@@ -25,6 +25,7 @@ libWTF_la_CXXFLAGS = \ + $(libWTF_la_CFLAGS) + + libWTF_la_CFLAGS = \ ++ -latomic \ + -fstrict-aliasing \ + -O3 \ + $(global_cflags) \ +diff -up webkitgtk-1.11.5/Source/WTF/wtf/Atomics.h.libatomic webkitgtk-1.11.5/Source/WTF/wtf/Atomics.h +--- webkitgtk-1.11.5/Source/WTF/wtf/Atomics.h.libatomic 2013-02-01 16:03:26.000000000 +0100 ++++ webkitgtk-1.11.5/Source/WTF/wtf/Atomics.h 2013-02-21 11:42:04.212836334 +0100 +@@ -107,6 +107,17 @@ inline int atomicDecrement(int volatile* + inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; } + inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; } + ++#elif COMPILER(GCC) && (__GNUC__ > 4 || (__GNUC__ == 4 \ ++ && (__GNUC_MINOR__ > 8 || (__GNUC_MINOR__ == 8 \ ++ && (__GNUC_PATCHLEVEL__ > 0 || (__GNUC_PATCHLEVEL__ == 0)))))) \ ++ && CPU(PPC) ++#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 ++inline int atomicIncrement(int volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); } ++inline int atomicDecrement(int volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); } ++ ++inline int64_t atomicIncrement(int64_t volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); } ++inline int64_t atomicDecrement(int64_t volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); } ++ + #elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc + #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 + diff --git a/webkitgtk-1.11.5-ppcFetch8Fix.patch b/webkitgtk-1.11.5-ppcFetch8Fix.patch deleted file mode 100644 index 9b80923..0000000 --- a/webkitgtk-1.11.5-ppcFetch8Fix.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff --git a/Source/WTF/GNUmakefile.list.am b/Source/WTF/GNUmakefile.list.am -index 0c01579..0408450 100644 ---- a/Source/WTF/GNUmakefile.list.am -+++ b/Source/WTF/GNUmakefile.list.am -@@ -12,6 +12,7 @@ wtf_sources += \ - Source/WTF/wtf/Assertions.cpp \ - Source/WTF/wtf/Assertions.h \ - Source/WTF/wtf/Atomics.h \ -+ Source/WTF/wtf/Atomics.cpp \ - Source/WTF/wtf/BitArray.h \ - Source/WTF/wtf/BitVector.cpp \ - Source/WTF/wtf/BitVector.h \ -diff --git a/Source/WTF/wtf/Atomics.cpp b/Source/WTF/wtf/Atomics.cpp -new file mode 100644 -index 0000000..0feea15 ---- /dev/null -+++ b/Source/WTF/wtf/Atomics.cpp -@@ -0,0 +1,110 @@ -+/* -+ * Copyright (C) 2007, 2008, 2010, 2012 Apple Inc. All rights reserved. -+ * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com) -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of -+ * its contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY -+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY -+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * -+ * -+ * Note: The implementations of InterlockedIncrement and InterlockedDecrement are based -+ * on atomic_increment and atomic_exchange_and_add from the Boost C++ Library. The license -+ * is virtually identical to the Apple license above but is included here for completeness. -+ * -+ * Boost Software License - Version 1.0 - August 17th, 2003 -+ * -+ * Permission is hereby granted, free of charge, to any person or organization -+ * obtaining a copy of the software and accompanying documentation covered by -+ * this license (the "Software") to use, reproduce, display, distribute, -+ * execute, and transmit the Software, and to prepare derivative works of the -+ * Software, and to permit third-parties to whom the Software is furnished to -+ * do so, all subject to the following: -+ * -+ * The copyright notices in the Software and this entire statement, including -+ * the above license grant, this restriction and the following disclaimer, -+ * must be included in all copies of the Software, in whole or in part, and -+ * all derivative works of the Software, unless such copies or derivative -+ * works are solely in the form of machine-executable object code generated by -+ * a source language processor. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -+ * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -+ * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+ -+#include "config.h" -+#include "Atomics.h" -+ -+// Some architectures, like MIPS32, don't have GCC implementation for builtin __sync_* functions -+// with 64 bits variable size. Official GCC answer for the problem: If a target doesn't support -+// atomic operations on certain variable sizes, you are out of luck with atomicity in that case -+// (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56296). GCC >= 4.8 will support __atomic_* builtin -+// functions for this purpose for all the GCC targets, but for current compilers we have to include -+// our own implementation. -+#if COMPILER(GCC) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && USE(LOCKFREE_THREADSAFEREFCOUNTED) && USE(PTHREADS) -+ -+#include "ThreadingPrimitives.h" -+ -+namespace WTF { -+ -+static const size_t kSwapLockCount = 32; -+static Mutex s_swapLocks[kSwapLockCount]; -+ -+static inline Mutex& getSwapLock(const volatile int64_t* addr) -+{ -+ return s_swapLocks[(reinterpret_cast(addr) >> 3U) % kSwapLockCount]; -+} -+ -+static int64_t atomicStep(int64_t volatile* addend, int64_t step) -+{ -+ Mutex& mutex = getSwapLock(addend); -+ -+ mutex.lock(); -+ int64_t value = *addend + step; -+ *addend = value; -+ mutex.unlock(); -+ -+ return value; -+} -+ -+extern "C" { -+ -+int64_t __sync_add_and_fetch_8(int64_t volatile* addend, int64_t value) -+{ -+ return atomicStep(addend, value); -+} -+ -+int64_t __sync_sub_and_fetch_8(int64_t volatile* addend, int64_t value) -+{ -+ return atomicStep(addend, -value); -+} -+ -+} // extern "C" -+ -+} // namespace WTF -+ -+#endif diff --git a/webkitgtk3.spec b/webkitgtk3.spec index bedd9c0..1f76826 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.11.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -31,7 +31,7 @@ Patch7: webkitgtk-1.11.5-i686-linking.patch Patch8: webkitgtk-1.11.5-atkFix.patch # Fix for not building with JIT disabled Patch9: webkitgtk-1.11.5-JSCJSValueFix.patch -Patch10: webkitgtk-1.11.5-ppcFetch8Fix.patch +Patch10: webkitgtk-1.11.5-libatomic.patch BuildRequires: bison BuildRequires: cairo-devel @@ -64,6 +64,10 @@ BuildRequires: perl-Switch BuildRequires: ruby BuildRequires: mesa-libGL-devel +%ifarch ppc +BuildRequires: libatomic +%endif + %description WebKitGTK+ is the port of the portable web rendering engine WebKit to the GTK+ platform. @@ -101,7 +105,9 @@ This package contains developer documentation for %{name}. %patch7 -p1 -b .i686 %patch8 -p1 -b .atkFix %patch9 -p1 -b .JSCJSValueFix -%patch10 -p1 -b .ppcFetch8Fix +%ifarch ppc +%patch10 -p1 -b .libatomic +%endif %build %ifarch s390 %{arm} ppc @@ -224,6 +230,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Fri Feb 22 2013 Tomas Popela 1.11.5-5 +- Fix for not building on ppc32 with JIT disabled +- BR libatomic (needs gcc >= 4.8.0) for ppc32 + * Mon Feb 18 2013 Tomas Popela 1.11.5-4 - Backported fixes for not building with disabled JIT @@ -424,7 +434,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : * Wed Dec 1 2010 Matthias Clasen 1.3.7-1 - Update to 1.3.7 -* Wed Nov 11 2010 Matthias Clasen 1.3.6-1 +* Thu Nov 11 2010 Matthias Clasen 1.3.6-1 - Update to 1.3.6 - Disable the s390 patch again :-( Upstream it, maybe ? From b1292f87d892522f3ac74a3b9604d9db2f11ac95 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 22 Feb 2013 16:00:32 +0100 Subject: [PATCH 083/211] Update to 1.11.90 ... and drop upstreamed patches. --- .gitignore | 1 + sources | 2 +- webkitgtk-1.11.5-JSCJSValueFix.patch | 11 ----------- webkitgtk-1.11.5-atkFix.patch | 19 ------------------- webkitgtk-1.11.5-i686-linking.patch | 12 ------------ webkitgtk3.spec | 22 +++++++--------------- 6 files changed, 9 insertions(+), 58 deletions(-) delete mode 100644 webkitgtk-1.11.5-JSCJSValueFix.patch delete mode 100644 webkitgtk-1.11.5-atkFix.patch delete mode 100644 webkitgtk-1.11.5-i686-linking.patch diff --git a/.gitignore b/.gitignore index c3afe7b..ffdd21e 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ webkit-1.3.3.tar.gz /webkitgtk-1.11.2.tar.xz /webkitgtk-1.11.4.tar.xz /webkitgtk-1.11.5.tar.xz +/webkitgtk-1.11.90.tar.xz diff --git a/sources b/sources index 81d69a7..fd0b54b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d49302d36afcd84bafed180e23f091ae webkitgtk-1.11.5.tar.xz +fb6aff2fa84bdedcf94c34c950dc0a51 webkitgtk-1.11.90.tar.xz diff --git a/webkitgtk-1.11.5-JSCJSValueFix.patch b/webkitgtk-1.11.5-JSCJSValueFix.patch deleted file mode 100644 index 62156f4..0000000 --- a/webkitgtk-1.11.5-JSCJSValueFix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up webkitgtk-1.11.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.JSCJSValueFix webkitgtk-1.11.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ---- webkitgtk-1.11.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.JSCJSValueFix 2013-02-15 11:26:57.432824944 +0100 -+++ webkitgtk-1.11.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-02-15 11:24:00.320680911 +0100 -@@ -35,6 +35,7 @@ - #include "CodeBlock.h" - #include "LLIntCLoop.h" - #include "LLIntSlowPaths.h" -+#include "Operations.h" - #include "VMInspector.h" - #include - #include diff --git a/webkitgtk-1.11.5-atkFix.patch b/webkitgtk-1.11.5-atkFix.patch deleted file mode 100644 index 9e52c40..0000000 --- a/webkitgtk-1.11.5-atkFix.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up webkitgtk-1.11.5/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp.atkFix webkitgtk-1.11.5/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp ---- webkitgtk-1.11.5/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp.atkFix 2013-02-04 15:01:45.000000000 +0100 -+++ webkitgtk-1.11.5/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp 2013-02-14 14:50:18.266622024 +0100 -@@ -94,7 +94,14 @@ static AtkObject* webkitAccessibleTableR - AccessibilityTableCell* axCell = cell(table, row, column); - if (!axCell) - return 0; -- return axCell->wrapper(); -+ -+ AtkObject* cell = axCell->wrapper(); -+ if (!cell) -+ return 0; -+ -+ // This method transfers full ownership over the returned -+ // AtkObject, so an extra reference is needed here. -+ return ATK_OBJECT(g_object_ref(cell)); - } - - static gint webkitAccessibleTableGetIndexAt(AtkTable* table, gint row, gint column) diff --git a/webkitgtk-1.11.5-i686-linking.patch b/webkitgtk-1.11.5-i686-linking.patch deleted file mode 100644 index 665ce4e..0000000 --- a/webkitgtk-1.11.5-i686-linking.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Source/autotools/symbols.filter b/Source/autotools/symbols.filter -index 9d730b3..2edefaf 100644 ---- a/Source/autotools/symbols.filter -+++ b/Source/autotools/symbols.filter -@@ -57,6 +57,7 @@ _ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELj0EEE; - _ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELm0EEE; - _ZN7WebCore11MemoryCache14resourceForURLERKNS_4KURLE; - _ZN7WebCore12TextIterator26rangeFromLocationAndLengthEPNS_13ContainerNodeEiib; -+_ZN7WebCore12TextIterator29getLocationAndLengthFromRangeEPNS_4NodeEPKNS_5RangeERjS6_; - _ZN7WebCore12TextIterator29getLocationAndLengthFromRangeEPNS_4NodeEPKNS_5RangeERmS6_; - _ZN7WebCore12PrintContext20pageNumberForElementEPNS_7ElementERKNS_9FloatSizeE; - _ZN7WebCore13createWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_4NodeE; diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 1f76826..23612da 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.11.5 -Release: 5%{?dist} +Version: 1.11.90 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -25,12 +25,6 @@ Patch4: webkit-1.11.2-yarr.patch Patch5: webkit-1.11.2-includes.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch6: webkit-1.11.2-Double2Ints.patch -# https://bugs.webkit.org/show_bug.cgi?id=109171 -Patch7: webkitgtk-1.11.5-i686-linking.patch -# https://bugs.webkit.org/show_bug.cgi?id=106903 -Patch8: webkitgtk-1.11.5-atkFix.patch -# Fix for not building with JIT disabled -Patch9: webkitgtk-1.11.5-JSCJSValueFix.patch Patch10: webkitgtk-1.11.5-libatomic.patch BuildRequires: bison @@ -102,9 +96,6 @@ This package contains developer documentation for %{name}. %patch4 -p1 -b .yarr %patch5 -p1 -b .includes %patch6 -p1 -b .double2ints -%patch7 -p1 -b .i686 -%patch8 -p1 -b .atkFix -%patch9 -p1 -b .JSCJSValueFix %ifarch ppc %patch10 -p1 -b .libatomic %endif @@ -130,7 +121,6 @@ This package contains developer documentation for %{name}. # explicitly disable JIT on ARM https://bugs.webkit.org/show_bug.cgi?id=85076 CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ - --with-gstreamer=1.0 \ --with-gtk=3.0 \ %ifarch s390 s390x ppc ppc64 --disable-jit \ @@ -165,8 +155,7 @@ chrpath --delete %{buildroot}%{_libexecdir}/WebKitWebProcess # Remove .la files find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete -# for some reason translations don't get installed in 1.3.7 -%find_lang webkitgtk-3.0 +%find_lang WebKitGTK-3.0 ## Finally, copy over and rename the various files for %%doc inclusion. %add_to_doc_files Source/WebKit/LICENSE @@ -195,7 +184,7 @@ fi glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : -%files -f webkitgtk-3.0.lang +%files -f WebKitGTK-3.0.lang %doc %{_docdir}/%{name}-%{version}/ %{_libdir}/libwebkitgtk-3.0.so.* %{_libdir}/libwebkit2gtk-3.0.so.* @@ -230,6 +219,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Fri Feb 22 2013 Kalev Lember - 1.11.90-1 +- Update to 1.11.90 + * Fri Feb 22 2013 Tomas Popela 1.11.5-5 - Fix for not building on ppc32 with JIT disabled - BR libatomic (needs gcc >= 4.8.0) for ppc32 From 853c089355131a3795fa5fd5e4b6a67449e62365 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 23 Feb 2013 21:44:43 -0700 Subject: [PATCH 084/211] Add webkit2 MiniBrowser --- webkitgtk3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 23612da..92d553a 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.11.90 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -143,6 +143,7 @@ make install DESTDIR=%{buildroot} install -d -m 755 %{buildroot}%{_libexecdir}/%{name} install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name} +install -m 755 Programs/MiniBrowser %{buildroot}%{_libexecdir}/%{name} # Remove lib64 rpaths chrpath --delete %{buildroot}%{_bindir}/jsc-3 @@ -219,6 +220,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Sat Feb 23 2013 Kevin Fenzi 1.11.90-2 +- Add webkit2 MiniBrowser + * Fri Feb 22 2013 Kalev Lember - 1.11.90-1 - Update to 1.11.90 From 0e5184977765268808a16ff71336120fa7b4eb97 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 25 Feb 2013 14:21:50 +0100 Subject: [PATCH 085/211] Fix for not building on ppc32 with JIT disabled --- webkitgtk-1.11.5-libatomic.patch | 42 +++++++++++++++++++++++--------- webkitgtk3.spec | 5 +++- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/webkitgtk-1.11.5-libatomic.patch b/webkitgtk-1.11.5-libatomic.patch index d9c571f..8c2b721 100644 --- a/webkitgtk-1.11.5-libatomic.patch +++ b/webkitgtk-1.11.5-libatomic.patch @@ -1,17 +1,37 @@ -diff -up webkitgtk-1.11.5/GNUmakefile.in.libatomic webkitgtk-1.11.5/GNUmakefile.in ---- webkitgtk-1.11.5/GNUmakefile.in.libatomic 2013-02-05 10:19:17.000000000 +0100 -+++ webkitgtk-1.11.5/GNUmakefile.in 2013-02-21 11:46:22.174606897 +0100 -@@ -20924,6 +20924,7 @@ libWTF_la_CXXFLAGS = \ +diff -up webkitgtk-1.11.90/GNUmakefile.in.libatomic webkitgtk-1.11.90/GNUmakefile.in +--- webkitgtk-1.11.90/GNUmakefile.in.libatomic 2013-02-21 19:07:19.000000000 +0100 ++++ webkitgtk-1.11.90/GNUmakefile.in 2013-02-25 11:31:34.824149062 +0100 +@@ -20933,6 +20933,7 @@ libWTF_la_CXXFLAGS = \ $(libWTF_la_CFLAGS) libWTF_la_CFLAGS = \ -+ -latomic \ ++ -latomic \ -fstrict-aliasing \ -O3 \ $(global_cflags) \ -diff -up webkitgtk-1.11.5/Source/WTF/GNUmakefile.am.libatomic webkitgtk-1.11.5/Source/WTF/GNUmakefile.am ---- webkitgtk-1.11.5/Source/WTF/GNUmakefile.am.libatomic 2013-02-02 15:44:07.000000000 +0100 -+++ webkitgtk-1.11.5/Source/WTF/GNUmakefile.am 2013-02-21 11:44:37.170481443 +0100 +@@ -22305,7 +22306,7 @@ Programs_WebKitPluginProcess_SOURCES = \ + + #if ENABLE_SVG + #endif +-Programs_WebKitPluginProcess_LDADD = -lpthread \ ++Programs_WebKitPluginProcess_LDADD = -latomic -lpthread \ + libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ + libWebCore.la libWebCoreSVG.la libWebCorePlatform.la \ + libWebCoreGtk2.la $(CAIRO_LIBS) $(COVERAGE_LDFLAGS) \ +diff -up webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am.libatomic webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am +--- webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am.libatomic 2013-02-25 11:28:58.812154709 +0100 ++++ webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am 2013-02-25 11:29:14.906154126 +0100 +@@ -568,6 +568,7 @@ Programs_WebKitPluginProcess_SOURCES = \ + $(webkit2_plugin_process_sources) + + Programs_WebKitPluginProcess_LDADD = \ ++ -latomic \ + -lpthread \ + libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ + libWebCore.la +diff -up webkitgtk-1.11.90/Source/WTF/GNUmakefile.am.libatomic webkitgtk-1.11.90/Source/WTF/GNUmakefile.am +--- webkitgtk-1.11.90/Source/WTF/GNUmakefile.am.libatomic 2012-07-19 12:02:14.000000000 +0200 ++++ webkitgtk-1.11.90/Source/WTF/GNUmakefile.am 2013-02-25 09:21:31.552243859 +0100 @@ -25,6 +25,7 @@ libWTF_la_CXXFLAGS = \ $(libWTF_la_CFLAGS) @@ -20,9 +40,9 @@ diff -up webkitgtk-1.11.5/Source/WTF/GNUmakefile.am.libatomic webkitgtk-1.11.5/S -fstrict-aliasing \ -O3 \ $(global_cflags) \ -diff -up webkitgtk-1.11.5/Source/WTF/wtf/Atomics.h.libatomic webkitgtk-1.11.5/Source/WTF/wtf/Atomics.h ---- webkitgtk-1.11.5/Source/WTF/wtf/Atomics.h.libatomic 2013-02-01 16:03:26.000000000 +0100 -+++ webkitgtk-1.11.5/Source/WTF/wtf/Atomics.h 2013-02-21 11:42:04.212836334 +0100 +diff -up webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h.libatomic webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h +--- webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h.libatomic 2013-01-29 11:00:42.000000000 +0100 ++++ webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h 2013-02-25 09:21:31.553243859 +0100 @@ -107,6 +107,17 @@ inline int atomicDecrement(int volatile* inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; } inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; } diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 92d553a..8d2b13b 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 1.11.90 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -220,6 +220,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Mon Feb 25 2013 Tomas Popela 1.11.90-3 +- Fix for not building on ppc32 with JIT disabled + * Sat Feb 23 2013 Kevin Fenzi 1.11.90-2 - Add webkit2 MiniBrowser From 4ecf58560910aece2714e07a8671ba9711aae50b Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 8 Mar 2013 14:55:11 +0100 Subject: [PATCH 086/211] Update to 1.11.91 Fix for RH bug #915990 - Seed segfaults in JSC::LLInt::CLoop::execute() --- .gitignore | 1 + sources | 2 +- webkit-1.11.2-Double2Ints.patch | 15 +++++----- webkit-1.11.90-double2intsPPC32.patch | 40 +++++++++++++++++++++++++++ webkitgtk3.spec | 14 +++++++--- 5 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 webkit-1.11.90-double2intsPPC32.patch diff --git a/.gitignore b/.gitignore index ffdd21e..a21a0de 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ webkit-1.3.3.tar.gz /webkitgtk-1.11.4.tar.xz /webkitgtk-1.11.5.tar.xz /webkitgtk-1.11.90.tar.xz +/webkitgtk-1.11.91.tar.xz diff --git a/sources b/sources index fd0b54b..487bf4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb6aff2fa84bdedcf94c34c950dc0a51 webkitgtk-1.11.90.tar.xz +01ede85baaac85c6eb065a2e121bc9d4 webkitgtk-1.11.91.tar.xz diff --git a/webkit-1.11.2-Double2Ints.patch b/webkit-1.11.2-Double2Ints.patch index c602985..3371964 100644 --- a/webkit-1.11.2-Double2Ints.patch +++ b/webkit-1.11.2-Double2Ints.patch @@ -1,21 +1,20 @@ -Index: Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -=================================================================== ---- webkitgtk-1.11.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (Revision 137796) -+++ webkitgtk-1.11.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (Arbeitskopie) -@@ -116,6 +116,17 @@ +diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.double2ints webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +--- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.double2ints 2013-02-12 17:22:38.000000000 +0100 ++++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-03-07 18:04:39.778807991 +0100 +@@ -117,6 +118,17 @@ static double Ints2Double(uint32_t lo, u u.ival64 = (static_cast(hi) << 32) | lo; return u.dval; } + -+static void Double2Ints(double input, intptr_t lo, intptr_t hi) ++static void Double2Ints(double input, intptr_t& lo, intptr_t& hi) +{ + union { + double dval; + int64_t ival64; + } u; + u.dval = input; -+ *(reinterpret_cast(hi)) = static_cast(u.ival64 >> 32); -+ *(reinterpret_cast(lo)) = static_cast(u.ival64); ++ hi = static_cast(u.ival64 >> 32); ++ lo = static_cast(u.ival64); +} #endif // USE(JSVALUE32_64) diff --git a/webkit-1.11.90-double2intsPPC32.patch b/webkit-1.11.90-double2intsPPC32.patch new file mode 100644 index 0000000..be35493 --- /dev/null +++ b/webkit-1.11.90-double2intsPPC32.patch @@ -0,0 +1,40 @@ +diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +--- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 2013-03-07 17:55:22.488831605 +0100 ++++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-03-07 17:56:04.998829804 +0100 +@@ -1729,7 +1729,7 @@ _llint_op_next_pname: + loadi 20[PC], t2 + loadi PayloadOffset[cfr, t2, 8], t2 + loadp JSPropertyNameIterator::m_jsStrings[t2], t3 +- loadi [t3, t0, 8], t3 ++ loadi PayloadOffset[t3, t0, 8], t3 + addi 1, t0 + storei t0, PayloadOffset[cfr, t1, 8] + loadi 4[PC], t1 +diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm +--- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 2013-03-07 17:56:24.953828958 +0100 ++++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-03-07 17:58:05.653824691 +0100 +@@ -263,13 +263,13 @@ macro assertNotConstant(index) + end + + macro functionForCallCodeBlockGetter(targetRegister) +- loadp Callee[cfr], targetRegister ++ loadp Callee + PayloadOffset[cfr], targetRegister + loadp JSFunction::m_executable[targetRegister], targetRegister + loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister + end + + macro functionForConstructCodeBlockGetter(targetRegister) +- loadp Callee[cfr], targetRegister ++ loadp Callee + PayloadOffset[cfr], targetRegister + loadp JSFunction::m_executable[targetRegister], targetRegister + loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister + end +@@ -824,7 +824,7 @@ macro interpretResolveWithBase(opcodeLen + getResolveOperation(4, t0) + btpz t0, .slowPath + +- loadp ScopeChain[cfr], t3 ++ loadp ScopeChain + PayloadOffset[cfr], t3 + # Get the base + loadis ResolveOperation::m_operation[t0], t2 + diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 8d2b13b..a14af33 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.11.90 -Release: 3%{?dist} +Version: 1.11.91 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -25,7 +25,8 @@ Patch4: webkit-1.11.2-yarr.patch Patch5: webkit-1.11.2-includes.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch6: webkit-1.11.2-Double2Ints.patch -Patch10: webkitgtk-1.11.5-libatomic.patch +Patch7: webkitgtk-1.11.5-libatomic.patch +Patch8: webkit-1.11.90-double2intsPPC32.patch BuildRequires: bison BuildRequires: cairo-devel @@ -97,7 +98,8 @@ This package contains developer documentation for %{name}. %patch5 -p1 -b .includes %patch6 -p1 -b .double2ints %ifarch ppc -%patch10 -p1 -b .libatomic +%patch7 -p1 -b .libatomic +%patch8 -p1 -b .double2intsPPC32 %endif %build @@ -220,6 +222,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Fri Mar 08 2013 Tomas Popela 1.11.91-1 +- Update to 1.11.91 +- Fix for RH bug #915990 - Seed segfaults in JSC::LLInt::CLoop::execute() + * Mon Feb 25 2013 Tomas Popela 1.11.90-3 - Fix for not building on ppc32 with JIT disabled From 2d4347bc2e76a07a8a0d6e8260730dfc91b0410e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 21 Mar 2013 00:59:37 +0100 Subject: [PATCH 087/211] Update to 1.11.92 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a21a0de..9aebe8d 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ webkit-1.3.3.tar.gz /webkitgtk-1.11.5.tar.xz /webkitgtk-1.11.90.tar.xz /webkitgtk-1.11.91.tar.xz +/webkitgtk-1.11.92.tar.xz diff --git a/sources b/sources index 487bf4b..d13faf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01ede85baaac85c6eb065a2e121bc9d4 webkitgtk-1.11.91.tar.xz +05ef324d92762b344be631817b2d19fb webkitgtk-1.11.92.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index a14af33..a467d1b 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.11.91 +Version: 1.11.92 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -162,7 +162,6 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete ## Finally, copy over and rename the various files for %%doc inclusion. %add_to_doc_files Source/WebKit/LICENSE -%add_to_doc_files Source/WebKit/gtk/po/README %add_to_doc_files Source/WebKit/gtk/NEWS %add_to_doc_files Source/WebCore/icu/LICENSE %add_to_doc_files Source/WebCore/LICENSE-APPLE @@ -222,6 +221,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Mar 20 2013 Kalev Lember - 1.11.92-1 +- Update to 1.11.92 + * Fri Mar 08 2013 Tomas Popela 1.11.91-1 - Update to 1.11.91 - Fix for RH bug #915990 - Seed segfaults in JSC::LLInt::CLoop::execute() From 25d8f0c8fa1c04a1e0aca8dc966a64c00c294d44 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 27 Mar 2013 12:47:29 +0100 Subject: [PATCH 088/211] Update to 2.0.0, update BR versions, drop unused patches --- .gitignore | 1 + sources | 2 +- webkit-1.11.2-includes.patch | 11 --------- webkit-1.3.4-no-execmem.patch | 12 ---------- webkitgtk3.spec | 43 +++++++++++++++++------------------ 5 files changed, 23 insertions(+), 46 deletions(-) delete mode 100644 webkit-1.11.2-includes.patch delete mode 100644 webkit-1.3.4-no-execmem.patch diff --git a/.gitignore b/.gitignore index 9aebe8d..405fc95 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ webkit-1.3.3.tar.gz /webkitgtk-1.11.90.tar.xz /webkitgtk-1.11.91.tar.xz /webkitgtk-1.11.92.tar.xz +/webkitgtk-2.0.0.tar.xz diff --git a/sources b/sources index d13faf1..a104b6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05ef324d92762b344be631817b2d19fb webkitgtk-1.11.92.tar.xz +fa231ba8c9cd33575b9692614324be21 webkitgtk-2.0.0.tar.xz diff --git a/webkit-1.11.2-includes.patch b/webkit-1.11.2-includes.patch deleted file mode 100644 index ccc11a1..0000000 --- a/webkit-1.11.2-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up webkitgtk-1.11.2/Source/JavaScriptCore/runtime/ArrayConstructor.h.includes webkitgtk-1.11.2/Source/JavaScriptCore/runtime/ArrayConstructor.h ---- webkitgtk-1.11.2/Source/JavaScriptCore/runtime/ArrayConstructor.h.includes 2012-12-16 23:12:06.000000000 +0100 -+++ webkitgtk-1.11.2/Source/JavaScriptCore/runtime/ArrayConstructor.h 2012-12-16 23:12:21.000000000 +0100 -@@ -21,6 +21,7 @@ - #ifndef ArrayConstructor_h - #define ArrayConstructor_h - -+#include "ArrayAllocationProfile.h" - #include "InternalFunction.h" - - namespace JSC { diff --git a/webkit-1.3.4-no-execmem.patch b/webkit-1.3.4-no-execmem.patch deleted file mode 100644 index 1572749..0000000 --- a/webkit-1.3.4-no-execmem.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur webkit-1.3.4.orig/Source/JavaScriptCore/wtf/Platform.h webkit-1.3.4/Source/JavaScriptCore/wtf/Platform.h ---- webkit-1.3.4.orig/Source/JavaScriptCore/wtf/Platform.h 2010-09-22 13:09:17.000000000 -0600 -+++ webkit-1.3.4/Source/JavaScriptCore/wtf/Platform.h 2010-09-23 12:13:19.692721521 -0600 -@@ -1025,7 +1025,7 @@ - #endif - /* Setting this flag prevents the assembler from using RWX memory; this may improve - security but currectly comes at a significant performance cost. */ --#if PLATFORM(IOS) -+#if PLATFORM(IOS) || PLATFORM(X86) || PLATFORM(X86_64) - #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1 - #endif - diff --git a/webkitgtk3.spec b/webkitgtk3.spec index a467d1b..ee07d13 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 1.11.92 +Version: 2.0.0 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -16,24 +16,21 @@ URL: http://www.webkitgtk.org/ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz -Patch1: webkit-1.3.4-no-execmem.patch -Patch2: webkit-1.1.14-nspluginwrapper.patch +Patch0: webkit-1.1.14-nspluginwrapper.patch # workarounds for non-JIT arches # https://bugs.webkit.org/show_bug.cgi?id=104270 -Patch4: webkit-1.11.2-yarr.patch -# https://bugs.webkit.org/show_bug.cgi?id=105295 -Patch5: webkit-1.11.2-includes.patch +Patch1: webkit-1.11.2-yarr.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 -Patch6: webkit-1.11.2-Double2Ints.patch -Patch7: webkitgtk-1.11.5-libatomic.patch -Patch8: webkit-1.11.90-double2intsPPC32.patch +Patch2: webkit-1.11.2-Double2Ints.patch +Patch3: webkitgtk-1.11.5-libatomic.patch +Patch4: webkit-1.11.90-double2intsPPC32.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: chrpath BuildRequires: enchant-devel BuildRequires: flex -BuildRequires: fontconfig-devel +BuildRequires: fontconfig-devel >= 2.5 BuildRequires: freetype-devel BuildRequires: geoclue-devel BuildRequires: gettext @@ -41,10 +38,11 @@ BuildRequires: gperf BuildRequires: gstreamer1-devel BuildRequires: gstreamer1-plugins-base-devel BuildRequires: gtk2-devel -BuildRequires: gtk3-devel >= 3.0 +BuildRequires: gtk3-devel >= 3.6 BuildRequires: gtk-doc +BuildRequires: glib2-devel >= 2.36.0 BuildRequires: harfbuzz-devel -BuildRequires: libsoup-devel >= 2.37.2.1 +BuildRequires: libsoup-devel >= 2.42.0 BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -54,7 +52,7 @@ BuildRequires: libxslt-devel BuildRequires: libXt-devel BuildRequires: pcre-devel BuildRequires: sqlite-devel -BuildRequires: gobject-introspection-devel +BuildRequires: gobject-introspection-devel >= 1.32.0 BuildRequires: perl-Switch BuildRequires: ruby BuildRequires: mesa-libGL-devel @@ -91,15 +89,12 @@ This package contains developer documentation for %{name}. %prep %setup -qn "webkitgtk-%{version}" -# tbzatek - doesn't apply, is this fixed? -# %patch1 -p1 -b .no-execmem -%patch2 -p1 -b .nspluginwrapper -%patch4 -p1 -b .yarr -%patch5 -p1 -b .includes -%patch6 -p1 -b .double2ints +%patch0 -p1 -b .nspluginwrapper +%patch1 -p1 -b .yarr +%patch2 -p1 -b .double2ints %ifarch ppc -%patch7 -p1 -b .libatomic -%patch8 -p1 -b .double2intsPPC32 +%patch3 -p1 -b .libatomic +%patch4 -p1 -b .double2intsPPC32 %endif %build @@ -121,7 +116,6 @@ This package contains developer documentation for %{name}. # https://bugs.webkit.org/show_bug.cgi?id=91154 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') -# explicitly disable JIT on ARM https://bugs.webkit.org/show_bug.cgi?id=85076 CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ --with-gtk=3.0 \ %ifarch s390 s390x ppc ppc64 @@ -221,6 +215,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Mar 27 2013 Tomas Popela - 2.0.0-1 +- Update to 2.0.0 +- Update BR versions +- Drop unused patches + * Wed Mar 20 2013 Kalev Lember - 1.11.92-1 - Update to 1.11.92 From 2f9cccd61422f5e71a2535401ff5571f858d767b Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 3 Apr 2013 10:00:09 +0200 Subject: [PATCH 089/211] Apply double2intsPPC32.patch also on s390 --- webkitgtk3.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index ee07d13..ec34af2 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -94,6 +94,9 @@ This package contains developer documentation for %{name}. %patch2 -p1 -b .double2ints %ifarch ppc %patch3 -p1 -b .libatomic +%endif +# required for 32-bit big-endians +%ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif @@ -215,6 +218,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Apr 3 2013 Tomas Popela - 2.0.0-2 +- Apply double2intsPPC32.patch also on s390 + * Wed Mar 27 2013 Tomas Popela - 2.0.0-1 - Update to 2.0.0 - Update BR versions From 2f473572565ba064af4675727190966f897f4e78 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 11 Apr 2013 11:24:46 +0200 Subject: [PATCH 090/211] Add fix for broken GObject casting --- webkit-dom-casting.patch | 1846 ++++++++++++++++++++++++++++++++++++++ webkitgtk3.spec | 8 +- 2 files changed, 1853 insertions(+), 1 deletion(-) create mode 100644 webkit-dom-casting.patch diff --git a/webkit-dom-casting.patch b/webkit-dom-casting.patch new file mode 100644 index 0000000..1b0b506 --- /dev/null +++ b/webkit-dom-casting.patch @@ -0,0 +1,1846 @@ +diff -up webkitgtk-2.0.0/GNUmakefile.in.dom_casting2 webkitgtk-2.0.0/GNUmakefile.in +--- webkitgtk-2.0.0/GNUmakefile.in.dom_casting2 2013-04-10 10:40:28.213038314 +0200 ++++ webkitgtk-2.0.0/GNUmakefile.in 2013-04-10 10:42:24.823033373 +0200 +@@ -5648,11 +5648,11 @@ libWebCoreDOM_la_LIBADD = + am_libWebCoreDOM_la_OBJECTS = Source/WebCore/bindings/gobject/libWebCoreDOM_la-ConvertToUTF8String.lo \ + Source/WebCore/bindings/gobject/libWebCoreDOM_la-DOMObjectCache.lo \ + Source/WebCore/bindings/gobject/libWebCoreDOM_la-GObjectEventListener.lo \ +- Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo \ ++ Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo \ + Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.lo \ + Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMEventTarget.lo \ + Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMObject.lo \ +- Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo ++ Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo + @ENABLE_VIDEO_TRUE@am__objects_16 = DerivedSources/webkitdom/libWebCoreDOM_la-WebKitDOMHTMLAudioElement.lo \ + @ENABLE_VIDEO_TRUE@ DerivedSources/webkitdom/libWebCoreDOM_la-WebKitDOMHTMLVideoElement.lo \ + @ENABLE_VIDEO_TRUE@ DerivedSources/webkitdom/libWebCoreDOM_la-WebKitDOMTextTrack.lo \ +@@ -21362,8 +21362,8 @@ libWebCoreDOM_la_SOURCES = \ + Source/WebCore/bindings/gobject/DOMObjectCache.h \ + Source/WebCore/bindings/gobject/GObjectEventListener.cpp \ + Source/WebCore/bindings/gobject/GObjectEventListener.h \ +- Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp \ +- Source/WebCore/bindings/gobject/WebKitDOMBinding.h \ ++ Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp \ ++ Source/WebCore/bindings/gobject/WebKitDOMPrivate.h \ + Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp \ + Source/WebCore/bindings/gobject/WebKitDOMCustom.h \ + Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp \ +@@ -21371,8 +21371,8 @@ libWebCoreDOM_la_SOURCES = \ + Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \ + Source/WebCore/bindings/gobject/WebKitDOMObject.cpp \ + Source/WebCore/bindings/gobject/WebKitDOMObject.h \ +- Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp \ +- Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h ++ Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp \ ++ Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.h + + libWebCoreDOM_la_CXXFLAGS = \ + -fvisibility-inlines-hidden \ +@@ -29457,7 +29457,7 @@ Source/WebCore/bindings/gobject/libWebCo + Source/WebCore/bindings/gobject/libWebCoreDOM_la-GObjectEventListener.lo: \ + Source/WebCore/bindings/gobject/$(am__dirstamp) \ + Source/WebCore/bindings/gobject/$(DEPDIR)/$(am__dirstamp) +-Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo: \ ++Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo: \ + Source/WebCore/bindings/gobject/$(am__dirstamp) \ + Source/WebCore/bindings/gobject/$(DEPDIR)/$(am__dirstamp) + Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.lo: \ +@@ -29469,7 +29469,7 @@ Source/WebCore/bindings/gobject/libWebCo + Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMObject.lo: \ + Source/WebCore/bindings/gobject/$(am__dirstamp) \ + Source/WebCore/bindings/gobject/$(DEPDIR)/$(am__dirstamp) +-Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo: \ ++Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo: \ + Source/WebCore/bindings/gobject/$(am__dirstamp) \ + Source/WebCore/bindings/gobject/$(DEPDIR)/$(am__dirstamp) + DerivedSources/webkitdom/$(am__dirstamp): +@@ -40757,16 +40757,16 @@ mostlyclean-compile: + -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-DOMObjectCache.lo + -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-GObjectEventListener.$(OBJEXT) + -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-GObjectEventListener.lo +- -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.$(OBJEXT) +- -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo ++ -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.$(OBJEXT) ++ -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo + -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.$(OBJEXT) + -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.lo + -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMEventTarget.$(OBJEXT) + -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMEventTarget.lo + -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMObject.$(OBJEXT) + -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMObject.lo +- -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.$(OBJEXT) +- -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo ++ -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.$(OBJEXT) ++ -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo + -rm -f Source/WebCore/bindings/js/libWebCoreInternals_la-JSDOMWrapper.$(OBJEXT) + -rm -f Source/WebCore/bindings/js/libWebCoreInternals_la-JSDOMWrapper.lo + -rm -f Source/WebCore/bindings/js/libWebCoreSVG_la-JSSVGElementInstanceCustom.$(OBJEXT) +@@ -47572,11 +47572,11 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-ConvertToUTF8String.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-DOMObjectCache.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-GObjectEventListener.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMBinding.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMPrivate.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMCustom.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMEventTarget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMObject.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMHTMLPrivate.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/js/$(DEPDIR)/libWebCoreInternals_la-JSDOMWrapper.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/js/$(DEPDIR)/libWebCoreSVG_la-JSSVGElementInstanceCustom.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/js/$(DEPDIR)/libWebCoreSVG_la-JSSVGLengthCustom.Plo@am__quote@ +@@ -64907,12 +64907,12 @@ Source/WebCore/bindings/gobject/libWebCo + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-GObjectEventListener.lo `test -f 'Source/WebCore/bindings/gobject/GObjectEventListener.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/GObjectEventListener.cpp + +-Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo: Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp +-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -MT Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo -MD -MP -MF Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMBinding.Tpo -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp +-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMBinding.Tpo Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMBinding.Plo +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp' object='Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo' libtool=yes @AMDEPBACKSLASH@ ++Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo: Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp ++@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -MT Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo -MD -MP -MF Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMPrivate.Tpo -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp ++@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMPrivate.Tpo Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMPrivate.Plo ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp' object='Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp ++@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp + + Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.lo: Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp + @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -MT Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.lo -MD -MP -MF Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMCustom.Tpo -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp +@@ -64935,12 +64935,12 @@ Source/WebCore/bindings/gobject/libWebCo + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMObject.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMObject.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMObject.cpp + +-Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo: Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp +-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -MT Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo -MD -MP -MF Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.Tpo -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo `test -f 'Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp +-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.Tpo Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.Plo +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp' object='Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo' libtool=yes @AMDEPBACKSLASH@ ++Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo: Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp ++@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -MT Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo -MD -MP -MF Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMHTMLPrivate.Tpo -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp ++@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMHTMLPrivate.Tpo Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMHTMLPrivate.Plo ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp' object='Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo `test -f 'Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp ++@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp + + DerivedSources/webkitdom/libWebCoreDOM_la-WebKitDOMAttr.lo: DerivedSources/webkitdom/WebKitDOMAttr.cpp + @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -MT DerivedSources/webkitdom/libWebCoreDOM_la-WebKitDOMAttr.lo -MD -MP -MF DerivedSources/webkitdom/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMAttr.Tpo -c -o DerivedSources/webkitdom/libWebCoreDOM_la-WebKitDOMAttr.lo `test -f 'DerivedSources/webkitdom/WebKitDOMAttr.cpp' || echo '$(srcdir)/'`DerivedSources/webkitdom/WebKitDOMAttr.cpp +diff -up webkitgtk-2.0.0/Source/WebCore/bindings/gobject/GNUmakefile.am.dom_casting2 webkitgtk-2.0.0/Source/WebCore/bindings/gobject/GNUmakefile.am +--- webkitgtk-2.0.0/Source/WebCore/bindings/gobject/GNUmakefile.am.dom_casting2 2013-03-26 19:25:17.000000000 +0100 ++++ webkitgtk-2.0.0/Source/WebCore/bindings/gobject/GNUmakefile.am 2013-04-10 10:38:53.633042322 +0200 +@@ -499,23 +499,23 @@ nodist_libWebCoreDOM_la_SOURCES = \ + $(webkitgtk_gdom_built_sources) + + libWebCoreDOM_la_SOURCES = \ +- Source/WebCore/bindings/gobject/ConvertToUTF8String.cpp \ +- Source/WebCore/bindings/gobject/ConvertToUTF8String.h \ +- Source/WebCore/bindings/gobject/DOMObjectCache.cpp \ +- Source/WebCore/bindings/gobject/DOMObjectCache.h \ +- Source/WebCore/bindings/gobject/GObjectEventListener.cpp \ +- Source/WebCore/bindings/gobject/GObjectEventListener.h \ +- Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp \ +- Source/WebCore/bindings/gobject/WebKitDOMBinding.h \ +- Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp \ +- Source/WebCore/bindings/gobject/WebKitDOMCustom.h \ +- Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp \ +- Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h \ +- Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \ +- Source/WebCore/bindings/gobject/WebKitDOMObject.cpp \ +- Source/WebCore/bindings/gobject/WebKitDOMObject.h \ +- Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp \ +- Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h ++ Source/WebCore/bindings/gobject/ConvertToUTF8String.cpp \ ++ Source/WebCore/bindings/gobject/ConvertToUTF8String.h \ ++ Source/WebCore/bindings/gobject/DOMObjectCache.cpp \ ++ Source/WebCore/bindings/gobject/DOMObjectCache.h \ ++ Source/WebCore/bindings/gobject/GObjectEventListener.cpp \ ++ Source/WebCore/bindings/gobject/GObjectEventListener.h \ ++ Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp \ ++ Source/WebCore/bindings/gobject/WebKitDOMCustom.h \ ++ Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp \ ++ Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h \ ++ Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \ ++ Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp \ ++ Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.h \ ++ Source/WebCore/bindings/gobject/WebKitDOMObject.cpp \ ++ Source/WebCore/bindings/gobject/WebKitDOMObject.h \ ++ Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp \ ++ Source/WebCore/bindings/gobject/WebKitDOMPrivate.h + + libWebCoreDOM_la_CXXFLAGS = \ + -fvisibility-inlines-hidden \ +diff --git a/Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp b/Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp +deleted file mode 100644 +index a8a8114..0000000 +--- a/Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp ++++ /dev/null +@@ -1,151 +0,0 @@ +-/* +- * Copyright (C) 1999-2001 Harri Porten (porten@kde.org) +- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. +- * Copyright (C) 2007 Samuel Weinig +- * Copyright (C) 2008 Luke Kenneth Casson Leighton +- * Copyright (C) 2008 Martin Soto +- * Copyright (C) 2009, 2010 Igalia S.L. +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Lesser General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Lesser General Public License for more details. +- * +- * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +- */ +- +-#include "config.h" +-#include "WebKitDOMBinding.h" +- +-#include "DOMObjectCache.h" +-#include "Element.h" +-#include "Event.h" +-#include "EventException.h" +-#include "HTMLNames.h" +-#include "MouseEvent.h" +-#include "UIEvent.h" +-#include "WebKitDOMDOMWindowPrivate.h" +-#include "WebKitDOMElementPrivate.h" +-#include "WebKitDOMEventPrivate.h" +-#include "WebKitDOMMouseEventPrivate.h" +-#include "WebKitDOMNode.h" +-#include "WebKitDOMNodePrivate.h" +-#include "WebKitDOMUIEventPrivate.h" +-#include "WebKitHTMLElementWrapperFactory.h" +- +-namespace WebKit { +- +-using namespace WebCore; +-using namespace WebCore::HTMLNames; +- +-// kit methods +- +-static gpointer createWrapper(Node* node) +-{ +- ASSERT(node); +- ASSERT(node->nodeType()); +- +- gpointer wrappedNode = 0; +- +- switch (node->nodeType()) { +- case Node::ELEMENT_NODE: +- if (node->isHTMLElement()) +- wrappedNode = createHTMLElementWrapper(toHTMLElement(node)); +- else +- wrappedNode = wrapElement(static_cast(node)); +- break; +- default: +- wrappedNode = wrapNode(node); +- break; +- } +- +- return wrappedNode; +-} +- +-WebKitDOMNode* kit(Node* node) +-{ +- if (!node) +- return 0; +- +- gpointer kitNode = DOMObjectCache::get(node); +- if (kitNode) +- return static_cast(kitNode); +- +- return static_cast(createWrapper(node)); +-} +- +-WebKitDOMElement* kit(Element* element) +-{ +- if (!element) +- return 0; +- +- gpointer kitElement = DOMObjectCache::get(element); +- if (kitElement) +- return static_cast(kitElement); +- +- gpointer wrappedElement; +- +- if (element->isHTMLElement()) +- wrappedElement = createHTMLElementWrapper(toHTMLElement(element)); +- else +- wrappedElement = wrapElement(element); +- +- return static_cast(wrappedElement); +-} +- +-WebKitDOMEvent* kit(Event* event) +-{ +- if (!event) +- return 0; +- +- gpointer kitEvent = DOMObjectCache::get(event); +- if (kitEvent) +- return static_cast(kitEvent); +- +- gpointer wrappedEvent; +- +- if (event->isMouseEvent()) +- wrappedEvent = wrapMouseEvent(static_cast(event)); +- else if (event->isUIEvent()) +- wrappedEvent = wrapUIEvent(static_cast(event)); +- else +- wrappedEvent = wrapEvent(event); +- +- return static_cast(wrappedEvent); +-} +- +-static gpointer wrapEventTarget(EventTarget* target) +-{ +- ASSERT(target); +- +- gpointer wrappedTarget = 0; +- +- if (target->toNode()) { +- Node* node = target->toNode(); +- wrappedTarget = wrapNode(node); +- } else if (target->toDOMWindow()) { +- DOMWindow* window = target->toDOMWindow(); +- wrappedTarget = wrapDOMWindow(window); +- } +- +- return wrappedTarget; +-} +- +-WebKitDOMEventTarget* kit(WebCore::EventTarget* obj) +-{ +- g_return_val_if_fail(obj, 0); +- +- if (gpointer ret = DOMObjectCache::get(obj)) +- return static_cast(ret); +- +- return static_cast(wrapEventTarget(obj)); +-} +- +-} // namespace WebKit +diff --git a/Source/WebCore/bindings/gobject/WebKitDOMBinding.h b/Source/WebCore/bindings/gobject/WebKitDOMBinding.h +deleted file mode 100644 +index ac1f96a..0000000 +--- a/Source/WebCore/bindings/gobject/WebKitDOMBinding.h ++++ /dev/null +@@ -1,47 +0,0 @@ +-/* +- * Copyright (C) 1999-2001 Harri Porten (porten@kde.org) +- * Copyright (C) 2003, 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. +- * Copyright (C) 2007 Samuel Weinig +- * Copyright (C) 2008 Luke Kenneth Casson Leighton +- * Copyright (C) 2008 Martin Soto +- * Copyright (C) 2009-2010 Igalia S.L. +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Lesser General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Lesser General Public License for more details. +- * +- * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +- */ +- +-#ifndef WebKitDOMBinding_h +-#define WebKitDOMBinding_h +- +-#include +- +-#define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)) +-#define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)) +-#define WEBKIT_WARN_FEATURE_NOT_PRESENT(Feature) g_warning("WebKitGTK+ was not compiled with support for " Feature); +- +-namespace WebCore { +-class Node; +-class Element; +-class Event; +-class EventTarget; +-} // namespace WebCore +- +-namespace WebKit { +-WebKitDOMNode* kit(WebCore::Node* node); +-WebKitDOMElement* kit(WebCore::Element* element); +-WebKitDOMEvent* kit(WebCore::Event* event); +-WebKitDOMEventTarget* kit(WebCore::EventTarget* target); +-} // namespace WebKit +- +-#endif // WebKitDOMBinding_h +diff --git a/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp b/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp +index ca8c315d..a7b6611 100644 +--- a/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp ++++ b/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp +@@ -31,8 +31,11 @@ + #include "config.h" + #include "WebKitDOMEventTarget.h" + ++#include "DOMObjectCache.h" ++#include "EventTarget.h" + #include "WebKitDOMEvent.h" + #include "WebKitDOMEventTargetPrivate.h" ++#include "WebKitDOMPrivate.h" + + typedef WebKitDOMEventTargetIface WebKitDOMEventTargetInterface; + #if GLIB_CHECK_VERSION(2, 24, 0) +@@ -104,14 +107,20 @@ gboolean webkit_dom_event_target_remove_event_listener(WebKitDOMEventTarget* tar + + namespace WebKit { + +-WebCore::EventTarget* core(WebKitDOMEventTarget* request) +-{ +- g_return_val_if_fail(request, 0); ++WebKitDOMEventTarget* kit(WebCore::EventTarget* obj) ++ { ++ if (!obj) ++ return 0; ++ ++ if (gpointer ret = DOMObjectCache::get(obj)) ++ return WEBKIT_DOM_EVENT_TARGET(ret); + +- WebCore::EventTarget* coreObject = static_cast(WEBKIT_DOM_OBJECT(request)->coreObject); +- g_return_val_if_fail(coreObject, 0); ++ return wrap(obj); ++} + +- return coreObject; ++WebCore::EventTarget* core(WebKitDOMEventTarget* request) ++{ ++ return request ? static_cast(WEBKIT_DOM_OBJECT(request)->coreObject) : 0; + } + + } // namespace WebKit +diff --git a/Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h b/Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h +index ac29471..e79be38 100644 +--- a/Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h ++++ b/Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h +@@ -20,11 +20,15 @@ + #ifndef WebKitDOMEventTargetPrivate_h + #define WebKitDOMEventTargetPrivate_h + +-#include "EventTarget.h" + #include + ++namespace WebCore { ++class EventTarget; ++} ++ + namespace WebKit { +-WebCore::EventTarget* core(WebKitDOMEventTarget* request); ++WebKitDOMEventTarget* kit(WebCore::EventTarget*); ++WebCore::EventTarget* core(WebKitDOMEventTarget*); + } // namespace WebKit + + #endif /* WebKitDOMEventTargetPrivate_h */ +diff --git a/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp b/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp +new file mode 100644 +index 0000000..6e39c9a +--- /dev/null ++++ b/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp +@@ -0,0 +1,268 @@ ++/* ++ * Copyright (C) 2013 Igalia S.L. ++ * ++ * This file is derived by hand from an automatically generated file. ++ * Keeping it up-to-date could potentially be done by adding ++ * a make_names.pl generator, or by writing a separate ++ * generater which takes JSHTMLElementWrapperFactory.h as input. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY ++ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY ++ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++#include "config.h" ++#include "WebKitDOMHTMLPrivate.h" ++ ++#include "HTMLAnchorElement.h" ++#include "HTMLAppletElement.h" ++#include "HTMLAreaElement.h" ++#include "HTMLAudioElement.h" ++#include "HTMLBRElement.h" ++#include "HTMLBaseElement.h" ++#include "HTMLBaseFontElement.h" ++#include "HTMLBodyElement.h" ++#include "HTMLButtonElement.h" ++#include "HTMLCanvasElement.h" ++#include "HTMLDListElement.h" ++#include "HTMLDirectoryElement.h" ++#include "HTMLDivElement.h" ++#include "HTMLElement.h" ++#include "HTMLEmbedElement.h" ++#include "HTMLFieldSetElement.h" ++#include "HTMLFontElement.h" ++#include "HTMLFormElement.h" ++#include "HTMLFrameElement.h" ++#include "HTMLFrameSetElement.h" ++#include "HTMLHRElement.h" ++#include "HTMLHeadElement.h" ++#include "HTMLHeadingElement.h" ++#include "HTMLHtmlElement.h" ++#include "HTMLIFrameElement.h" ++#include "HTMLImageElement.h" ++#include "HTMLInputElement.h" ++#include "HTMLKeygenElement.h" ++#include "HTMLLIElement.h" ++#include "HTMLLabelElement.h" ++#include "HTMLLegendElement.h" ++#include "HTMLLinkElement.h" ++#include "HTMLMapElement.h" ++#include "HTMLMarqueeElement.h" ++#include "HTMLMenuElement.h" ++#include "HTMLMetaElement.h" ++#include "HTMLModElement.h" ++#include "HTMLNames.h" ++#include "HTMLOListElement.h" ++#include "HTMLObjectElement.h" ++#include "HTMLOptGroupElement.h" ++#include "HTMLOptionElement.h" ++#include "HTMLParagraphElement.h" ++#include "HTMLParamElement.h" ++#include "HTMLPreElement.h" ++#include "HTMLQuoteElement.h" ++#include "HTMLScriptElement.h" ++#include "HTMLSelectElement.h" ++#include "HTMLStyleElement.h" ++#include "HTMLTableCaptionElement.h" ++#include "HTMLTableCellElement.h" ++#include "HTMLTableColElement.h" ++#include "HTMLTableElement.h" ++#include "HTMLTableRowElement.h" ++#include "HTMLTableSectionElement.h" ++#include "HTMLTextAreaElement.h" ++#include "HTMLTitleElement.h" ++#include "HTMLUListElement.h" ++#include "HTMLVideoElement.h" ++#include "WebKitDOMHTMLAnchorElementPrivate.h" ++#include "WebKitDOMHTMLAppletElementPrivate.h" ++#include "WebKitDOMHTMLAreaElementPrivate.h" ++#include "WebKitDOMHTMLBRElementPrivate.h" ++#include "WebKitDOMHTMLBaseElementPrivate.h" ++#include "WebKitDOMHTMLBaseFontElementPrivate.h" ++#include "WebKitDOMHTMLBodyElementPrivate.h" ++#include "WebKitDOMHTMLButtonElementPrivate.h" ++#include "WebKitDOMHTMLCanvasElementPrivate.h" ++#include "WebKitDOMHTMLDListElementPrivate.h" ++#include "WebKitDOMHTMLDirectoryElementPrivate.h" ++#include "WebKitDOMHTMLDivElementPrivate.h" ++#include "WebKitDOMHTMLElementPrivate.h" ++#include "WebKitDOMHTMLEmbedElementPrivate.h" ++#include "WebKitDOMHTMLFieldSetElementPrivate.h" ++#include "WebKitDOMHTMLFontElementPrivate.h" ++#include "WebKitDOMHTMLFormElementPrivate.h" ++#include "WebKitDOMHTMLFrameElementPrivate.h" ++#include "WebKitDOMHTMLFrameSetElementPrivate.h" ++#include "WebKitDOMHTMLHRElementPrivate.h" ++#include "WebKitDOMHTMLHeadElementPrivate.h" ++#include "WebKitDOMHTMLHeadingElementPrivate.h" ++#include "WebKitDOMHTMLHtmlElementPrivate.h" ++#include "WebKitDOMHTMLIFrameElementPrivate.h" ++#include "WebKitDOMHTMLImageElementPrivate.h" ++#include "WebKitDOMHTMLInputElementPrivate.h" ++#include "WebKitDOMHTMLKeygenElementPrivate.h" ++#include "WebKitDOMHTMLLIElementPrivate.h" ++#include "WebKitDOMHTMLLabelElementPrivate.h" ++#include "WebKitDOMHTMLLegendElementPrivate.h" ++#include "WebKitDOMHTMLLinkElementPrivate.h" ++#include "WebKitDOMHTMLMapElementPrivate.h" ++#include "WebKitDOMHTMLMarqueeElementPrivate.h" ++#include "WebKitDOMHTMLMenuElementPrivate.h" ++#include "WebKitDOMHTMLMetaElementPrivate.h" ++#include "WebKitDOMHTMLModElementPrivate.h" ++#include "WebKitDOMHTMLOListElementPrivate.h" ++#include "WebKitDOMHTMLObjectElementPrivate.h" ++#include "WebKitDOMHTMLOptGroupElementPrivate.h" ++#include "WebKitDOMHTMLOptionElementPrivate.h" ++#include "WebKitDOMHTMLParagraphElementPrivate.h" ++#include "WebKitDOMHTMLParamElementPrivate.h" ++#include "WebKitDOMHTMLPreElementPrivate.h" ++#include "WebKitDOMHTMLQuoteElementPrivate.h" ++#include "WebKitDOMHTMLScriptElementPrivate.h" ++#include "WebKitDOMHTMLSelectElementPrivate.h" ++#include "WebKitDOMHTMLStyleElementPrivate.h" ++#include "WebKitDOMHTMLTableCaptionElementPrivate.h" ++#include "WebKitDOMHTMLTableCellElementPrivate.h" ++#include "WebKitDOMHTMLTableColElementPrivate.h" ++#include "WebKitDOMHTMLTableElementPrivate.h" ++#include "WebKitDOMHTMLTableRowElementPrivate.h" ++#include "WebKitDOMHTMLTableSectionElementPrivate.h" ++#include "WebKitDOMHTMLTextAreaElementPrivate.h" ++#include "WebKitDOMHTMLTitleElementPrivate.h" ++#include "WebKitDOMHTMLUListElementPrivate.h" ++ ++#if ENABLE(VIDEO) ++#include "WebKitDOMHTMLAudioElementPrivate.h" ++#include "WebKitDOMHTMLVideoElementPrivate.h" ++#endif ++ ++namespace WebKit { ++ ++using namespace WebCore; ++using namespace WebCore::HTMLNames; ++ ++// macro(TagName, ElementName) ++ ++#if ENABLE(VIDEO) ++#define FOR_EACH_HTML_VIDEO_TAG(macro) \ ++ macro(audio, Audio) \ ++ macro(video, Video) ++#else ++#define FOR_EACH_HTML_VIDEO_TAG(macro) ++#endif ++ ++#define FOR_EACH_HTML_TAG(macro) \ ++ FOR_EACH_HTML_VIDEO_TAG(macro) \ ++ macro(a, Anchor) \ ++ macro(applet, Applet) \ ++ macro(area, Area) \ ++ macro(base, Base) \ ++ macro(basefont, BaseFont) \ ++ macro(blockquote, Quote) \ ++ macro(body, Body) \ ++ macro(br, BR) \ ++ macro(button, Button) \ ++ macro(canvas, Canvas) \ ++ macro(caption, TableCaption) \ ++ macro(col, TableCol) \ ++ macro(del, Mod) \ ++ macro(dir, Directory) \ ++ macro(div, Div) \ ++ macro(dl, DList) \ ++ macro(embed, Embed) \ ++ macro(fieldset, FieldSet) \ ++ macro(font, Font) \ ++ macro(form, Form) \ ++ macro(frame, Frame) \ ++ macro(frameset, FrameSet) \ ++ macro(h1, Heading) \ ++ macro(head, Head) \ ++ macro(hr, HR) \ ++ macro(html, Html) \ ++ macro(iframe, IFrame) \ ++ macro(img, Image) \ ++ macro(input, Input) \ ++ macro(label, Label) \ ++ macro(legend, Legend) \ ++ macro(li, LI) \ ++ macro(link, Link) \ ++ macro(map, Map) \ ++ macro(marquee, Marquee) \ ++ macro(menu, Menu) \ ++ macro(meta, Meta) \ ++ macro(object, Object) \ ++ macro(ol, OList) \ ++ macro(optgroup, OptGroup) \ ++ macro(option, Option) \ ++ macro(p, Paragraph) \ ++ macro(param, Param) \ ++ macro(pre, Pre) \ ++ macro(q, Quote) \ ++ macro(script, Script) \ ++ macro(select, Select) \ ++ macro(style, Style) \ ++ macro(table, Table) \ ++ macro(tbody, TableSection) \ ++ macro(td, TableCell) \ ++ macro(textarea, TextArea) \ ++ macro(title, Title) \ ++ macro(tr, TableRow) \ ++ macro(ul, UList) \ ++ macro(colgroup, TableCol) \ ++ macro(h2, Heading) \ ++ macro(h3, Heading) \ ++ macro(h4, Heading) \ ++ macro(h5, Heading) \ ++ macro(h6, Heading) \ ++ macro(image, Image) \ ++ macro(ins, Mod) \ ++ macro(keygen, Keygen) \ ++ macro(listing, Pre) \ ++ macro(tfoot, TableSection) \ ++ macro(th, TableCell) \ ++ macro(thead, TableSection) \ ++ macro(xmp, Pre) ++ ++#define DEFINE_HTML_WRAPPER(TagName, ElementName) \ ++ static WebKitDOMHTMLElement* TagName##Wrapper(HTMLElement* element) \ ++ { \ ++ return WEBKIT_DOM_HTML_ELEMENT(wrapHTML##ElementName##Element(static_cast(element))); \ ++ } ++ FOR_EACH_HTML_TAG(DEFINE_HTML_WRAPPER) ++#undef DEFINE_HTML_WRAPPER ++ ++typedef WebKitDOMHTMLElement* (*HTMLElementWrapFunction)(HTMLElement*); ++ ++WebKitDOMHTMLElement* wrap(HTMLElement* element) ++{ ++ static HashMap map; ++ if (map.isEmpty()) { ++#define ADD_HTML_WRAPPER(TagName, ElementName) map.set(TagName##Tag.impl(), TagName##Wrapper); ++ FOR_EACH_HTML_TAG(ADD_HTML_WRAPPER) ++#undef ADD_HTML_WRAPPER ++ } ++ ++ if (HTMLElementWrapFunction wrapFunction = map.get(element->tagQName().impl())) ++ return wrapFunction(element); ++ ++ return wrapHTMLElement(element); ++} ++ ++} ++ +diff --git a/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.h b/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.h +new file mode 100644 +index 0000000..097d9c6 +--- /dev/null ++++ b/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.h +@@ -0,0 +1,40 @@ ++/* ++ * Copyright (C) 2013 Igalia S.L. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY ++ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY ++ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++*/ ++ ++#ifndef WebKitDOMHTMLPrivate_h ++#define WebKitDOMHTMLPrivate_h ++ ++#include ++ ++namespace WebCore { ++class HTMLElement; ++} ++ ++namespace WebKit { ++WebKitDOMHTMLElement* wrap(WebCore::HTMLElement*); ++} ++ ++#endif // WebKitDOMHTMLPrivate_h ++ +diff --git a/Source/WebCore/bindings/gobject/WebKitDOMObject.cpp b/Source/WebCore/bindings/gobject/WebKitDOMObject.cpp +index c05add2..22aed1f 100644 +--- a/Source/WebCore/bindings/gobject/WebKitDOMObject.cpp ++++ b/Source/WebCore/bindings/gobject/WebKitDOMObject.cpp +@@ -8,8 +8,6 @@ + #include "config.h" + #include "WebKitDOMObject.h" + +-#include "WebKitDOMBinding.h" +- + enum { + PROP_0, + PROP_CORE_OBJECT +diff --git a/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp b/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp +new file mode 100644 +index 0000000..bf1f85c +--- /dev/null ++++ b/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp +@@ -0,0 +1,162 @@ ++/* ++ * Copyright (C) 1999-2001 Harri Porten (porten@kde.org) ++ * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. ++ * Copyright (C) 2007 Samuel Weinig ++ * Copyright (C) 2008 Luke Kenneth Casson Leighton ++ * Copyright (C) 2008 Martin Soto ++ * Copyright (C) 2009-2013 Igalia S.L. ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#include "config.h" ++#include "WebKitDOMPrivate.h" ++ ++#include "Blob.h" ++#include "DOMObjectCache.h" ++#include "Element.h" ++#include "Event.h" ++#include "EventException.h" ++#include "EventTarget.h" ++#include "File.h" ++#include "HTMLElement.h" ++#include "HTMLNames.h" ++#include "MouseEvent.h" ++#include "StyleSheet.h" ++#include "UIEvent.h" ++#include "WebKitDOMAttrPrivate.h" ++#include "WebKitDOMBlobPrivate.h" ++#include "WebKitDOMCDATASectionPrivate.h" ++#include "WebKitDOMCSSStyleSheetPrivate.h" ++#include "WebKitDOMCommentPrivate.h" ++#include "WebKitDOMDOMWindowPrivate.h" ++#include "WebKitDOMDocumentFragmentPrivate.h" ++#include "WebKitDOMDocumentPrivate.h" ++#include "WebKitDOMDocumentTypePrivate.h" ++#include "WebKitDOMElementPrivate.h" ++#include "WebKitDOMEntityReferencePrivate.h" ++#include "WebKitDOMEventPrivate.h" ++#include "WebKitDOMEventTargetPrivate.h" ++#include "WebKitDOMFilePrivate.h" ++#include "WebKitDOMHTMLCollectionPrivate.h" ++#include "WebKitDOMHTMLDocumentPrivate.h" ++#include "WebKitDOMHTMLOptionsCollectionPrivate.h" ++#include "WebKitDOMHTMLPrivate.h" ++#include "WebKitDOMMouseEventPrivate.h" ++#include "WebKitDOMNodePrivate.h" ++#include "WebKitDOMProcessingInstructionPrivate.h" ++#include "WebKitDOMStyleSheetPrivate.h" ++#include "WebKitDOMTextPrivate.h" ++#include "WebKitDOMUIEventPrivate.h" ++ ++namespace WebKit { ++ ++using namespace WebCore; ++using namespace WebCore::HTMLNames; ++ ++WebKitDOMNode* wrap(Node* node) ++{ ++ ASSERT(node); ++ ASSERT(node->nodeType()); ++ ++ switch (node->nodeType()) { ++ case Node::ELEMENT_NODE: ++ if (node->isHTMLElement()) ++ return WEBKIT_DOM_NODE(wrap(toHTMLElement(node))); ++ return WEBKIT_DOM_NODE(wrapElement(static_cast(node))); ++ case Node::ATTRIBUTE_NODE: ++ return WEBKIT_DOM_NODE(wrapAttr(static_cast(node))); ++ case Node::TEXT_NODE: ++ return WEBKIT_DOM_NODE(wrapText(toText(node))); ++ case Node::CDATA_SECTION_NODE: ++ return WEBKIT_DOM_NODE(wrapCDATASection(static_cast(node))); ++ case Node::ENTITY_REFERENCE_NODE: ++ return WEBKIT_DOM_NODE(wrapEntityReference(static_cast(node))); ++ case Node::PROCESSING_INSTRUCTION_NODE: ++ return WEBKIT_DOM_NODE(wrapProcessingInstruction(static_cast(node))); ++ case Node::COMMENT_NODE: ++ return WEBKIT_DOM_NODE(wrapComment(static_cast(node))); ++ case Node::DOCUMENT_NODE: ++ if (static_cast(node)->isHTMLDocument()) ++ return WEBKIT_DOM_NODE(wrapHTMLDocument(static_cast(node))); ++ return WEBKIT_DOM_NODE(wrapDocument(static_cast(node))); ++ case Node::DOCUMENT_TYPE_NODE: ++ return WEBKIT_DOM_NODE(wrapDocumentType(static_cast(node))); ++ case Node::DOCUMENT_FRAGMENT_NODE: ++ return WEBKIT_DOM_NODE(wrapDocumentFragment(static_cast(node))); ++ case Node::ENTITY_NODE: ++ case Node::NOTATION_NODE: ++ case Node::XPATH_NAMESPACE_NODE: ++ break; ++ } ++ ++ return wrapNode(node); ++} ++ ++WebKitDOMEvent* wrap(Event* event) ++{ ++ ASSERT(event); ++ ++ if (event->isMouseEvent()) ++ return WEBKIT_DOM_EVENT(wrapMouseEvent(static_cast(event))); ++ ++ if (event->isUIEvent()) ++ return WEBKIT_DOM_EVENT(wrapUIEvent(static_cast(event))); ++ ++ return wrapEvent(event); ++} ++ ++WebKitDOMStyleSheet* wrap(StyleSheet* styleSheet) ++{ ++ ASSERT(styleSheet); ++ ++ if (styleSheet->isCSSStyleSheet()) ++ return WEBKIT_DOM_STYLE_SHEET(wrapCSSStyleSheet(static_cast(styleSheet))); ++ return wrapStyleSheet(styleSheet); ++} ++ ++WebKitDOMHTMLCollection* wrap(HTMLCollection* collection) ++{ ++ ASSERT(collection); ++ ++ if (collection->type() == WebCore::SelectOptions) ++ return WEBKIT_DOM_HTML_COLLECTION(wrapHTMLOptionsCollection(static_cast(collection))); ++ return wrapHTMLCollection(collection); ++} ++ ++WebKitDOMEventTarget* wrap(EventTarget* eventTarget) ++{ ++ ASSERT(eventTarget); ++ ++ if (Node* node = eventTarget->toNode()) ++ return WEBKIT_DOM_EVENT_TARGET(kit(node)); ++ ++ if (DOMWindow* window = eventTarget->toDOMWindow()) ++ return WEBKIT_DOM_EVENT_TARGET(kit(window)); ++ ++ return 0; ++} ++ ++WebKitDOMBlob* wrap(Blob* blob) ++{ ++ ASSERT(blob); ++ ++ if (blob->isFile()) ++ return WEBKIT_DOM_BLOB(wrapFile(static_cast(blob))); ++ return wrapBlob(blob); ++} ++ ++} // namespace WebKit ++ +diff --git a/Source/WebCore/bindings/gobject/WebKitDOMPrivate.h b/Source/WebCore/bindings/gobject/WebKitDOMPrivate.h +new file mode 100644 +index 0000000..b18ffe5 +--- /dev/null ++++ b/Source/WebCore/bindings/gobject/WebKitDOMPrivate.h +@@ -0,0 +1,52 @@ ++/* ++ * Copyright (C) 1999-2001 Harri Porten (porten@kde.org) ++ * Copyright (C) 2003, 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. ++ * Copyright (C) 2007 Samuel Weinig ++ * Copyright (C) 2008 Luke Kenneth Casson Leighton ++ * Copyright (C) 2008 Martin Soto ++ * Copyright (C) 2009-2013 Igalia S.L. ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#ifndef WebKitDOMPrivate_h ++#define WebKitDOMPrivate_h ++ ++#include ++ ++#define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)) ++#define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)) ++#define WEBKIT_WARN_FEATURE_NOT_PRESENT(Feature) g_warning("WebKitGTK+ was not compiled with support for " Feature); ++ ++namespace WebCore { ++class Node; ++class Event; ++class StyleSheet; ++class HTMLCollection; ++class EventTarget; ++class Blob; ++} // namespace WebCore ++ ++namespace WebKit { ++WebKitDOMNode* wrap(WebCore::Node*); ++WebKitDOMEvent* wrap(WebCore::Event*); ++WebKitDOMStyleSheet* wrap(WebCore::StyleSheet*); ++WebKitDOMHTMLCollection* wrap(WebCore::HTMLCollection*); ++WebKitDOMEventTarget* wrap(WebCore::EventTarget*); ++WebKitDOMBlob* wrap(WebCore::Blob*); ++} // namespace WebKit ++ ++#endif // WebKitDOMPrivate_h ++ +diff --git a/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp b/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp +deleted file mode 100644 +index d3f2dbd..0000000 +--- a/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp ++++ /dev/null +@@ -1,547 +0,0 @@ +-/* +- * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. +- * Copyright (C) 2008 Luke Kenneth Casson Leighton +- * Copyright (C) 2008 Martin Soto +- * Copyright (C) 2010 Igalia S.L. +- * +- * This file is derived by hand from an automatically generated file. +- * Keeping it up-to-date could potentially be done by adding +- * a make_names.pl generator, or by writing a separate +- * generater which takes JSHTMLElementWrapperFactory.h as input. +- * +- * Redistribution and use in source and binary forms, with or without +- * modification, are permitted provided that the following conditions +- * are met: +- * 1. Redistributions of source code must retain the above copyright +- * notice, this list of conditions and the following disclaimer. +- * 2. Redistributions in binary form must reproduce the above copyright +- * notice, this list of conditions and the following disclaimer in the +- * documentation and/or other materials provided with the distribution. +- * +- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY +- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR +- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +- */ +- +-#include "config.h" +-#include "WebKitHTMLElementWrapperFactory.h" +- +-#include "HTMLAnchorElement.h" +-#include "HTMLAppletElement.h" +-#include "HTMLAreaElement.h" +-#include "HTMLAudioElement.h" +-#include "HTMLBRElement.h" +-#include "HTMLBaseElement.h" +-#include "HTMLBaseFontElement.h" +-#include "HTMLBodyElement.h" +-#include "HTMLButtonElement.h" +-#include "HTMLCanvasElement.h" +-#include "HTMLDListElement.h" +-#include "HTMLDirectoryElement.h" +-#include "HTMLDivElement.h" +-#include "HTMLEmbedElement.h" +-#include "HTMLFieldSetElement.h" +-#include "HTMLFontElement.h" +-#include "HTMLFormElement.h" +-#include "HTMLFrameElement.h" +-#include "HTMLFrameSetElement.h" +-#include "HTMLHRElement.h" +-#include "HTMLHeadElement.h" +-#include "HTMLHeadingElement.h" +-#include "HTMLHtmlElement.h" +-#include "HTMLIFrameElement.h" +-#include "HTMLImageElement.h" +-#include "HTMLInputElement.h" +-#include "HTMLKeygenElement.h" +-#include "HTMLLIElement.h" +-#include "HTMLLabelElement.h" +-#include "HTMLLegendElement.h" +-#include "HTMLLinkElement.h" +-#include "HTMLMapElement.h" +-#include "HTMLMarqueeElement.h" +-#include "HTMLMenuElement.h" +-#include "HTMLMetaElement.h" +-#include "HTMLModElement.h" +-#include "HTMLNames.h" +-#include "HTMLOListElement.h" +-#include "HTMLObjectElement.h" +-#include "HTMLOptGroupElement.h" +-#include "HTMLOptionElement.h" +-#include "HTMLParagraphElement.h" +-#include "HTMLParamElement.h" +-#include "HTMLPreElement.h" +-#include "HTMLQuoteElement.h" +-#include "HTMLScriptElement.h" +-#include "HTMLSelectElement.h" +-#include "HTMLStyleElement.h" +-#include "HTMLTableCaptionElement.h" +-#include "HTMLTableCellElement.h" +-#include "HTMLTableColElement.h" +-#include "HTMLTableElement.h" +-#include "HTMLTableRowElement.h" +-#include "HTMLTableSectionElement.h" +-#include "HTMLTextAreaElement.h" +-#include "HTMLTitleElement.h" +-#include "HTMLUListElement.h" +-#include "HTMLVideoElement.h" +-#include "WebKitDOMHTMLAnchorElementPrivate.h" +-#include "WebKitDOMHTMLAppletElementPrivate.h" +-#include "WebKitDOMHTMLAreaElementPrivate.h" +-#include "WebKitDOMHTMLBRElementPrivate.h" +-#include "WebKitDOMHTMLBaseElementPrivate.h" +-#include "WebKitDOMHTMLBaseFontElementPrivate.h" +-#include "WebKitDOMHTMLBodyElementPrivate.h" +-#include "WebKitDOMHTMLButtonElementPrivate.h" +-#include "WebKitDOMHTMLCanvasElementPrivate.h" +-#include "WebKitDOMHTMLDListElementPrivate.h" +-#include "WebKitDOMHTMLDirectoryElementPrivate.h" +-#include "WebKitDOMHTMLDivElementPrivate.h" +-#include "WebKitDOMHTMLElementPrivate.h" +-#include "WebKitDOMHTMLEmbedElementPrivate.h" +-#include "WebKitDOMHTMLFieldSetElementPrivate.h" +-#include "WebKitDOMHTMLFontElementPrivate.h" +-#include "WebKitDOMHTMLFormElementPrivate.h" +-#include "WebKitDOMHTMLFrameElementPrivate.h" +-#include "WebKitDOMHTMLFrameSetElementPrivate.h" +-#include "WebKitDOMHTMLHRElementPrivate.h" +-#include "WebKitDOMHTMLHeadElementPrivate.h" +-#include "WebKitDOMHTMLHeadingElementPrivate.h" +-#include "WebKitDOMHTMLHtmlElementPrivate.h" +-#include "WebKitDOMHTMLIFrameElementPrivate.h" +-#include "WebKitDOMHTMLImageElementPrivate.h" +-#include "WebKitDOMHTMLInputElementPrivate.h" +-#include "WebKitDOMHTMLKeygenElementPrivate.h" +-#include "WebKitDOMHTMLLIElementPrivate.h" +-#include "WebKitDOMHTMLLabelElementPrivate.h" +-#include "WebKitDOMHTMLLegendElementPrivate.h" +-#include "WebKitDOMHTMLLinkElementPrivate.h" +-#include "WebKitDOMHTMLMapElementPrivate.h" +-#include "WebKitDOMHTMLMarqueeElementPrivate.h" +-#include "WebKitDOMHTMLMenuElementPrivate.h" +-#include "WebKitDOMHTMLMetaElementPrivate.h" +-#include "WebKitDOMHTMLModElementPrivate.h" +-#include "WebKitDOMHTMLOListElementPrivate.h" +-#include "WebKitDOMHTMLObjectElementPrivate.h" +-#include "WebKitDOMHTMLOptGroupElementPrivate.h" +-#include "WebKitDOMHTMLOptionElementPrivate.h" +-#include "WebKitDOMHTMLParagraphElementPrivate.h" +-#include "WebKitDOMHTMLParamElementPrivate.h" +-#include "WebKitDOMHTMLPreElementPrivate.h" +-#include "WebKitDOMHTMLQuoteElementPrivate.h" +-#include "WebKitDOMHTMLScriptElementPrivate.h" +-#include "WebKitDOMHTMLSelectElementPrivate.h" +-#include "WebKitDOMHTMLStyleElementPrivate.h" +-#include "WebKitDOMHTMLTableCaptionElementPrivate.h" +-#include "WebKitDOMHTMLTableCellElementPrivate.h" +-#include "WebKitDOMHTMLTableColElementPrivate.h" +-#include "WebKitDOMHTMLTableElementPrivate.h" +-#include "WebKitDOMHTMLTableRowElementPrivate.h" +-#include "WebKitDOMHTMLTableSectionElementPrivate.h" +-#include "WebKitDOMHTMLTextAreaElementPrivate.h" +-#include "WebKitDOMHTMLTitleElementPrivate.h" +-#include "WebKitDOMHTMLUListElementPrivate.h" +-#include "webkitdom.h" +-#include +- +-#if ENABLE(VIDEO) +-#include "WebKitDOMHTMLAudioElementPrivate.h" +-#include "WebKitDOMHTMLVideoElementPrivate.h" +-#endif +- +-#if ENABLE(VIDEO_TRACK) +-#include "WebKitDOMTextTrackCueListPrivate.h" +-#include "WebKitDOMTextTrackCuePrivate.h" +-#include "WebKitDOMTextTrackListPrivate.h" +-#include "WebKitDOMTextTrackPrivate.h" +-#include "WebKitDOMTrackEventPrivate.h" +-#endif +- +-namespace WebKit { +- +-using namespace WebCore; +-using namespace WebCore::HTMLNames; +- +-typedef gpointer (*CreateHTMLElementWrapperFunction)(PassRefPtr); +- +-static gpointer createAnchorWrapper(PassRefPtr element) +-{ +- return wrapHTMLAnchorElement(static_cast(element.get())); +-} +- +-static gpointer createAppletWrapper(PassRefPtr element) +-{ +- return wrapHTMLAppletElement(static_cast(element.get())); +-} +- +-static gpointer createAreaWrapper(PassRefPtr element) +-{ +- return wrapHTMLAreaElement(static_cast(element.get())); +-} +- +-#if ENABLE(VIDEO) +-static gpointer createAudioWrapper(PassRefPtr element) +-{ +- return wrapHTMLAudioElement(static_cast(element.get())); +-} +- +-static gpointer createVideoWrapper(PassRefPtr element) +-{ +- return wrapHTMLVideoElement(static_cast(element.get())); +-} +-#endif +- +-static gpointer createBaseWrapper(PassRefPtr element) +-{ +- return wrapHTMLBaseElement(static_cast(element.get())); +-} +- +-static gpointer createBaseFontWrapper(PassRefPtr element) +-{ +- return wrapHTMLBaseFontElement(static_cast(element.get())); +-} +- +-static gpointer createBodyWrapper(PassRefPtr element) +-{ +- return wrapHTMLBodyElement(static_cast(element.get())); +-} +- +-static gpointer createBRWrapper(PassRefPtr element) +-{ +- return wrapHTMLBRElement(static_cast(element.get())); +-} +- +-static gpointer createButtonWrapper(PassRefPtr element) +-{ +- return wrapHTMLButtonElement(static_cast(element.get())); +-} +- +-static gpointer createCanvasWrapper(PassRefPtr element) +-{ +- return wrapHTMLCanvasElement(static_cast(element.get())); +-} +- +-static gpointer createTableCaptionWrapper(PassRefPtr element) +-{ +- return wrapHTMLTableCaptionElement(static_cast(element.get())); +-} +- +-static gpointer createTableColWrapper(PassRefPtr element) +-{ +- return wrapHTMLTableColElement(static_cast(element.get())); +-} +- +-static gpointer createModWrapper(PassRefPtr element) +-{ +- return wrapHTMLModElement(static_cast(element.get())); +-} +- +-static gpointer createDirectoryWrapper(PassRefPtr element) +-{ +- return wrapHTMLDirectoryElement(static_cast(element.get())); +-} +- +-static gpointer createDivWrapper(PassRefPtr element) +-{ +- return wrapHTMLDivElement(static_cast(element.get())); +-} +- +-static gpointer createDListWrapper(PassRefPtr element) +-{ +- return wrapHTMLDListElement(static_cast(element.get())); +-} +- +-static gpointer createEmbedWrapper(PassRefPtr element) +-{ +- return wrapHTMLEmbedElement(static_cast(element.get())); +-} +- +-static gpointer createFieldSetWrapper(PassRefPtr element) +-{ +- return wrapHTMLFieldSetElement(static_cast(element.get())); +-} +- +-static gpointer createFontWrapper(PassRefPtr element) +-{ +- return wrapHTMLFontElement(static_cast(element.get())); +-} +- +-static gpointer createFormWrapper(PassRefPtr element) +-{ +- return wrapHTMLFormElement(static_cast(element.get())); +-} +- +-static gpointer createFrameWrapper(PassRefPtr element) +-{ +- return wrapHTMLFrameElement(static_cast(element.get())); +-} +- +-static gpointer createFrameSetWrapper(PassRefPtr element) +-{ +- return wrapHTMLFrameSetElement(static_cast(element.get())); +-} +- +-static gpointer createHeadingWrapper(PassRefPtr element) +-{ +- return wrapHTMLHeadingElement(static_cast(element.get())); +-} +- +-static gpointer createHeadWrapper(PassRefPtr element) +-{ +- return wrapHTMLHeadElement(static_cast(element.get())); +-} +- +-static gpointer createHRWrapper(PassRefPtr element) +-{ +- return wrapHTMLHRElement(static_cast(element.get())); +-} +- +-static gpointer createHtmlWrapper(PassRefPtr element) +-{ +- return wrapHTMLHtmlElement(static_cast(element.get())); +-} +- +-static gpointer createIFrameWrapper(PassRefPtr element) +-{ +- return wrapHTMLIFrameElement(static_cast(element.get())); +-} +- +-static gpointer createImageWrapper(PassRefPtr element) +-{ +- return wrapHTMLImageElement(static_cast(element.get())); +-} +- +-static gpointer createInputWrapper(PassRefPtr element) +-{ +- return wrapHTMLInputElement(static_cast(element.get())); +-} +- +-static gpointer createKeygenWrapper(PassRefPtr element) +-{ +- return wrapHTMLKeygenElement(static_cast(element.get())); +-} +- +-static gpointer createLabelWrapper(PassRefPtr element) +-{ +- return wrapHTMLLabelElement(static_cast(element.get())); +-} +- +-static gpointer createLegendWrapper(PassRefPtr element) +-{ +- return wrapHTMLLegendElement(static_cast(element.get())); +-} +- +-static gpointer createLIWrapper(PassRefPtr element) +-{ +- return wrapHTMLLIElement(static_cast(element.get())); +-} +- +-static gpointer createLinkWrapper(PassRefPtr element) +-{ +- return wrapHTMLLinkElement(static_cast(element.get())); +-} +- +-static gpointer createMapWrapper(PassRefPtr element) +-{ +- return wrapHTMLMapElement(static_cast(element.get())); +-} +- +-static gpointer createMarqueeWrapper(PassRefPtr element) +-{ +- return wrapHTMLMarqueeElement(static_cast(element.get())); +-} +- +-static gpointer createMenuWrapper(PassRefPtr element) +-{ +- return wrapHTMLMenuElement(static_cast(element.get())); +-} +- +-static gpointer createMetaWrapper(PassRefPtr element) +-{ +- return wrapHTMLMetaElement(static_cast(element.get())); +-} +- +-static gpointer createObjectWrapper(PassRefPtr element) +-{ +- return wrapHTMLObjectElement(static_cast(element.get())); +-} +- +-static gpointer createOListWrapper(PassRefPtr element) +-{ +- return wrapHTMLOListElement(static_cast(element.get())); +-} +- +-static gpointer createOptGroupWrapper(PassRefPtr element) +-{ +- return wrapHTMLOptGroupElement(static_cast(element.get())); +-} +- +-static gpointer createOptionWrapper(PassRefPtr element) +-{ +- return wrapHTMLOptionElement(static_cast(element.get())); +-} +- +-static gpointer createParagraphWrapper(PassRefPtr element) +-{ +- return wrapHTMLParagraphElement(static_cast(element.get())); +-} +- +-static gpointer createParamWrapper(PassRefPtr element) +-{ +- return wrapHTMLParamElement(static_cast(element.get())); +-} +- +-static gpointer createPreWrapper(PassRefPtr element) +-{ +- return wrapHTMLPreElement(static_cast(element.get())); +-} +- +-static gpointer createQuoteWrapper(PassRefPtr element) +-{ +- return wrapHTMLQuoteElement(static_cast(element.get())); +-} +- +-static gpointer createScriptWrapper(PassRefPtr element) +-{ +- return wrapHTMLScriptElement(static_cast(element.get())); +-} +- +-static gpointer createSelectWrapper(PassRefPtr element) +-{ +- return wrapHTMLSelectElement(static_cast(element.get())); +-} +- +-static gpointer createStyleWrapper(PassRefPtr element) +-{ +- return wrapHTMLStyleElement(static_cast(element.get())); +-} +- +-static gpointer createTableWrapper(PassRefPtr element) +-{ +- return wrapHTMLTableElement(static_cast(element.get())); +-} +- +-static gpointer createTableSectionWrapper(PassRefPtr element) +-{ +- return wrapHTMLTableSectionElement(static_cast(element.get())); +-} +- +-static gpointer createTableCellWrapper(PassRefPtr element) +-{ +- return wrapHTMLTableCellElement(static_cast(element.get())); +-} +- +-static gpointer createTextAreaWrapper(PassRefPtr element) +-{ +- return wrapHTMLTextAreaElement(static_cast(element.get())); +-} +- +-static gpointer createTitleWrapper(PassRefPtr element) +-{ +- return wrapHTMLTitleElement(static_cast(element.get())); +-} +- +-static gpointer createTableRowWrapper(PassRefPtr element) +-{ +- return wrapHTMLTableRowElement(static_cast(element.get())); +-} +- +-static gpointer createUListWrapper(PassRefPtr element) +-{ +- return wrapHTMLUListElement(static_cast(element.get())); +-} +- +-gpointer createHTMLElementWrapper(PassRefPtr element) +-{ +- static HashMap map; +- if (map.isEmpty()) { +- map.set(aTag.localName().impl(), createAnchorWrapper); +- map.set(appletTag.localName().impl(), createAppletWrapper); +-#if ENABLE(VIDEO) +- map.set(audioTag.localName().impl(), createAudioWrapper); +- map.set(videoTag.localName().impl(), createVideoWrapper); +-#endif +- map.set(areaTag.localName().impl(), createAreaWrapper); +- map.set(baseTag.localName().impl(), createBaseWrapper); +- map.set(basefontTag.localName().impl(), createBaseFontWrapper); +- map.set(blockquoteTag.localName().impl(), createQuoteWrapper); +- map.set(bodyTag.localName().impl(), createBodyWrapper); +- map.set(brTag.localName().impl(), createBRWrapper); +- map.set(buttonTag.localName().impl(), createButtonWrapper); +- map.set(canvasTag.localName().impl(), createCanvasWrapper); +- map.set(captionTag.localName().impl(), createTableCaptionWrapper); +- map.set(colTag.localName().impl(), createTableColWrapper); +- map.set(delTag.localName().impl(), createModWrapper); +- map.set(dirTag.localName().impl(), createDirectoryWrapper); +- map.set(divTag.localName().impl(), createDivWrapper); +- map.set(dlTag.localName().impl(), createDListWrapper); +- map.set(embedTag.localName().impl(), createEmbedWrapper); +- map.set(fieldsetTag.localName().impl(), createFieldSetWrapper); +- map.set(fontTag.localName().impl(), createFontWrapper); +- map.set(formTag.localName().impl(), createFormWrapper); +- map.set(frameTag.localName().impl(), createFrameWrapper); +- map.set(framesetTag.localName().impl(), createFrameSetWrapper); +- map.set(h1Tag.localName().impl(), createHeadingWrapper); +- map.set(headTag.localName().impl(), createHeadWrapper); +- map.set(hrTag.localName().impl(), createHRWrapper); +- map.set(htmlTag.localName().impl(), createHtmlWrapper); +- map.set(iframeTag.localName().impl(), createIFrameWrapper); +- map.set(imgTag.localName().impl(), createImageWrapper); +- map.set(inputTag.localName().impl(), createInputWrapper); +- map.set(labelTag.localName().impl(), createLabelWrapper); +- map.set(legendTag.localName().impl(), createLegendWrapper); +- map.set(liTag.localName().impl(), createLIWrapper); +- map.set(linkTag.localName().impl(), createLinkWrapper); +- map.set(mapTag.localName().impl(), createMapWrapper); +- map.set(marqueeTag.localName().impl(), createMarqueeWrapper); +- map.set(menuTag.localName().impl(), createMenuWrapper); +- map.set(metaTag.localName().impl(), createMetaWrapper); +- map.set(objectTag.localName().impl(), createObjectWrapper); +- map.set(olTag.localName().impl(), createOListWrapper); +- map.set(optgroupTag.localName().impl(), createOptGroupWrapper); +- map.set(optionTag.localName().impl(), createOptionWrapper); +- map.set(pTag.localName().impl(), createParagraphWrapper); +- map.set(paramTag.localName().impl(), createParamWrapper); +- map.set(preTag.localName().impl(), createPreWrapper); +- map.set(qTag.localName().impl(), createQuoteWrapper); +- map.set(scriptTag.localName().impl(), createScriptWrapper); +- map.set(selectTag.localName().impl(), createSelectWrapper); +- map.set(styleTag.localName().impl(), createStyleWrapper); +- map.set(tableTag.localName().impl(), createTableWrapper); +- map.set(tbodyTag.localName().impl(), createTableSectionWrapper); +- map.set(tdTag.localName().impl(), createTableCellWrapper); +- map.set(textareaTag.localName().impl(), createTextAreaWrapper); +- map.set(titleTag.localName().impl(), createTitleWrapper); +- map.set(trTag.localName().impl(), createTableRowWrapper); +- map.set(ulTag.localName().impl(), createUListWrapper); +- map.set(colgroupTag.localName().impl(), createTableColWrapper); +- map.set(h2Tag.localName().impl(), createHeadingWrapper); +- map.set(h3Tag.localName().impl(), createHeadingWrapper); +- map.set(h4Tag.localName().impl(), createHeadingWrapper); +- map.set(h5Tag.localName().impl(), createHeadingWrapper); +- map.set(h6Tag.localName().impl(), createHeadingWrapper); +- map.set(imageTag.localName().impl(), createImageWrapper); +- map.set(insTag.localName().impl(), createModWrapper); +- map.set(keygenTag.localName().impl(), createKeygenWrapper); +- map.set(listingTag.localName().impl(), createPreWrapper); +- map.set(tfootTag.localName().impl(), createTableSectionWrapper); +- map.set(thTag.localName().impl(), createTableCellWrapper); +- map.set(theadTag.localName().impl(), createTableSectionWrapper); +- map.set(xmpTag.localName().impl(), createPreWrapper); +- } +- +- CreateHTMLElementWrapperFunction createWrapperFunction = +- map.get(element->localName().impl()); +- if (createWrapperFunction) +- return createWrapperFunction(element); +- return wrapHTMLElement(element.get()); +-} +- +-} +diff --git a/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h b/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h +deleted file mode 100644 +index 9aedcae..0000000 +--- a/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h ++++ /dev/null +@@ -1,36 +0,0 @@ +-/* +- * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. +- * Copyright (C) 2010 Igalia S.L. +- * +- * Redistribution and use in source and binary forms, with or without +- * modification, are permitted provided that the following conditions +- * are met: +- * 1. Redistributions of source code must retain the above copyright +- * notice, this list of conditions and the following disclaimer. +- * 2. Redistributions in binary form must reproduce the above copyright +- * notice, this list of conditions and the following disclaimer in the +- * documentation and/or other materials provided with the distribution. +- * +- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY +- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR +- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-*/ +- +-#ifndef WebKitHTMLElementWrapperFactory_h +-#define WebKitHTMLElementWrapperFactory_h +- +-#include "HTMLElement.h" +- +-namespace WebKit { +-gpointer createHTMLElementWrapper(PassRefPtr); +-} +- +-#endif // WebKitHTMLElementWrapperFactory_h +diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm b/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm +index 7a5d73f..69c0db1 100644 +--- a/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm ++++ b/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm +@@ -37,6 +37,14 @@ my @txtGetProps = (); + + my $className = ""; + ++# FIXME: this should be replaced with a function that recurses up the tree ++# to find the actual base type. ++my %baseTypeHash = ("Object" => 1, "Node" => 1, "NodeList" => 1, "NamedNodeMap" => 1, "DOMImplementation" => 1, ++ "Event" => 1, "CSSRule" => 1, "CSSValue" => 1, "StyleSheet" => 1, "MediaList" => 1, ++ "Counter" => 1, "Rect" => 1, "RGBColor" => 1, "XPathExpression" => 1, "XPathResult" => 1, ++ "NodeIterator" => 1, "TreeWalker" => 1, "AbstractView" => 1, "Blob" => 1, "DOMTokenList" => 1, ++ "HTMLCollection" => 1); ++ + # Default constructor + sub new { + my $object = shift; +@@ -83,6 +91,25 @@ sub GetParentImplClassName { + return $interface->parents(0); + } + ++sub IsBaseType ++{ ++ my $type = shift; ++ ++ return 1 if $baseTypeHash{$type}; ++ return 0; ++} ++ ++sub GetBaseClass ++{ ++ $parent = shift; ++ ++ return $parent if $parent eq "Object" or IsBaseType($parent); ++ return "Event" if $parent eq "UIEvent" or $parent eq "MouseEvent"; ++ return "CSSValue" if $parent eq "SVGColor" or $parent eq "CSSValueList"; ++ return "Node"; ++} ++ ++ + # From String::CamelCase 0.01 + sub camelize + { +@@ -470,6 +497,7 @@ sub GenerateProperty { + $getterFunctionName = "coreSelf->$getterFunctionName"; + $setterFunctionName = "coreSelf->$setterFunctionName"; + } ++ push(@getterArguments, "isNull") if $attribute->signature->isNullable; + push(@getterArguments, "ec") if @{$attribute->getterExceptions}; + push(@setterArguments, "ec") if @{$attribute->setterExceptions}; + +@@ -491,8 +519,11 @@ sub GenerateProperty { + push(@txtGetProps, " case ${propEnum}: {\n"); + push(@txtGetProps, "#if ${parentConditionalString}\n") if $parentConditionalString; + push(@txtGetProps, "#if ${conditionalString}\n") if $conditionalString; ++ push(@txtGetProps, " bool isNull = false;\n") if $attribute->signature->isNullable; + push(@txtGetProps, " WebCore::ExceptionCode ec = 0;\n") if @{$attribute->getterExceptions}; + ++ # FIXME: Should we return a default value when isNull == true? ++ + my $postConvertFunction = ""; + my $done = 0; + if ($gtype eq "string") { +@@ -893,11 +924,7 @@ sub GenerateFunction { + } + + if ($returnType ne "void" && $returnValueIsGDOMType && $functionSigType ne "any") { +- if ($functionSigType ne "EventTarget") { +- $implIncludes{"WebKitDOM${functionSigType}Private.h"} = 1; +- } else { +- $implIncludes{"WebKitDOM${functionSigType}.h"} = 1; +- } ++ $implIncludes{"WebKitDOM${functionSigType}Private.h"} = 1; + } + + if (@{$function->raisesExceptions}) { +@@ -1003,8 +1030,14 @@ sub GenerateFunction { + } + } + ++ # FIXME: Should we return a default value when isNull == true? ++ if ($function->signature->isNullable) { ++ push(@cBody, " bool isNull = false;\n"); ++ push(@callImplParams, "isNull"); ++ } ++ + if (@{$function->raisesExceptions}) { +- push(@cBody, " WebCore::ExceptionCode ec = 0;\n") ; ++ push(@cBody, " WebCore::ExceptionCode ec = 0;\n"); + push(@callImplParams, "ec"); + } + +@@ -1240,6 +1273,7 @@ sub GenerateCFile { + my $clsCaps = uc(FixUpDecamelizedName(decamelize($interfaceName))); + my $lowerCaseIfaceName = "webkit_dom_" . FixUpDecamelizedName(decamelize($interfaceName)); + my $parentImplClassName = GetParentImplClassName($interface); ++ my $baseClassName = GetBaseClass($parentImplClassName); + + # Add a private struct only for direct subclasses of Object so that we can use RefPtr + # for the WebCore wrapped object and make sure we only increment the reference counter once. +@@ -1259,21 +1293,32 @@ ${defineTypeMacro}(${className}, ${lowerCaseIfaceName}, ${parentGObjType}${defin + EOF + push(@cBodyProperties, $implContent); + +- if (!UsesManualKitImplementation($interfaceName)) { +- $implContent = << "EOF"; +-${className}* kit(WebCore::$interfaceName* obj) +-{ +- if (!obj) +- return 0; +- +- if (gpointer ret = DOMObjectCache::get(obj)) +- return WEBKIT_DOM_${clsCaps}(ret); +- +- return wrap${interfaceName}(obj); +-} +- +-EOF +- push(@cBodyPriv, $implContent); ++ if ($parentImplClassName eq "Object") { ++ push(@cBodyPriv, "${className}* kit(WebCore::$interfaceName* obj)\n"); ++ push(@cBodyPriv, "{\n"); ++ push(@cBodyPriv, " if (!obj)\n"); ++ push(@cBodyPriv, " return 0;\n\n"); ++ push(@cBodyPriv, " if (gpointer ret = DOMObjectCache::get(obj))\n"); ++ push(@cBodyPriv, " return WEBKIT_DOM_${clsCaps}(ret);\n\n"); ++ if (IsPolymorphic($interfaceName)) { ++ push(@cBodyPriv, " return wrap(obj);\n"); ++ } else { ++ push(@cBodyPriv, " return wrap${interfaceName}(obj);\n"); ++ } ++ push(@cBodyPriv, "}\n\n"); ++ } else { ++ push(@cBodyPriv, "${className}* kit(WebCore::$interfaceName* obj)\n"); ++ push(@cBodyPriv, "{\n"); ++ if (!IsPolymorphic($baseClassName)) { ++ push(@cBodyPriv, " if (!obj)\n"); ++ push(@cBodyPriv, " return 0;\n\n"); ++ push(@cBodyPriv, " if (gpointer ret = DOMObjectCache::get(obj))\n"); ++ push(@cBodyPriv, " return WEBKIT_DOM_${clsCaps}(ret);\n\n"); ++ push(@cBodyPriv, " return wrap${interfaceName}(obj);\n"); ++ } else { ++ push(@cBodyPriv, " return WEBKIT_DOM_${clsCaps}(kit(static_cast(obj)));\n"); ++ } ++ push(@cBodyPriv, "}\n\n"); + } + + $implContent = << "EOF"; +@@ -1305,10 +1350,11 @@ sub GenerateEndHeader { + push(@hPrefixGuardEnd, "#endif /* $guard */\n"); + } + +-sub UsesManualKitImplementation { ++sub IsPolymorphic { + my $type = shift; + +- return 1 if $type eq "Node" or $type eq "Element" or $type eq "Event"; ++ # FIXME: should we use ObjCPolymorphic attribute? or is it specific to ObjC bindings? ++ return 1 if $type eq "Node" or $type eq "Event" or $type eq "HTMLCollection" or $type eq "StyleSheet" or $type eq "Blob"; + return 0; + } + +@@ -1371,17 +1417,23 @@ sub Generate { + my $parentClassName = GetParentClassName($interface); + my $parentGObjType = GetParentGObjType($interface); + my $interfaceName = $interface->name; ++ my $parentImplClassName = GetParentImplClassName($interface); ++ my $baseClassName = GetBaseClass($parentImplClassName); + + # Add the default impl header template + @cPrefix = split("\r", $licenceTemplate); + push(@cPrefix, "\n"); + + $implIncludes{"DOMObjectCache.h"} = 1; +- $implIncludes{"WebKitDOMBinding.h"} = 1; ++ $implIncludes{"WebKitDOMPrivate.h"} = 1; + $implIncludes{"gobject/ConvertToUTF8String.h"} = 1; + $implIncludes{"${className}Private.h"} = 1; + $implIncludes{"JSMainThreadExecState.h"} = 1; + $implIncludes{"ExceptionCode.h"} = 1; ++ $implIncludes{"CSSImportRule.h"} = 1; ++ if ($parentImplClassName ne "Object" and IsPolymorphic($baseClassName)) { ++ $implIncludes{"WebKitDOM${baseClassName}Private.h"} = 1; ++ } + + $hdrIncludes{"webkitdom/${parentClassName}.h"} = 1; + +@@ -1424,15 +1476,12 @@ EOF + $text = << "EOF"; + namespace WebKit { + ${className}* wrap${interfaceName}(WebCore::${interfaceName}*); +-WebCore::${interfaceName}* core(${className}* request); ++${className}* kit(WebCore::${interfaceName}*); ++WebCore::${interfaceName}* core(${className}*); + EOF + + print PRIVHEADER $text; + +- if ($className ne "WebKitDOMNode") { +- print PRIVHEADER "${className}* kit(WebCore::${interfaceName}* node);\n" +- } +- + $text = << "EOF"; + } // namespace WebKit + +diff --git a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp +index 315c781..897e26a 100644 +--- a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp ++++ b/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp +@@ -51,7 +51,6 @@ + #include "RefPtrCairo.h" + #include "SearchPopupMenuGtk.h" + #include "SecurityOrigin.h" +-#include "WebKitDOMBinding.h" + #include "WebKitDOMHTMLElementPrivate.h" + #include "WindowFeatures.h" + #include "webkitfilechooserrequestprivate.h" +diff --git a/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp +index 63bd817..57b0cab 100644 +--- a/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp ++++ b/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp +@@ -38,7 +38,6 @@ + #include "PasteboardHelper.h" + #include "PlatformKeyboardEvent.h" + #include "UndoStep.h" +-#include "WebKitDOMBinding.h" + #include "WebKitDOMCSSStyleDeclarationPrivate.h" + #include "WebKitDOMHTMLElementPrivate.h" + #include "WebKitDOMNodePrivate.h" +diff --git a/Source/WebKit/gtk/webkit/webkithittestresult.cpp b/Source/WebKit/gtk/webkit/webkithittestresult.cpp +index c4081a7..c403a03 100644 +--- a/Source/WebKit/gtk/webkit/webkithittestresult.cpp ++++ b/Source/WebKit/gtk/webkit/webkithittestresult.cpp +@@ -25,8 +25,7 @@ + #include "FrameView.h" + #include "HitTestResult.h" + #include "KURL.h" +-#include "WebKitDOMBinding.h" +-#include "WebKitDOMNode.h" ++#include "WebKitDOMNodePrivate.h" + #include "webkitenumtypes.h" + #include "webkitglobals.h" + #include "webkitglobalsprivate.h" diff --git a/webkitgtk3.spec b/webkitgtk3.spec index ec34af2..c3945e9 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -24,6 +24,8 @@ Patch1: webkit-1.11.2-yarr.patch Patch2: webkit-1.11.2-Double2Ints.patch Patch3: webkitgtk-1.11.5-libatomic.patch Patch4: webkit-1.11.90-double2intsPPC32.patch +# remove when 2.0.1 will be released +Patch5: webkit-dom-casting.patch BuildRequires: bison BuildRequires: cairo-devel @@ -99,6 +101,7 @@ This package contains developer documentation for %{name}. %ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif +%patch5 -p1 -b .domcasting %build %ifarch s390 %{arm} ppc @@ -218,6 +221,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Thu Apr 11 2013 Tomas Popela - 2.0.0-3 +- Add fix for broken GObject casting + * Wed Apr 3 2013 Tomas Popela - 2.0.0-2 - Apply double2intsPPC32.patch also on s390 From 646aa6857ee26df8cb7db29e9f7ecc1bcd0f0168 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 17 Apr 2013 09:07:25 +0200 Subject: [PATCH 091/211] Update to 2.0.1 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 405fc95..8fdd26c 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ webkit-1.3.3.tar.gz /webkitgtk-1.11.91.tar.xz /webkitgtk-1.11.92.tar.xz /webkitgtk-2.0.0.tar.xz +/webkitgtk-2.0.1.tar.xz diff --git a/sources b/sources index a104b6a..4df8702 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa231ba8c9cd33575b9692614324be21 webkitgtk-2.0.0.tar.xz +69c2037b6d2644d789d34940eac9c993 webkitgtk-2.0.1.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index c3945e9..29fea6e 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.0.0 -Release: 3%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -24,8 +24,6 @@ Patch1: webkit-1.11.2-yarr.patch Patch2: webkit-1.11.2-Double2Ints.patch Patch3: webkitgtk-1.11.5-libatomic.patch Patch4: webkit-1.11.90-double2intsPPC32.patch -# remove when 2.0.1 will be released -Patch5: webkit-dom-casting.patch BuildRequires: bison BuildRequires: cairo-devel @@ -101,7 +99,6 @@ This package contains developer documentation for %{name}. %ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif -%patch5 -p1 -b .domcasting %build %ifarch s390 %{arm} ppc @@ -221,6 +218,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Tue Apr 16 2013 Tomas Popela - 2.0.1-1 +- Update to 2.0.1 + * Thu Apr 11 2013 Tomas Popela - 2.0.0-3 - Add fix for broken GObject casting From ff04d93e36b30b77c8c4c24f0502554a6efe99a6 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 17 Apr 2013 09:15:43 +0200 Subject: [PATCH 092/211] Remove unused patch --- webkit-dom-casting.patch | 1846 -------------------------------------- 1 file changed, 1846 deletions(-) delete mode 100644 webkit-dom-casting.patch diff --git a/webkit-dom-casting.patch b/webkit-dom-casting.patch deleted file mode 100644 index 1b0b506..0000000 --- a/webkit-dom-casting.patch +++ /dev/null @@ -1,1846 +0,0 @@ -diff -up webkitgtk-2.0.0/GNUmakefile.in.dom_casting2 webkitgtk-2.0.0/GNUmakefile.in ---- webkitgtk-2.0.0/GNUmakefile.in.dom_casting2 2013-04-10 10:40:28.213038314 +0200 -+++ webkitgtk-2.0.0/GNUmakefile.in 2013-04-10 10:42:24.823033373 +0200 -@@ -5648,11 +5648,11 @@ libWebCoreDOM_la_LIBADD = - am_libWebCoreDOM_la_OBJECTS = Source/WebCore/bindings/gobject/libWebCoreDOM_la-ConvertToUTF8String.lo \ - Source/WebCore/bindings/gobject/libWebCoreDOM_la-DOMObjectCache.lo \ - Source/WebCore/bindings/gobject/libWebCoreDOM_la-GObjectEventListener.lo \ -- Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo \ -+ Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo \ - Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.lo \ - Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMEventTarget.lo \ - Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMObject.lo \ -- Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo -+ Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo - @ENABLE_VIDEO_TRUE@am__objects_16 = DerivedSources/webkitdom/libWebCoreDOM_la-WebKitDOMHTMLAudioElement.lo \ - @ENABLE_VIDEO_TRUE@ DerivedSources/webkitdom/libWebCoreDOM_la-WebKitDOMHTMLVideoElement.lo \ - @ENABLE_VIDEO_TRUE@ DerivedSources/webkitdom/libWebCoreDOM_la-WebKitDOMTextTrack.lo \ -@@ -21362,8 +21362,8 @@ libWebCoreDOM_la_SOURCES = \ - Source/WebCore/bindings/gobject/DOMObjectCache.h \ - Source/WebCore/bindings/gobject/GObjectEventListener.cpp \ - Source/WebCore/bindings/gobject/GObjectEventListener.h \ -- Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp \ -- Source/WebCore/bindings/gobject/WebKitDOMBinding.h \ -+ Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp \ -+ Source/WebCore/bindings/gobject/WebKitDOMPrivate.h \ - Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp \ - Source/WebCore/bindings/gobject/WebKitDOMCustom.h \ - Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp \ -@@ -21371,8 +21371,8 @@ libWebCoreDOM_la_SOURCES = \ - Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \ - Source/WebCore/bindings/gobject/WebKitDOMObject.cpp \ - Source/WebCore/bindings/gobject/WebKitDOMObject.h \ -- Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp \ -- Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h -+ Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp \ -+ Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.h - - libWebCoreDOM_la_CXXFLAGS = \ - -fvisibility-inlines-hidden \ -@@ -29457,7 +29457,7 @@ Source/WebCore/bindings/gobject/libWebCo - Source/WebCore/bindings/gobject/libWebCoreDOM_la-GObjectEventListener.lo: \ - Source/WebCore/bindings/gobject/$(am__dirstamp) \ - Source/WebCore/bindings/gobject/$(DEPDIR)/$(am__dirstamp) --Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo: \ -+Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo: \ - Source/WebCore/bindings/gobject/$(am__dirstamp) \ - Source/WebCore/bindings/gobject/$(DEPDIR)/$(am__dirstamp) - Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.lo: \ -@@ -29469,7 +29469,7 @@ Source/WebCore/bindings/gobject/libWebCo - Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMObject.lo: \ - Source/WebCore/bindings/gobject/$(am__dirstamp) \ - Source/WebCore/bindings/gobject/$(DEPDIR)/$(am__dirstamp) --Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo: \ -+Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo: \ - Source/WebCore/bindings/gobject/$(am__dirstamp) \ - Source/WebCore/bindings/gobject/$(DEPDIR)/$(am__dirstamp) - DerivedSources/webkitdom/$(am__dirstamp): -@@ -40757,16 +40757,16 @@ mostlyclean-compile: - -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-DOMObjectCache.lo - -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-GObjectEventListener.$(OBJEXT) - -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-GObjectEventListener.lo -- -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.$(OBJEXT) -- -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo -+ -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.$(OBJEXT) -+ -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo - -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.$(OBJEXT) - -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.lo - -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMEventTarget.$(OBJEXT) - -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMEventTarget.lo - -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMObject.$(OBJEXT) - -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMObject.lo -- -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.$(OBJEXT) -- -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo -+ -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.$(OBJEXT) -+ -rm -f Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo - -rm -f Source/WebCore/bindings/js/libWebCoreInternals_la-JSDOMWrapper.$(OBJEXT) - -rm -f Source/WebCore/bindings/js/libWebCoreInternals_la-JSDOMWrapper.lo - -rm -f Source/WebCore/bindings/js/libWebCoreSVG_la-JSSVGElementInstanceCustom.$(OBJEXT) -@@ -47572,11 +47572,11 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-ConvertToUTF8String.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-DOMObjectCache.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-GObjectEventListener.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMBinding.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMPrivate.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMCustom.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMEventTarget.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMObject.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMHTMLPrivate.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/js/$(DEPDIR)/libWebCoreInternals_la-JSDOMWrapper.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/js/$(DEPDIR)/libWebCoreSVG_la-JSSVGElementInstanceCustom.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@Source/WebCore/bindings/js/$(DEPDIR)/libWebCoreSVG_la-JSSVGLengthCustom.Plo@am__quote@ -@@ -64907,12 +64907,12 @@ Source/WebCore/bindings/gobject/libWebCo - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-GObjectEventListener.lo `test -f 'Source/WebCore/bindings/gobject/GObjectEventListener.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/GObjectEventListener.cpp - --Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo: Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp --@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -MT Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo -MD -MP -MF Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMBinding.Tpo -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp --@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMBinding.Tpo Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMBinding.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp' object='Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo' libtool=yes @AMDEPBACKSLASH@ -+Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo: Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -MT Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo -MD -MP -MF Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMPrivate.Tpo -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMPrivate.Tpo Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMPrivate.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp' object='Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMBinding.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMPrivate.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp - - Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.lo: Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -MT Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.lo -MD -MP -MF Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMCustom.Tpo -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMCustom.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp -@@ -64935,12 +64935,12 @@ Source/WebCore/bindings/gobject/libWebCo - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMObject.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMObject.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMObject.cpp - --Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo: Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp --@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -MT Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo -MD -MP -MF Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.Tpo -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo `test -f 'Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp --@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.Tpo Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp' object='Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo' libtool=yes @AMDEPBACKSLASH@ -+Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo: Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -MT Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo -MD -MP -MF Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMHTMLPrivate.Tpo -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMHTMLPrivate.Tpo Source/WebCore/bindings/gobject/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMHTMLPrivate.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp' object='Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitHTMLElementWrapperFactory.lo `test -f 'Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WebCore/bindings/gobject/libWebCoreDOM_la-WebKitDOMHTMLPrivate.lo `test -f 'Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp' || echo '$(srcdir)/'`Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp - - DerivedSources/webkitdom/libWebCoreDOM_la-WebKitDOMAttr.lo: DerivedSources/webkitdom/WebKitDOMAttr.cpp - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWebCoreDOM_la_CPPFLAGS) $(CPPFLAGS) $(libWebCoreDOM_la_CXXFLAGS) $(CXXFLAGS) -MT DerivedSources/webkitdom/libWebCoreDOM_la-WebKitDOMAttr.lo -MD -MP -MF DerivedSources/webkitdom/$(DEPDIR)/libWebCoreDOM_la-WebKitDOMAttr.Tpo -c -o DerivedSources/webkitdom/libWebCoreDOM_la-WebKitDOMAttr.lo `test -f 'DerivedSources/webkitdom/WebKitDOMAttr.cpp' || echo '$(srcdir)/'`DerivedSources/webkitdom/WebKitDOMAttr.cpp -diff -up webkitgtk-2.0.0/Source/WebCore/bindings/gobject/GNUmakefile.am.dom_casting2 webkitgtk-2.0.0/Source/WebCore/bindings/gobject/GNUmakefile.am ---- webkitgtk-2.0.0/Source/WebCore/bindings/gobject/GNUmakefile.am.dom_casting2 2013-03-26 19:25:17.000000000 +0100 -+++ webkitgtk-2.0.0/Source/WebCore/bindings/gobject/GNUmakefile.am 2013-04-10 10:38:53.633042322 +0200 -@@ -499,23 +499,23 @@ nodist_libWebCoreDOM_la_SOURCES = \ - $(webkitgtk_gdom_built_sources) - - libWebCoreDOM_la_SOURCES = \ -- Source/WebCore/bindings/gobject/ConvertToUTF8String.cpp \ -- Source/WebCore/bindings/gobject/ConvertToUTF8String.h \ -- Source/WebCore/bindings/gobject/DOMObjectCache.cpp \ -- Source/WebCore/bindings/gobject/DOMObjectCache.h \ -- Source/WebCore/bindings/gobject/GObjectEventListener.cpp \ -- Source/WebCore/bindings/gobject/GObjectEventListener.h \ -- Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp \ -- Source/WebCore/bindings/gobject/WebKitDOMBinding.h \ -- Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp \ -- Source/WebCore/bindings/gobject/WebKitDOMCustom.h \ -- Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp \ -- Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h \ -- Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \ -- Source/WebCore/bindings/gobject/WebKitDOMObject.cpp \ -- Source/WebCore/bindings/gobject/WebKitDOMObject.h \ -- Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp \ -- Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h -+ Source/WebCore/bindings/gobject/ConvertToUTF8String.cpp \ -+ Source/WebCore/bindings/gobject/ConvertToUTF8String.h \ -+ Source/WebCore/bindings/gobject/DOMObjectCache.cpp \ -+ Source/WebCore/bindings/gobject/DOMObjectCache.h \ -+ Source/WebCore/bindings/gobject/GObjectEventListener.cpp \ -+ Source/WebCore/bindings/gobject/GObjectEventListener.h \ -+ Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp \ -+ Source/WebCore/bindings/gobject/WebKitDOMCustom.h \ -+ Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp \ -+ Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h \ -+ Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \ -+ Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp \ -+ Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.h \ -+ Source/WebCore/bindings/gobject/WebKitDOMObject.cpp \ -+ Source/WebCore/bindings/gobject/WebKitDOMObject.h \ -+ Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp \ -+ Source/WebCore/bindings/gobject/WebKitDOMPrivate.h - - libWebCoreDOM_la_CXXFLAGS = \ - -fvisibility-inlines-hidden \ -diff --git a/Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp b/Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp -deleted file mode 100644 -index a8a8114..0000000 ---- a/Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp -+++ /dev/null -@@ -1,151 +0,0 @@ --/* -- * Copyright (C) 1999-2001 Harri Porten (porten@kde.org) -- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. -- * Copyright (C) 2007 Samuel Weinig -- * Copyright (C) 2008 Luke Kenneth Casson Leighton -- * Copyright (C) 2008 Martin Soto -- * Copyright (C) 2009, 2010 Igalia S.L. -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public -- * License along with this library; if not, write to the Free Software -- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -- */ -- --#include "config.h" --#include "WebKitDOMBinding.h" -- --#include "DOMObjectCache.h" --#include "Element.h" --#include "Event.h" --#include "EventException.h" --#include "HTMLNames.h" --#include "MouseEvent.h" --#include "UIEvent.h" --#include "WebKitDOMDOMWindowPrivate.h" --#include "WebKitDOMElementPrivate.h" --#include "WebKitDOMEventPrivate.h" --#include "WebKitDOMMouseEventPrivate.h" --#include "WebKitDOMNode.h" --#include "WebKitDOMNodePrivate.h" --#include "WebKitDOMUIEventPrivate.h" --#include "WebKitHTMLElementWrapperFactory.h" -- --namespace WebKit { -- --using namespace WebCore; --using namespace WebCore::HTMLNames; -- --// kit methods -- --static gpointer createWrapper(Node* node) --{ -- ASSERT(node); -- ASSERT(node->nodeType()); -- -- gpointer wrappedNode = 0; -- -- switch (node->nodeType()) { -- case Node::ELEMENT_NODE: -- if (node->isHTMLElement()) -- wrappedNode = createHTMLElementWrapper(toHTMLElement(node)); -- else -- wrappedNode = wrapElement(static_cast(node)); -- break; -- default: -- wrappedNode = wrapNode(node); -- break; -- } -- -- return wrappedNode; --} -- --WebKitDOMNode* kit(Node* node) --{ -- if (!node) -- return 0; -- -- gpointer kitNode = DOMObjectCache::get(node); -- if (kitNode) -- return static_cast(kitNode); -- -- return static_cast(createWrapper(node)); --} -- --WebKitDOMElement* kit(Element* element) --{ -- if (!element) -- return 0; -- -- gpointer kitElement = DOMObjectCache::get(element); -- if (kitElement) -- return static_cast(kitElement); -- -- gpointer wrappedElement; -- -- if (element->isHTMLElement()) -- wrappedElement = createHTMLElementWrapper(toHTMLElement(element)); -- else -- wrappedElement = wrapElement(element); -- -- return static_cast(wrappedElement); --} -- --WebKitDOMEvent* kit(Event* event) --{ -- if (!event) -- return 0; -- -- gpointer kitEvent = DOMObjectCache::get(event); -- if (kitEvent) -- return static_cast(kitEvent); -- -- gpointer wrappedEvent; -- -- if (event->isMouseEvent()) -- wrappedEvent = wrapMouseEvent(static_cast(event)); -- else if (event->isUIEvent()) -- wrappedEvent = wrapUIEvent(static_cast(event)); -- else -- wrappedEvent = wrapEvent(event); -- -- return static_cast(wrappedEvent); --} -- --static gpointer wrapEventTarget(EventTarget* target) --{ -- ASSERT(target); -- -- gpointer wrappedTarget = 0; -- -- if (target->toNode()) { -- Node* node = target->toNode(); -- wrappedTarget = wrapNode(node); -- } else if (target->toDOMWindow()) { -- DOMWindow* window = target->toDOMWindow(); -- wrappedTarget = wrapDOMWindow(window); -- } -- -- return wrappedTarget; --} -- --WebKitDOMEventTarget* kit(WebCore::EventTarget* obj) --{ -- g_return_val_if_fail(obj, 0); -- -- if (gpointer ret = DOMObjectCache::get(obj)) -- return static_cast(ret); -- -- return static_cast(wrapEventTarget(obj)); --} -- --} // namespace WebKit -diff --git a/Source/WebCore/bindings/gobject/WebKitDOMBinding.h b/Source/WebCore/bindings/gobject/WebKitDOMBinding.h -deleted file mode 100644 -index ac1f96a..0000000 ---- a/Source/WebCore/bindings/gobject/WebKitDOMBinding.h -+++ /dev/null -@@ -1,47 +0,0 @@ --/* -- * Copyright (C) 1999-2001 Harri Porten (porten@kde.org) -- * Copyright (C) 2003, 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. -- * Copyright (C) 2007 Samuel Weinig -- * Copyright (C) 2008 Luke Kenneth Casson Leighton -- * Copyright (C) 2008 Martin Soto -- * Copyright (C) 2009-2010 Igalia S.L. -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public -- * License along with this library; if not, write to the Free Software -- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -- */ -- --#ifndef WebKitDOMBinding_h --#define WebKitDOMBinding_h -- --#include -- --#define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)) --#define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)) --#define WEBKIT_WARN_FEATURE_NOT_PRESENT(Feature) g_warning("WebKitGTK+ was not compiled with support for " Feature); -- --namespace WebCore { --class Node; --class Element; --class Event; --class EventTarget; --} // namespace WebCore -- --namespace WebKit { --WebKitDOMNode* kit(WebCore::Node* node); --WebKitDOMElement* kit(WebCore::Element* element); --WebKitDOMEvent* kit(WebCore::Event* event); --WebKitDOMEventTarget* kit(WebCore::EventTarget* target); --} // namespace WebKit -- --#endif // WebKitDOMBinding_h -diff --git a/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp b/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp -index ca8c315d..a7b6611 100644 ---- a/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp -+++ b/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp -@@ -31,8 +31,11 @@ - #include "config.h" - #include "WebKitDOMEventTarget.h" - -+#include "DOMObjectCache.h" -+#include "EventTarget.h" - #include "WebKitDOMEvent.h" - #include "WebKitDOMEventTargetPrivate.h" -+#include "WebKitDOMPrivate.h" - - typedef WebKitDOMEventTargetIface WebKitDOMEventTargetInterface; - #if GLIB_CHECK_VERSION(2, 24, 0) -@@ -104,14 +107,20 @@ gboolean webkit_dom_event_target_remove_event_listener(WebKitDOMEventTarget* tar - - namespace WebKit { - --WebCore::EventTarget* core(WebKitDOMEventTarget* request) --{ -- g_return_val_if_fail(request, 0); -+WebKitDOMEventTarget* kit(WebCore::EventTarget* obj) -+ { -+ if (!obj) -+ return 0; -+ -+ if (gpointer ret = DOMObjectCache::get(obj)) -+ return WEBKIT_DOM_EVENT_TARGET(ret); - -- WebCore::EventTarget* coreObject = static_cast(WEBKIT_DOM_OBJECT(request)->coreObject); -- g_return_val_if_fail(coreObject, 0); -+ return wrap(obj); -+} - -- return coreObject; -+WebCore::EventTarget* core(WebKitDOMEventTarget* request) -+{ -+ return request ? static_cast(WEBKIT_DOM_OBJECT(request)->coreObject) : 0; - } - - } // namespace WebKit -diff --git a/Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h b/Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h -index ac29471..e79be38 100644 ---- a/Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h -+++ b/Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h -@@ -20,11 +20,15 @@ - #ifndef WebKitDOMEventTargetPrivate_h - #define WebKitDOMEventTargetPrivate_h - --#include "EventTarget.h" - #include - -+namespace WebCore { -+class EventTarget; -+} -+ - namespace WebKit { --WebCore::EventTarget* core(WebKitDOMEventTarget* request); -+WebKitDOMEventTarget* kit(WebCore::EventTarget*); -+WebCore::EventTarget* core(WebKitDOMEventTarget*); - } // namespace WebKit - - #endif /* WebKitDOMEventTargetPrivate_h */ -diff --git a/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp b/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp -new file mode 100644 -index 0000000..6e39c9a ---- /dev/null -+++ b/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.cpp -@@ -0,0 +1,268 @@ -+/* -+ * Copyright (C) 2013 Igalia S.L. -+ * -+ * This file is derived by hand from an automatically generated file. -+ * Keeping it up-to-date could potentially be done by adding -+ * a make_names.pl generator, or by writing a separate -+ * generater which takes JSHTMLElementWrapperFactory.h as input. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY -+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR -+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include "config.h" -+#include "WebKitDOMHTMLPrivate.h" -+ -+#include "HTMLAnchorElement.h" -+#include "HTMLAppletElement.h" -+#include "HTMLAreaElement.h" -+#include "HTMLAudioElement.h" -+#include "HTMLBRElement.h" -+#include "HTMLBaseElement.h" -+#include "HTMLBaseFontElement.h" -+#include "HTMLBodyElement.h" -+#include "HTMLButtonElement.h" -+#include "HTMLCanvasElement.h" -+#include "HTMLDListElement.h" -+#include "HTMLDirectoryElement.h" -+#include "HTMLDivElement.h" -+#include "HTMLElement.h" -+#include "HTMLEmbedElement.h" -+#include "HTMLFieldSetElement.h" -+#include "HTMLFontElement.h" -+#include "HTMLFormElement.h" -+#include "HTMLFrameElement.h" -+#include "HTMLFrameSetElement.h" -+#include "HTMLHRElement.h" -+#include "HTMLHeadElement.h" -+#include "HTMLHeadingElement.h" -+#include "HTMLHtmlElement.h" -+#include "HTMLIFrameElement.h" -+#include "HTMLImageElement.h" -+#include "HTMLInputElement.h" -+#include "HTMLKeygenElement.h" -+#include "HTMLLIElement.h" -+#include "HTMLLabelElement.h" -+#include "HTMLLegendElement.h" -+#include "HTMLLinkElement.h" -+#include "HTMLMapElement.h" -+#include "HTMLMarqueeElement.h" -+#include "HTMLMenuElement.h" -+#include "HTMLMetaElement.h" -+#include "HTMLModElement.h" -+#include "HTMLNames.h" -+#include "HTMLOListElement.h" -+#include "HTMLObjectElement.h" -+#include "HTMLOptGroupElement.h" -+#include "HTMLOptionElement.h" -+#include "HTMLParagraphElement.h" -+#include "HTMLParamElement.h" -+#include "HTMLPreElement.h" -+#include "HTMLQuoteElement.h" -+#include "HTMLScriptElement.h" -+#include "HTMLSelectElement.h" -+#include "HTMLStyleElement.h" -+#include "HTMLTableCaptionElement.h" -+#include "HTMLTableCellElement.h" -+#include "HTMLTableColElement.h" -+#include "HTMLTableElement.h" -+#include "HTMLTableRowElement.h" -+#include "HTMLTableSectionElement.h" -+#include "HTMLTextAreaElement.h" -+#include "HTMLTitleElement.h" -+#include "HTMLUListElement.h" -+#include "HTMLVideoElement.h" -+#include "WebKitDOMHTMLAnchorElementPrivate.h" -+#include "WebKitDOMHTMLAppletElementPrivate.h" -+#include "WebKitDOMHTMLAreaElementPrivate.h" -+#include "WebKitDOMHTMLBRElementPrivate.h" -+#include "WebKitDOMHTMLBaseElementPrivate.h" -+#include "WebKitDOMHTMLBaseFontElementPrivate.h" -+#include "WebKitDOMHTMLBodyElementPrivate.h" -+#include "WebKitDOMHTMLButtonElementPrivate.h" -+#include "WebKitDOMHTMLCanvasElementPrivate.h" -+#include "WebKitDOMHTMLDListElementPrivate.h" -+#include "WebKitDOMHTMLDirectoryElementPrivate.h" -+#include "WebKitDOMHTMLDivElementPrivate.h" -+#include "WebKitDOMHTMLElementPrivate.h" -+#include "WebKitDOMHTMLEmbedElementPrivate.h" -+#include "WebKitDOMHTMLFieldSetElementPrivate.h" -+#include "WebKitDOMHTMLFontElementPrivate.h" -+#include "WebKitDOMHTMLFormElementPrivate.h" -+#include "WebKitDOMHTMLFrameElementPrivate.h" -+#include "WebKitDOMHTMLFrameSetElementPrivate.h" -+#include "WebKitDOMHTMLHRElementPrivate.h" -+#include "WebKitDOMHTMLHeadElementPrivate.h" -+#include "WebKitDOMHTMLHeadingElementPrivate.h" -+#include "WebKitDOMHTMLHtmlElementPrivate.h" -+#include "WebKitDOMHTMLIFrameElementPrivate.h" -+#include "WebKitDOMHTMLImageElementPrivate.h" -+#include "WebKitDOMHTMLInputElementPrivate.h" -+#include "WebKitDOMHTMLKeygenElementPrivate.h" -+#include "WebKitDOMHTMLLIElementPrivate.h" -+#include "WebKitDOMHTMLLabelElementPrivate.h" -+#include "WebKitDOMHTMLLegendElementPrivate.h" -+#include "WebKitDOMHTMLLinkElementPrivate.h" -+#include "WebKitDOMHTMLMapElementPrivate.h" -+#include "WebKitDOMHTMLMarqueeElementPrivate.h" -+#include "WebKitDOMHTMLMenuElementPrivate.h" -+#include "WebKitDOMHTMLMetaElementPrivate.h" -+#include "WebKitDOMHTMLModElementPrivate.h" -+#include "WebKitDOMHTMLOListElementPrivate.h" -+#include "WebKitDOMHTMLObjectElementPrivate.h" -+#include "WebKitDOMHTMLOptGroupElementPrivate.h" -+#include "WebKitDOMHTMLOptionElementPrivate.h" -+#include "WebKitDOMHTMLParagraphElementPrivate.h" -+#include "WebKitDOMHTMLParamElementPrivate.h" -+#include "WebKitDOMHTMLPreElementPrivate.h" -+#include "WebKitDOMHTMLQuoteElementPrivate.h" -+#include "WebKitDOMHTMLScriptElementPrivate.h" -+#include "WebKitDOMHTMLSelectElementPrivate.h" -+#include "WebKitDOMHTMLStyleElementPrivate.h" -+#include "WebKitDOMHTMLTableCaptionElementPrivate.h" -+#include "WebKitDOMHTMLTableCellElementPrivate.h" -+#include "WebKitDOMHTMLTableColElementPrivate.h" -+#include "WebKitDOMHTMLTableElementPrivate.h" -+#include "WebKitDOMHTMLTableRowElementPrivate.h" -+#include "WebKitDOMHTMLTableSectionElementPrivate.h" -+#include "WebKitDOMHTMLTextAreaElementPrivate.h" -+#include "WebKitDOMHTMLTitleElementPrivate.h" -+#include "WebKitDOMHTMLUListElementPrivate.h" -+ -+#if ENABLE(VIDEO) -+#include "WebKitDOMHTMLAudioElementPrivate.h" -+#include "WebKitDOMHTMLVideoElementPrivate.h" -+#endif -+ -+namespace WebKit { -+ -+using namespace WebCore; -+using namespace WebCore::HTMLNames; -+ -+// macro(TagName, ElementName) -+ -+#if ENABLE(VIDEO) -+#define FOR_EACH_HTML_VIDEO_TAG(macro) \ -+ macro(audio, Audio) \ -+ macro(video, Video) -+#else -+#define FOR_EACH_HTML_VIDEO_TAG(macro) -+#endif -+ -+#define FOR_EACH_HTML_TAG(macro) \ -+ FOR_EACH_HTML_VIDEO_TAG(macro) \ -+ macro(a, Anchor) \ -+ macro(applet, Applet) \ -+ macro(area, Area) \ -+ macro(base, Base) \ -+ macro(basefont, BaseFont) \ -+ macro(blockquote, Quote) \ -+ macro(body, Body) \ -+ macro(br, BR) \ -+ macro(button, Button) \ -+ macro(canvas, Canvas) \ -+ macro(caption, TableCaption) \ -+ macro(col, TableCol) \ -+ macro(del, Mod) \ -+ macro(dir, Directory) \ -+ macro(div, Div) \ -+ macro(dl, DList) \ -+ macro(embed, Embed) \ -+ macro(fieldset, FieldSet) \ -+ macro(font, Font) \ -+ macro(form, Form) \ -+ macro(frame, Frame) \ -+ macro(frameset, FrameSet) \ -+ macro(h1, Heading) \ -+ macro(head, Head) \ -+ macro(hr, HR) \ -+ macro(html, Html) \ -+ macro(iframe, IFrame) \ -+ macro(img, Image) \ -+ macro(input, Input) \ -+ macro(label, Label) \ -+ macro(legend, Legend) \ -+ macro(li, LI) \ -+ macro(link, Link) \ -+ macro(map, Map) \ -+ macro(marquee, Marquee) \ -+ macro(menu, Menu) \ -+ macro(meta, Meta) \ -+ macro(object, Object) \ -+ macro(ol, OList) \ -+ macro(optgroup, OptGroup) \ -+ macro(option, Option) \ -+ macro(p, Paragraph) \ -+ macro(param, Param) \ -+ macro(pre, Pre) \ -+ macro(q, Quote) \ -+ macro(script, Script) \ -+ macro(select, Select) \ -+ macro(style, Style) \ -+ macro(table, Table) \ -+ macro(tbody, TableSection) \ -+ macro(td, TableCell) \ -+ macro(textarea, TextArea) \ -+ macro(title, Title) \ -+ macro(tr, TableRow) \ -+ macro(ul, UList) \ -+ macro(colgroup, TableCol) \ -+ macro(h2, Heading) \ -+ macro(h3, Heading) \ -+ macro(h4, Heading) \ -+ macro(h5, Heading) \ -+ macro(h6, Heading) \ -+ macro(image, Image) \ -+ macro(ins, Mod) \ -+ macro(keygen, Keygen) \ -+ macro(listing, Pre) \ -+ macro(tfoot, TableSection) \ -+ macro(th, TableCell) \ -+ macro(thead, TableSection) \ -+ macro(xmp, Pre) -+ -+#define DEFINE_HTML_WRAPPER(TagName, ElementName) \ -+ static WebKitDOMHTMLElement* TagName##Wrapper(HTMLElement* element) \ -+ { \ -+ return WEBKIT_DOM_HTML_ELEMENT(wrapHTML##ElementName##Element(static_cast(element))); \ -+ } -+ FOR_EACH_HTML_TAG(DEFINE_HTML_WRAPPER) -+#undef DEFINE_HTML_WRAPPER -+ -+typedef WebKitDOMHTMLElement* (*HTMLElementWrapFunction)(HTMLElement*); -+ -+WebKitDOMHTMLElement* wrap(HTMLElement* element) -+{ -+ static HashMap map; -+ if (map.isEmpty()) { -+#define ADD_HTML_WRAPPER(TagName, ElementName) map.set(TagName##Tag.impl(), TagName##Wrapper); -+ FOR_EACH_HTML_TAG(ADD_HTML_WRAPPER) -+#undef ADD_HTML_WRAPPER -+ } -+ -+ if (HTMLElementWrapFunction wrapFunction = map.get(element->tagQName().impl())) -+ return wrapFunction(element); -+ -+ return wrapHTMLElement(element); -+} -+ -+} -+ -diff --git a/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.h b/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.h -new file mode 100644 -index 0000000..097d9c6 ---- /dev/null -+++ b/Source/WebCore/bindings/gobject/WebKitDOMHTMLPrivate.h -@@ -0,0 +1,40 @@ -+/* -+ * Copyright (C) 2013 Igalia S.L. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY -+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR -+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+*/ -+ -+#ifndef WebKitDOMHTMLPrivate_h -+#define WebKitDOMHTMLPrivate_h -+ -+#include -+ -+namespace WebCore { -+class HTMLElement; -+} -+ -+namespace WebKit { -+WebKitDOMHTMLElement* wrap(WebCore::HTMLElement*); -+} -+ -+#endif // WebKitDOMHTMLPrivate_h -+ -diff --git a/Source/WebCore/bindings/gobject/WebKitDOMObject.cpp b/Source/WebCore/bindings/gobject/WebKitDOMObject.cpp -index c05add2..22aed1f 100644 ---- a/Source/WebCore/bindings/gobject/WebKitDOMObject.cpp -+++ b/Source/WebCore/bindings/gobject/WebKitDOMObject.cpp -@@ -8,8 +8,6 @@ - #include "config.h" - #include "WebKitDOMObject.h" - --#include "WebKitDOMBinding.h" -- - enum { - PROP_0, - PROP_CORE_OBJECT -diff --git a/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp b/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp -new file mode 100644 -index 0000000..bf1f85c ---- /dev/null -+++ b/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp -@@ -0,0 +1,162 @@ -+/* -+ * Copyright (C) 1999-2001 Harri Porten (porten@kde.org) -+ * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. -+ * Copyright (C) 2007 Samuel Weinig -+ * Copyright (C) 2008 Luke Kenneth Casson Leighton -+ * Copyright (C) 2008 Martin Soto -+ * Copyright (C) 2009-2013 Igalia S.L. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#include "config.h" -+#include "WebKitDOMPrivate.h" -+ -+#include "Blob.h" -+#include "DOMObjectCache.h" -+#include "Element.h" -+#include "Event.h" -+#include "EventException.h" -+#include "EventTarget.h" -+#include "File.h" -+#include "HTMLElement.h" -+#include "HTMLNames.h" -+#include "MouseEvent.h" -+#include "StyleSheet.h" -+#include "UIEvent.h" -+#include "WebKitDOMAttrPrivate.h" -+#include "WebKitDOMBlobPrivate.h" -+#include "WebKitDOMCDATASectionPrivate.h" -+#include "WebKitDOMCSSStyleSheetPrivate.h" -+#include "WebKitDOMCommentPrivate.h" -+#include "WebKitDOMDOMWindowPrivate.h" -+#include "WebKitDOMDocumentFragmentPrivate.h" -+#include "WebKitDOMDocumentPrivate.h" -+#include "WebKitDOMDocumentTypePrivate.h" -+#include "WebKitDOMElementPrivate.h" -+#include "WebKitDOMEntityReferencePrivate.h" -+#include "WebKitDOMEventPrivate.h" -+#include "WebKitDOMEventTargetPrivate.h" -+#include "WebKitDOMFilePrivate.h" -+#include "WebKitDOMHTMLCollectionPrivate.h" -+#include "WebKitDOMHTMLDocumentPrivate.h" -+#include "WebKitDOMHTMLOptionsCollectionPrivate.h" -+#include "WebKitDOMHTMLPrivate.h" -+#include "WebKitDOMMouseEventPrivate.h" -+#include "WebKitDOMNodePrivate.h" -+#include "WebKitDOMProcessingInstructionPrivate.h" -+#include "WebKitDOMStyleSheetPrivate.h" -+#include "WebKitDOMTextPrivate.h" -+#include "WebKitDOMUIEventPrivate.h" -+ -+namespace WebKit { -+ -+using namespace WebCore; -+using namespace WebCore::HTMLNames; -+ -+WebKitDOMNode* wrap(Node* node) -+{ -+ ASSERT(node); -+ ASSERT(node->nodeType()); -+ -+ switch (node->nodeType()) { -+ case Node::ELEMENT_NODE: -+ if (node->isHTMLElement()) -+ return WEBKIT_DOM_NODE(wrap(toHTMLElement(node))); -+ return WEBKIT_DOM_NODE(wrapElement(static_cast(node))); -+ case Node::ATTRIBUTE_NODE: -+ return WEBKIT_DOM_NODE(wrapAttr(static_cast(node))); -+ case Node::TEXT_NODE: -+ return WEBKIT_DOM_NODE(wrapText(toText(node))); -+ case Node::CDATA_SECTION_NODE: -+ return WEBKIT_DOM_NODE(wrapCDATASection(static_cast(node))); -+ case Node::ENTITY_REFERENCE_NODE: -+ return WEBKIT_DOM_NODE(wrapEntityReference(static_cast(node))); -+ case Node::PROCESSING_INSTRUCTION_NODE: -+ return WEBKIT_DOM_NODE(wrapProcessingInstruction(static_cast(node))); -+ case Node::COMMENT_NODE: -+ return WEBKIT_DOM_NODE(wrapComment(static_cast(node))); -+ case Node::DOCUMENT_NODE: -+ if (static_cast(node)->isHTMLDocument()) -+ return WEBKIT_DOM_NODE(wrapHTMLDocument(static_cast(node))); -+ return WEBKIT_DOM_NODE(wrapDocument(static_cast(node))); -+ case Node::DOCUMENT_TYPE_NODE: -+ return WEBKIT_DOM_NODE(wrapDocumentType(static_cast(node))); -+ case Node::DOCUMENT_FRAGMENT_NODE: -+ return WEBKIT_DOM_NODE(wrapDocumentFragment(static_cast(node))); -+ case Node::ENTITY_NODE: -+ case Node::NOTATION_NODE: -+ case Node::XPATH_NAMESPACE_NODE: -+ break; -+ } -+ -+ return wrapNode(node); -+} -+ -+WebKitDOMEvent* wrap(Event* event) -+{ -+ ASSERT(event); -+ -+ if (event->isMouseEvent()) -+ return WEBKIT_DOM_EVENT(wrapMouseEvent(static_cast(event))); -+ -+ if (event->isUIEvent()) -+ return WEBKIT_DOM_EVENT(wrapUIEvent(static_cast(event))); -+ -+ return wrapEvent(event); -+} -+ -+WebKitDOMStyleSheet* wrap(StyleSheet* styleSheet) -+{ -+ ASSERT(styleSheet); -+ -+ if (styleSheet->isCSSStyleSheet()) -+ return WEBKIT_DOM_STYLE_SHEET(wrapCSSStyleSheet(static_cast(styleSheet))); -+ return wrapStyleSheet(styleSheet); -+} -+ -+WebKitDOMHTMLCollection* wrap(HTMLCollection* collection) -+{ -+ ASSERT(collection); -+ -+ if (collection->type() == WebCore::SelectOptions) -+ return WEBKIT_DOM_HTML_COLLECTION(wrapHTMLOptionsCollection(static_cast(collection))); -+ return wrapHTMLCollection(collection); -+} -+ -+WebKitDOMEventTarget* wrap(EventTarget* eventTarget) -+{ -+ ASSERT(eventTarget); -+ -+ if (Node* node = eventTarget->toNode()) -+ return WEBKIT_DOM_EVENT_TARGET(kit(node)); -+ -+ if (DOMWindow* window = eventTarget->toDOMWindow()) -+ return WEBKIT_DOM_EVENT_TARGET(kit(window)); -+ -+ return 0; -+} -+ -+WebKitDOMBlob* wrap(Blob* blob) -+{ -+ ASSERT(blob); -+ -+ if (blob->isFile()) -+ return WEBKIT_DOM_BLOB(wrapFile(static_cast(blob))); -+ return wrapBlob(blob); -+} -+ -+} // namespace WebKit -+ -diff --git a/Source/WebCore/bindings/gobject/WebKitDOMPrivate.h b/Source/WebCore/bindings/gobject/WebKitDOMPrivate.h -new file mode 100644 -index 0000000..b18ffe5 ---- /dev/null -+++ b/Source/WebCore/bindings/gobject/WebKitDOMPrivate.h -@@ -0,0 +1,52 @@ -+/* -+ * Copyright (C) 1999-2001 Harri Porten (porten@kde.org) -+ * Copyright (C) 2003, 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. -+ * Copyright (C) 2007 Samuel Weinig -+ * Copyright (C) 2008 Luke Kenneth Casson Leighton -+ * Copyright (C) 2008 Martin Soto -+ * Copyright (C) 2009-2013 Igalia S.L. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#ifndef WebKitDOMPrivate_h -+#define WebKitDOMPrivate_h -+ -+#include -+ -+#define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)) -+#define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)) -+#define WEBKIT_WARN_FEATURE_NOT_PRESENT(Feature) g_warning("WebKitGTK+ was not compiled with support for " Feature); -+ -+namespace WebCore { -+class Node; -+class Event; -+class StyleSheet; -+class HTMLCollection; -+class EventTarget; -+class Blob; -+} // namespace WebCore -+ -+namespace WebKit { -+WebKitDOMNode* wrap(WebCore::Node*); -+WebKitDOMEvent* wrap(WebCore::Event*); -+WebKitDOMStyleSheet* wrap(WebCore::StyleSheet*); -+WebKitDOMHTMLCollection* wrap(WebCore::HTMLCollection*); -+WebKitDOMEventTarget* wrap(WebCore::EventTarget*); -+WebKitDOMBlob* wrap(WebCore::Blob*); -+} // namespace WebKit -+ -+#endif // WebKitDOMPrivate_h -+ -diff --git a/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp b/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp -deleted file mode 100644 -index d3f2dbd..0000000 ---- a/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp -+++ /dev/null -@@ -1,547 +0,0 @@ --/* -- * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. -- * Copyright (C) 2008 Luke Kenneth Casson Leighton -- * Copyright (C) 2008 Martin Soto -- * Copyright (C) 2010 Igalia S.L. -- * -- * This file is derived by hand from an automatically generated file. -- * Keeping it up-to-date could potentially be done by adding -- * a make_names.pl generator, or by writing a separate -- * generater which takes JSHTMLElementWrapperFactory.h as input. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * -- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY -- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR -- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -- --#include "config.h" --#include "WebKitHTMLElementWrapperFactory.h" -- --#include "HTMLAnchorElement.h" --#include "HTMLAppletElement.h" --#include "HTMLAreaElement.h" --#include "HTMLAudioElement.h" --#include "HTMLBRElement.h" --#include "HTMLBaseElement.h" --#include "HTMLBaseFontElement.h" --#include "HTMLBodyElement.h" --#include "HTMLButtonElement.h" --#include "HTMLCanvasElement.h" --#include "HTMLDListElement.h" --#include "HTMLDirectoryElement.h" --#include "HTMLDivElement.h" --#include "HTMLEmbedElement.h" --#include "HTMLFieldSetElement.h" --#include "HTMLFontElement.h" --#include "HTMLFormElement.h" --#include "HTMLFrameElement.h" --#include "HTMLFrameSetElement.h" --#include "HTMLHRElement.h" --#include "HTMLHeadElement.h" --#include "HTMLHeadingElement.h" --#include "HTMLHtmlElement.h" --#include "HTMLIFrameElement.h" --#include "HTMLImageElement.h" --#include "HTMLInputElement.h" --#include "HTMLKeygenElement.h" --#include "HTMLLIElement.h" --#include "HTMLLabelElement.h" --#include "HTMLLegendElement.h" --#include "HTMLLinkElement.h" --#include "HTMLMapElement.h" --#include "HTMLMarqueeElement.h" --#include "HTMLMenuElement.h" --#include "HTMLMetaElement.h" --#include "HTMLModElement.h" --#include "HTMLNames.h" --#include "HTMLOListElement.h" --#include "HTMLObjectElement.h" --#include "HTMLOptGroupElement.h" --#include "HTMLOptionElement.h" --#include "HTMLParagraphElement.h" --#include "HTMLParamElement.h" --#include "HTMLPreElement.h" --#include "HTMLQuoteElement.h" --#include "HTMLScriptElement.h" --#include "HTMLSelectElement.h" --#include "HTMLStyleElement.h" --#include "HTMLTableCaptionElement.h" --#include "HTMLTableCellElement.h" --#include "HTMLTableColElement.h" --#include "HTMLTableElement.h" --#include "HTMLTableRowElement.h" --#include "HTMLTableSectionElement.h" --#include "HTMLTextAreaElement.h" --#include "HTMLTitleElement.h" --#include "HTMLUListElement.h" --#include "HTMLVideoElement.h" --#include "WebKitDOMHTMLAnchorElementPrivate.h" --#include "WebKitDOMHTMLAppletElementPrivate.h" --#include "WebKitDOMHTMLAreaElementPrivate.h" --#include "WebKitDOMHTMLBRElementPrivate.h" --#include "WebKitDOMHTMLBaseElementPrivate.h" --#include "WebKitDOMHTMLBaseFontElementPrivate.h" --#include "WebKitDOMHTMLBodyElementPrivate.h" --#include "WebKitDOMHTMLButtonElementPrivate.h" --#include "WebKitDOMHTMLCanvasElementPrivate.h" --#include "WebKitDOMHTMLDListElementPrivate.h" --#include "WebKitDOMHTMLDirectoryElementPrivate.h" --#include "WebKitDOMHTMLDivElementPrivate.h" --#include "WebKitDOMHTMLElementPrivate.h" --#include "WebKitDOMHTMLEmbedElementPrivate.h" --#include "WebKitDOMHTMLFieldSetElementPrivate.h" --#include "WebKitDOMHTMLFontElementPrivate.h" --#include "WebKitDOMHTMLFormElementPrivate.h" --#include "WebKitDOMHTMLFrameElementPrivate.h" --#include "WebKitDOMHTMLFrameSetElementPrivate.h" --#include "WebKitDOMHTMLHRElementPrivate.h" --#include "WebKitDOMHTMLHeadElementPrivate.h" --#include "WebKitDOMHTMLHeadingElementPrivate.h" --#include "WebKitDOMHTMLHtmlElementPrivate.h" --#include "WebKitDOMHTMLIFrameElementPrivate.h" --#include "WebKitDOMHTMLImageElementPrivate.h" --#include "WebKitDOMHTMLInputElementPrivate.h" --#include "WebKitDOMHTMLKeygenElementPrivate.h" --#include "WebKitDOMHTMLLIElementPrivate.h" --#include "WebKitDOMHTMLLabelElementPrivate.h" --#include "WebKitDOMHTMLLegendElementPrivate.h" --#include "WebKitDOMHTMLLinkElementPrivate.h" --#include "WebKitDOMHTMLMapElementPrivate.h" --#include "WebKitDOMHTMLMarqueeElementPrivate.h" --#include "WebKitDOMHTMLMenuElementPrivate.h" --#include "WebKitDOMHTMLMetaElementPrivate.h" --#include "WebKitDOMHTMLModElementPrivate.h" --#include "WebKitDOMHTMLOListElementPrivate.h" --#include "WebKitDOMHTMLObjectElementPrivate.h" --#include "WebKitDOMHTMLOptGroupElementPrivate.h" --#include "WebKitDOMHTMLOptionElementPrivate.h" --#include "WebKitDOMHTMLParagraphElementPrivate.h" --#include "WebKitDOMHTMLParamElementPrivate.h" --#include "WebKitDOMHTMLPreElementPrivate.h" --#include "WebKitDOMHTMLQuoteElementPrivate.h" --#include "WebKitDOMHTMLScriptElementPrivate.h" --#include "WebKitDOMHTMLSelectElementPrivate.h" --#include "WebKitDOMHTMLStyleElementPrivate.h" --#include "WebKitDOMHTMLTableCaptionElementPrivate.h" --#include "WebKitDOMHTMLTableCellElementPrivate.h" --#include "WebKitDOMHTMLTableColElementPrivate.h" --#include "WebKitDOMHTMLTableElementPrivate.h" --#include "WebKitDOMHTMLTableRowElementPrivate.h" --#include "WebKitDOMHTMLTableSectionElementPrivate.h" --#include "WebKitDOMHTMLTextAreaElementPrivate.h" --#include "WebKitDOMHTMLTitleElementPrivate.h" --#include "WebKitDOMHTMLUListElementPrivate.h" --#include "webkitdom.h" --#include -- --#if ENABLE(VIDEO) --#include "WebKitDOMHTMLAudioElementPrivate.h" --#include "WebKitDOMHTMLVideoElementPrivate.h" --#endif -- --#if ENABLE(VIDEO_TRACK) --#include "WebKitDOMTextTrackCueListPrivate.h" --#include "WebKitDOMTextTrackCuePrivate.h" --#include "WebKitDOMTextTrackListPrivate.h" --#include "WebKitDOMTextTrackPrivate.h" --#include "WebKitDOMTrackEventPrivate.h" --#endif -- --namespace WebKit { -- --using namespace WebCore; --using namespace WebCore::HTMLNames; -- --typedef gpointer (*CreateHTMLElementWrapperFunction)(PassRefPtr); -- --static gpointer createAnchorWrapper(PassRefPtr element) --{ -- return wrapHTMLAnchorElement(static_cast(element.get())); --} -- --static gpointer createAppletWrapper(PassRefPtr element) --{ -- return wrapHTMLAppletElement(static_cast(element.get())); --} -- --static gpointer createAreaWrapper(PassRefPtr element) --{ -- return wrapHTMLAreaElement(static_cast(element.get())); --} -- --#if ENABLE(VIDEO) --static gpointer createAudioWrapper(PassRefPtr element) --{ -- return wrapHTMLAudioElement(static_cast(element.get())); --} -- --static gpointer createVideoWrapper(PassRefPtr element) --{ -- return wrapHTMLVideoElement(static_cast(element.get())); --} --#endif -- --static gpointer createBaseWrapper(PassRefPtr element) --{ -- return wrapHTMLBaseElement(static_cast(element.get())); --} -- --static gpointer createBaseFontWrapper(PassRefPtr element) --{ -- return wrapHTMLBaseFontElement(static_cast(element.get())); --} -- --static gpointer createBodyWrapper(PassRefPtr element) --{ -- return wrapHTMLBodyElement(static_cast(element.get())); --} -- --static gpointer createBRWrapper(PassRefPtr element) --{ -- return wrapHTMLBRElement(static_cast(element.get())); --} -- --static gpointer createButtonWrapper(PassRefPtr element) --{ -- return wrapHTMLButtonElement(static_cast(element.get())); --} -- --static gpointer createCanvasWrapper(PassRefPtr element) --{ -- return wrapHTMLCanvasElement(static_cast(element.get())); --} -- --static gpointer createTableCaptionWrapper(PassRefPtr element) --{ -- return wrapHTMLTableCaptionElement(static_cast(element.get())); --} -- --static gpointer createTableColWrapper(PassRefPtr element) --{ -- return wrapHTMLTableColElement(static_cast(element.get())); --} -- --static gpointer createModWrapper(PassRefPtr element) --{ -- return wrapHTMLModElement(static_cast(element.get())); --} -- --static gpointer createDirectoryWrapper(PassRefPtr element) --{ -- return wrapHTMLDirectoryElement(static_cast(element.get())); --} -- --static gpointer createDivWrapper(PassRefPtr element) --{ -- return wrapHTMLDivElement(static_cast(element.get())); --} -- --static gpointer createDListWrapper(PassRefPtr element) --{ -- return wrapHTMLDListElement(static_cast(element.get())); --} -- --static gpointer createEmbedWrapper(PassRefPtr element) --{ -- return wrapHTMLEmbedElement(static_cast(element.get())); --} -- --static gpointer createFieldSetWrapper(PassRefPtr element) --{ -- return wrapHTMLFieldSetElement(static_cast(element.get())); --} -- --static gpointer createFontWrapper(PassRefPtr element) --{ -- return wrapHTMLFontElement(static_cast(element.get())); --} -- --static gpointer createFormWrapper(PassRefPtr element) --{ -- return wrapHTMLFormElement(static_cast(element.get())); --} -- --static gpointer createFrameWrapper(PassRefPtr element) --{ -- return wrapHTMLFrameElement(static_cast(element.get())); --} -- --static gpointer createFrameSetWrapper(PassRefPtr element) --{ -- return wrapHTMLFrameSetElement(static_cast(element.get())); --} -- --static gpointer createHeadingWrapper(PassRefPtr element) --{ -- return wrapHTMLHeadingElement(static_cast(element.get())); --} -- --static gpointer createHeadWrapper(PassRefPtr element) --{ -- return wrapHTMLHeadElement(static_cast(element.get())); --} -- --static gpointer createHRWrapper(PassRefPtr element) --{ -- return wrapHTMLHRElement(static_cast(element.get())); --} -- --static gpointer createHtmlWrapper(PassRefPtr element) --{ -- return wrapHTMLHtmlElement(static_cast(element.get())); --} -- --static gpointer createIFrameWrapper(PassRefPtr element) --{ -- return wrapHTMLIFrameElement(static_cast(element.get())); --} -- --static gpointer createImageWrapper(PassRefPtr element) --{ -- return wrapHTMLImageElement(static_cast(element.get())); --} -- --static gpointer createInputWrapper(PassRefPtr element) --{ -- return wrapHTMLInputElement(static_cast(element.get())); --} -- --static gpointer createKeygenWrapper(PassRefPtr element) --{ -- return wrapHTMLKeygenElement(static_cast(element.get())); --} -- --static gpointer createLabelWrapper(PassRefPtr element) --{ -- return wrapHTMLLabelElement(static_cast(element.get())); --} -- --static gpointer createLegendWrapper(PassRefPtr element) --{ -- return wrapHTMLLegendElement(static_cast(element.get())); --} -- --static gpointer createLIWrapper(PassRefPtr element) --{ -- return wrapHTMLLIElement(static_cast(element.get())); --} -- --static gpointer createLinkWrapper(PassRefPtr element) --{ -- return wrapHTMLLinkElement(static_cast(element.get())); --} -- --static gpointer createMapWrapper(PassRefPtr element) --{ -- return wrapHTMLMapElement(static_cast(element.get())); --} -- --static gpointer createMarqueeWrapper(PassRefPtr element) --{ -- return wrapHTMLMarqueeElement(static_cast(element.get())); --} -- --static gpointer createMenuWrapper(PassRefPtr element) --{ -- return wrapHTMLMenuElement(static_cast(element.get())); --} -- --static gpointer createMetaWrapper(PassRefPtr element) --{ -- return wrapHTMLMetaElement(static_cast(element.get())); --} -- --static gpointer createObjectWrapper(PassRefPtr element) --{ -- return wrapHTMLObjectElement(static_cast(element.get())); --} -- --static gpointer createOListWrapper(PassRefPtr element) --{ -- return wrapHTMLOListElement(static_cast(element.get())); --} -- --static gpointer createOptGroupWrapper(PassRefPtr element) --{ -- return wrapHTMLOptGroupElement(static_cast(element.get())); --} -- --static gpointer createOptionWrapper(PassRefPtr element) --{ -- return wrapHTMLOptionElement(static_cast(element.get())); --} -- --static gpointer createParagraphWrapper(PassRefPtr element) --{ -- return wrapHTMLParagraphElement(static_cast(element.get())); --} -- --static gpointer createParamWrapper(PassRefPtr element) --{ -- return wrapHTMLParamElement(static_cast(element.get())); --} -- --static gpointer createPreWrapper(PassRefPtr element) --{ -- return wrapHTMLPreElement(static_cast(element.get())); --} -- --static gpointer createQuoteWrapper(PassRefPtr element) --{ -- return wrapHTMLQuoteElement(static_cast(element.get())); --} -- --static gpointer createScriptWrapper(PassRefPtr element) --{ -- return wrapHTMLScriptElement(static_cast(element.get())); --} -- --static gpointer createSelectWrapper(PassRefPtr element) --{ -- return wrapHTMLSelectElement(static_cast(element.get())); --} -- --static gpointer createStyleWrapper(PassRefPtr element) --{ -- return wrapHTMLStyleElement(static_cast(element.get())); --} -- --static gpointer createTableWrapper(PassRefPtr element) --{ -- return wrapHTMLTableElement(static_cast(element.get())); --} -- --static gpointer createTableSectionWrapper(PassRefPtr element) --{ -- return wrapHTMLTableSectionElement(static_cast(element.get())); --} -- --static gpointer createTableCellWrapper(PassRefPtr element) --{ -- return wrapHTMLTableCellElement(static_cast(element.get())); --} -- --static gpointer createTextAreaWrapper(PassRefPtr element) --{ -- return wrapHTMLTextAreaElement(static_cast(element.get())); --} -- --static gpointer createTitleWrapper(PassRefPtr element) --{ -- return wrapHTMLTitleElement(static_cast(element.get())); --} -- --static gpointer createTableRowWrapper(PassRefPtr element) --{ -- return wrapHTMLTableRowElement(static_cast(element.get())); --} -- --static gpointer createUListWrapper(PassRefPtr element) --{ -- return wrapHTMLUListElement(static_cast(element.get())); --} -- --gpointer createHTMLElementWrapper(PassRefPtr element) --{ -- static HashMap map; -- if (map.isEmpty()) { -- map.set(aTag.localName().impl(), createAnchorWrapper); -- map.set(appletTag.localName().impl(), createAppletWrapper); --#if ENABLE(VIDEO) -- map.set(audioTag.localName().impl(), createAudioWrapper); -- map.set(videoTag.localName().impl(), createVideoWrapper); --#endif -- map.set(areaTag.localName().impl(), createAreaWrapper); -- map.set(baseTag.localName().impl(), createBaseWrapper); -- map.set(basefontTag.localName().impl(), createBaseFontWrapper); -- map.set(blockquoteTag.localName().impl(), createQuoteWrapper); -- map.set(bodyTag.localName().impl(), createBodyWrapper); -- map.set(brTag.localName().impl(), createBRWrapper); -- map.set(buttonTag.localName().impl(), createButtonWrapper); -- map.set(canvasTag.localName().impl(), createCanvasWrapper); -- map.set(captionTag.localName().impl(), createTableCaptionWrapper); -- map.set(colTag.localName().impl(), createTableColWrapper); -- map.set(delTag.localName().impl(), createModWrapper); -- map.set(dirTag.localName().impl(), createDirectoryWrapper); -- map.set(divTag.localName().impl(), createDivWrapper); -- map.set(dlTag.localName().impl(), createDListWrapper); -- map.set(embedTag.localName().impl(), createEmbedWrapper); -- map.set(fieldsetTag.localName().impl(), createFieldSetWrapper); -- map.set(fontTag.localName().impl(), createFontWrapper); -- map.set(formTag.localName().impl(), createFormWrapper); -- map.set(frameTag.localName().impl(), createFrameWrapper); -- map.set(framesetTag.localName().impl(), createFrameSetWrapper); -- map.set(h1Tag.localName().impl(), createHeadingWrapper); -- map.set(headTag.localName().impl(), createHeadWrapper); -- map.set(hrTag.localName().impl(), createHRWrapper); -- map.set(htmlTag.localName().impl(), createHtmlWrapper); -- map.set(iframeTag.localName().impl(), createIFrameWrapper); -- map.set(imgTag.localName().impl(), createImageWrapper); -- map.set(inputTag.localName().impl(), createInputWrapper); -- map.set(labelTag.localName().impl(), createLabelWrapper); -- map.set(legendTag.localName().impl(), createLegendWrapper); -- map.set(liTag.localName().impl(), createLIWrapper); -- map.set(linkTag.localName().impl(), createLinkWrapper); -- map.set(mapTag.localName().impl(), createMapWrapper); -- map.set(marqueeTag.localName().impl(), createMarqueeWrapper); -- map.set(menuTag.localName().impl(), createMenuWrapper); -- map.set(metaTag.localName().impl(), createMetaWrapper); -- map.set(objectTag.localName().impl(), createObjectWrapper); -- map.set(olTag.localName().impl(), createOListWrapper); -- map.set(optgroupTag.localName().impl(), createOptGroupWrapper); -- map.set(optionTag.localName().impl(), createOptionWrapper); -- map.set(pTag.localName().impl(), createParagraphWrapper); -- map.set(paramTag.localName().impl(), createParamWrapper); -- map.set(preTag.localName().impl(), createPreWrapper); -- map.set(qTag.localName().impl(), createQuoteWrapper); -- map.set(scriptTag.localName().impl(), createScriptWrapper); -- map.set(selectTag.localName().impl(), createSelectWrapper); -- map.set(styleTag.localName().impl(), createStyleWrapper); -- map.set(tableTag.localName().impl(), createTableWrapper); -- map.set(tbodyTag.localName().impl(), createTableSectionWrapper); -- map.set(tdTag.localName().impl(), createTableCellWrapper); -- map.set(textareaTag.localName().impl(), createTextAreaWrapper); -- map.set(titleTag.localName().impl(), createTitleWrapper); -- map.set(trTag.localName().impl(), createTableRowWrapper); -- map.set(ulTag.localName().impl(), createUListWrapper); -- map.set(colgroupTag.localName().impl(), createTableColWrapper); -- map.set(h2Tag.localName().impl(), createHeadingWrapper); -- map.set(h3Tag.localName().impl(), createHeadingWrapper); -- map.set(h4Tag.localName().impl(), createHeadingWrapper); -- map.set(h5Tag.localName().impl(), createHeadingWrapper); -- map.set(h6Tag.localName().impl(), createHeadingWrapper); -- map.set(imageTag.localName().impl(), createImageWrapper); -- map.set(insTag.localName().impl(), createModWrapper); -- map.set(keygenTag.localName().impl(), createKeygenWrapper); -- map.set(listingTag.localName().impl(), createPreWrapper); -- map.set(tfootTag.localName().impl(), createTableSectionWrapper); -- map.set(thTag.localName().impl(), createTableCellWrapper); -- map.set(theadTag.localName().impl(), createTableSectionWrapper); -- map.set(xmpTag.localName().impl(), createPreWrapper); -- } -- -- CreateHTMLElementWrapperFunction createWrapperFunction = -- map.get(element->localName().impl()); -- if (createWrapperFunction) -- return createWrapperFunction(element); -- return wrapHTMLElement(element.get()); --} -- --} -diff --git a/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h b/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h -deleted file mode 100644 -index 9aedcae..0000000 ---- a/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h -+++ /dev/null -@@ -1,36 +0,0 @@ --/* -- * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. -- * Copyright (C) 2010 Igalia S.L. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * -- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY -- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR -- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --*/ -- --#ifndef WebKitHTMLElementWrapperFactory_h --#define WebKitHTMLElementWrapperFactory_h -- --#include "HTMLElement.h" -- --namespace WebKit { --gpointer createHTMLElementWrapper(PassRefPtr); --} -- --#endif // WebKitHTMLElementWrapperFactory_h -diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm b/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm -index 7a5d73f..69c0db1 100644 ---- a/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm -+++ b/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm -@@ -37,6 +37,14 @@ my @txtGetProps = (); - - my $className = ""; - -+# FIXME: this should be replaced with a function that recurses up the tree -+# to find the actual base type. -+my %baseTypeHash = ("Object" => 1, "Node" => 1, "NodeList" => 1, "NamedNodeMap" => 1, "DOMImplementation" => 1, -+ "Event" => 1, "CSSRule" => 1, "CSSValue" => 1, "StyleSheet" => 1, "MediaList" => 1, -+ "Counter" => 1, "Rect" => 1, "RGBColor" => 1, "XPathExpression" => 1, "XPathResult" => 1, -+ "NodeIterator" => 1, "TreeWalker" => 1, "AbstractView" => 1, "Blob" => 1, "DOMTokenList" => 1, -+ "HTMLCollection" => 1); -+ - # Default constructor - sub new { - my $object = shift; -@@ -83,6 +91,25 @@ sub GetParentImplClassName { - return $interface->parents(0); - } - -+sub IsBaseType -+{ -+ my $type = shift; -+ -+ return 1 if $baseTypeHash{$type}; -+ return 0; -+} -+ -+sub GetBaseClass -+{ -+ $parent = shift; -+ -+ return $parent if $parent eq "Object" or IsBaseType($parent); -+ return "Event" if $parent eq "UIEvent" or $parent eq "MouseEvent"; -+ return "CSSValue" if $parent eq "SVGColor" or $parent eq "CSSValueList"; -+ return "Node"; -+} -+ -+ - # From String::CamelCase 0.01 - sub camelize - { -@@ -470,6 +497,7 @@ sub GenerateProperty { - $getterFunctionName = "coreSelf->$getterFunctionName"; - $setterFunctionName = "coreSelf->$setterFunctionName"; - } -+ push(@getterArguments, "isNull") if $attribute->signature->isNullable; - push(@getterArguments, "ec") if @{$attribute->getterExceptions}; - push(@setterArguments, "ec") if @{$attribute->setterExceptions}; - -@@ -491,8 +519,11 @@ sub GenerateProperty { - push(@txtGetProps, " case ${propEnum}: {\n"); - push(@txtGetProps, "#if ${parentConditionalString}\n") if $parentConditionalString; - push(@txtGetProps, "#if ${conditionalString}\n") if $conditionalString; -+ push(@txtGetProps, " bool isNull = false;\n") if $attribute->signature->isNullable; - push(@txtGetProps, " WebCore::ExceptionCode ec = 0;\n") if @{$attribute->getterExceptions}; - -+ # FIXME: Should we return a default value when isNull == true? -+ - my $postConvertFunction = ""; - my $done = 0; - if ($gtype eq "string") { -@@ -893,11 +924,7 @@ sub GenerateFunction { - } - - if ($returnType ne "void" && $returnValueIsGDOMType && $functionSigType ne "any") { -- if ($functionSigType ne "EventTarget") { -- $implIncludes{"WebKitDOM${functionSigType}Private.h"} = 1; -- } else { -- $implIncludes{"WebKitDOM${functionSigType}.h"} = 1; -- } -+ $implIncludes{"WebKitDOM${functionSigType}Private.h"} = 1; - } - - if (@{$function->raisesExceptions}) { -@@ -1003,8 +1030,14 @@ sub GenerateFunction { - } - } - -+ # FIXME: Should we return a default value when isNull == true? -+ if ($function->signature->isNullable) { -+ push(@cBody, " bool isNull = false;\n"); -+ push(@callImplParams, "isNull"); -+ } -+ - if (@{$function->raisesExceptions}) { -- push(@cBody, " WebCore::ExceptionCode ec = 0;\n") ; -+ push(@cBody, " WebCore::ExceptionCode ec = 0;\n"); - push(@callImplParams, "ec"); - } - -@@ -1240,6 +1273,7 @@ sub GenerateCFile { - my $clsCaps = uc(FixUpDecamelizedName(decamelize($interfaceName))); - my $lowerCaseIfaceName = "webkit_dom_" . FixUpDecamelizedName(decamelize($interfaceName)); - my $parentImplClassName = GetParentImplClassName($interface); -+ my $baseClassName = GetBaseClass($parentImplClassName); - - # Add a private struct only for direct subclasses of Object so that we can use RefPtr - # for the WebCore wrapped object and make sure we only increment the reference counter once. -@@ -1259,21 +1293,32 @@ ${defineTypeMacro}(${className}, ${lowerCaseIfaceName}, ${parentGObjType}${defin - EOF - push(@cBodyProperties, $implContent); - -- if (!UsesManualKitImplementation($interfaceName)) { -- $implContent = << "EOF"; --${className}* kit(WebCore::$interfaceName* obj) --{ -- if (!obj) -- return 0; -- -- if (gpointer ret = DOMObjectCache::get(obj)) -- return WEBKIT_DOM_${clsCaps}(ret); -- -- return wrap${interfaceName}(obj); --} -- --EOF -- push(@cBodyPriv, $implContent); -+ if ($parentImplClassName eq "Object") { -+ push(@cBodyPriv, "${className}* kit(WebCore::$interfaceName* obj)\n"); -+ push(@cBodyPriv, "{\n"); -+ push(@cBodyPriv, " if (!obj)\n"); -+ push(@cBodyPriv, " return 0;\n\n"); -+ push(@cBodyPriv, " if (gpointer ret = DOMObjectCache::get(obj))\n"); -+ push(@cBodyPriv, " return WEBKIT_DOM_${clsCaps}(ret);\n\n"); -+ if (IsPolymorphic($interfaceName)) { -+ push(@cBodyPriv, " return wrap(obj);\n"); -+ } else { -+ push(@cBodyPriv, " return wrap${interfaceName}(obj);\n"); -+ } -+ push(@cBodyPriv, "}\n\n"); -+ } else { -+ push(@cBodyPriv, "${className}* kit(WebCore::$interfaceName* obj)\n"); -+ push(@cBodyPriv, "{\n"); -+ if (!IsPolymorphic($baseClassName)) { -+ push(@cBodyPriv, " if (!obj)\n"); -+ push(@cBodyPriv, " return 0;\n\n"); -+ push(@cBodyPriv, " if (gpointer ret = DOMObjectCache::get(obj))\n"); -+ push(@cBodyPriv, " return WEBKIT_DOM_${clsCaps}(ret);\n\n"); -+ push(@cBodyPriv, " return wrap${interfaceName}(obj);\n"); -+ } else { -+ push(@cBodyPriv, " return WEBKIT_DOM_${clsCaps}(kit(static_cast(obj)));\n"); -+ } -+ push(@cBodyPriv, "}\n\n"); - } - - $implContent = << "EOF"; -@@ -1305,10 +1350,11 @@ sub GenerateEndHeader { - push(@hPrefixGuardEnd, "#endif /* $guard */\n"); - } - --sub UsesManualKitImplementation { -+sub IsPolymorphic { - my $type = shift; - -- return 1 if $type eq "Node" or $type eq "Element" or $type eq "Event"; -+ # FIXME: should we use ObjCPolymorphic attribute? or is it specific to ObjC bindings? -+ return 1 if $type eq "Node" or $type eq "Event" or $type eq "HTMLCollection" or $type eq "StyleSheet" or $type eq "Blob"; - return 0; - } - -@@ -1371,17 +1417,23 @@ sub Generate { - my $parentClassName = GetParentClassName($interface); - my $parentGObjType = GetParentGObjType($interface); - my $interfaceName = $interface->name; -+ my $parentImplClassName = GetParentImplClassName($interface); -+ my $baseClassName = GetBaseClass($parentImplClassName); - - # Add the default impl header template - @cPrefix = split("\r", $licenceTemplate); - push(@cPrefix, "\n"); - - $implIncludes{"DOMObjectCache.h"} = 1; -- $implIncludes{"WebKitDOMBinding.h"} = 1; -+ $implIncludes{"WebKitDOMPrivate.h"} = 1; - $implIncludes{"gobject/ConvertToUTF8String.h"} = 1; - $implIncludes{"${className}Private.h"} = 1; - $implIncludes{"JSMainThreadExecState.h"} = 1; - $implIncludes{"ExceptionCode.h"} = 1; -+ $implIncludes{"CSSImportRule.h"} = 1; -+ if ($parentImplClassName ne "Object" and IsPolymorphic($baseClassName)) { -+ $implIncludes{"WebKitDOM${baseClassName}Private.h"} = 1; -+ } - - $hdrIncludes{"webkitdom/${parentClassName}.h"} = 1; - -@@ -1424,15 +1476,12 @@ EOF - $text = << "EOF"; - namespace WebKit { - ${className}* wrap${interfaceName}(WebCore::${interfaceName}*); --WebCore::${interfaceName}* core(${className}* request); -+${className}* kit(WebCore::${interfaceName}*); -+WebCore::${interfaceName}* core(${className}*); - EOF - - print PRIVHEADER $text; - -- if ($className ne "WebKitDOMNode") { -- print PRIVHEADER "${className}* kit(WebCore::${interfaceName}* node);\n" -- } -- - $text = << "EOF"; - } // namespace WebKit - -diff --git a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp -index 315c781..897e26a 100644 ---- a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp -+++ b/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp -@@ -51,7 +51,6 @@ - #include "RefPtrCairo.h" - #include "SearchPopupMenuGtk.h" - #include "SecurityOrigin.h" --#include "WebKitDOMBinding.h" - #include "WebKitDOMHTMLElementPrivate.h" - #include "WindowFeatures.h" - #include "webkitfilechooserrequestprivate.h" -diff --git a/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp -index 63bd817..57b0cab 100644 ---- a/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp -+++ b/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp -@@ -38,7 +38,6 @@ - #include "PasteboardHelper.h" - #include "PlatformKeyboardEvent.h" - #include "UndoStep.h" --#include "WebKitDOMBinding.h" - #include "WebKitDOMCSSStyleDeclarationPrivate.h" - #include "WebKitDOMHTMLElementPrivate.h" - #include "WebKitDOMNodePrivate.h" -diff --git a/Source/WebKit/gtk/webkit/webkithittestresult.cpp b/Source/WebKit/gtk/webkit/webkithittestresult.cpp -index c4081a7..c403a03 100644 ---- a/Source/WebKit/gtk/webkit/webkithittestresult.cpp -+++ b/Source/WebKit/gtk/webkit/webkithittestresult.cpp -@@ -25,8 +25,7 @@ - #include "FrameView.h" - #include "HitTestResult.h" - #include "KURL.h" --#include "WebKitDOMBinding.h" --#include "WebKitDOMNode.h" -+#include "WebKitDOMNodePrivate.h" - #include "webkitenumtypes.h" - #include "webkitglobals.h" - #include "webkitglobalsprivate.h" From fdc56c06a1758ebbc9fadb09988af9703b8dd1eb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 6 May 2013 21:19:03 -0400 Subject: [PATCH 093/211] Split off a libwebkit2gtk subpackage --- webkitgtk3.spec | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 29fea6e..da135fb 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -67,16 +67,14 @@ GTK+ platform. This package contains WebKitGTK+ for GTK+ 3. -%package devel -Summary: Development files for %{name} +%package -n libwebkit2gtk +Summary: The libwebkit2gtk library Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -Requires: gtk3-devel -%description devel -The %{name}-devel package contains libraries, build data, and header -files for developing applications that use %{name}. +%description -n libwebkit2gtk +The libwebkit2gtk package contains the libwebkit2gtk library +that is part of %{name}. %package doc Summary: Documentation files for %{name} @@ -186,17 +184,19 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %files -f WebKitGTK-3.0.lang %doc %{_docdir}/%{name}-%{version}/ %{_libdir}/libwebkitgtk-3.0.so.* -%{_libdir}/libwebkit2gtk-3.0.so.* %{_libdir}/libjavascriptcoregtk-3.0.so.* %{_libdir}/girepository-1.0/WebKit-3.0.typelib -%{_libdir}/girepository-1.0/WebKit2-3.0.typelib %{_libdir}/girepository-1.0/JSCore-3.0.typelib -%{_libdir}/webkit2gtk-3.0/ %{_libexecdir}/%{name}/ %{_libexecdir}/WebKitPluginProcess %{_libexecdir}/WebKitWebProcess %{_datadir}/webkitgtk-3.0 +%files -n libwebkit2gtk +%{_libdir}/libwebkit2gtk-3.0.so.* +%{_libdir}/webkit2gtk-3.0/ +%{_libdir}/girepository-1.0/WebKit2-3.0.typelib + %files devel %{_bindir}/jsc-3 %{_includedir}/webkitgtk-3.0 @@ -218,6 +218,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Mon May 6 2013 Matthias Clasen - 2.0.1-2 +- Split libwebkit2gtk off into a subpackage to avoid + pulling this 35M behemoth of a library onto the livecd + needlessly + * Tue Apr 16 2013 Tomas Popela - 2.0.1-1 - Update to 2.0.1 From b6fc024767aff77d4023517fd5099e89d4e5d3f2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 6 May 2013 21:20:42 -0400 Subject: [PATCH 094/211] Readd accidentally lost devel package --- webkitgtk3.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index da135fb..114a3f8 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -76,6 +76,17 @@ Requires: %{name} = %{version}-%{release} The libwebkit2gtk package contains the libwebkit2gtk library that is part of %{name}. +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig +Requires: gtk3-devel + +%description devel +The %{name}-devel package contains libraries, build data, and header +files for developing applications that use %{name}. + %package doc Summary: Documentation files for %{name} Group: Documentation From 868a8781ff070030437294caad15d1d3c088e3f0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 7 May 2013 00:40:15 +0200 Subject: [PATCH 095/211] Split off a few more files to libwebkit2gtk subpackage --- webkitgtk3.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 114a3f8..79087e2 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -198,15 +198,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libdir}/libjavascriptcoregtk-3.0.so.* %{_libdir}/girepository-1.0/WebKit-3.0.typelib %{_libdir}/girepository-1.0/JSCore-3.0.typelib -%{_libexecdir}/%{name}/ -%{_libexecdir}/WebKitPluginProcess -%{_libexecdir}/WebKitWebProcess +%dir %{_libexecdir}/%{name} +%{_libexecdir}/%{name}/GtkLauncher %{_datadir}/webkitgtk-3.0 %files -n libwebkit2gtk %{_libdir}/libwebkit2gtk-3.0.so.* %{_libdir}/webkit2gtk-3.0/ %{_libdir}/girepository-1.0/WebKit2-3.0.typelib +%{_libexecdir}/%{name}/MiniBrowser +%{_libexecdir}/WebKitPluginProcess +%{_libexecdir}/WebKitWebProcess %files devel %{_bindir}/jsc-3 From cc4b259d429b3d4c95afb72d10536a10ea2b20a4 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 13 May 2013 14:54:02 +0200 Subject: [PATCH 096/211] Update to 2.0.2 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8fdd26c..ee6b32d 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ webkit-1.3.3.tar.gz /webkitgtk-1.11.92.tar.xz /webkitgtk-2.0.0.tar.xz /webkitgtk-2.0.1.tar.xz +/webkitgtk-2.0.2.tar.xz diff --git a/sources b/sources index 4df8702..6a46942 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69c2037b6d2644d789d34940eac9c993 webkitgtk-2.0.1.tar.xz +a4024f4b33d829ec1034179e94f9cab6 webkitgtk-2.0.2.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 79087e2..6c4059e 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.0.1 -Release: 2%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -231,6 +231,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Mon May 13 2013 Tomas Popela - 2.0.2-1 +- Update to 2.0.2 + * Mon May 6 2013 Matthias Clasen - 2.0.1-2 - Split libwebkit2gtk off into a subpackage to avoid pulling this 35M behemoth of a library onto the livecd From 8c177ca22ac8ba9a2eb11a71fa96144a33d0068a Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 3 Jun 2013 11:33:38 +0200 Subject: [PATCH 097/211] Update to 2.1.1 --- .gitignore | 1 + sources | 2 +- webkit-1.11.2-Double2Ints.patch | 21 ----------- webkit-1.11.2-yarr.patch | 12 ------ webkitgtk-1.11.5-libatomic.patch | 63 -------------------------------- webkitgtk-2.1.1-yarr.patch | 12 ++++++ webkitgtk3.spec | 24 +++++------- 7 files changed, 23 insertions(+), 112 deletions(-) delete mode 100644 webkit-1.11.2-Double2Ints.patch delete mode 100644 webkit-1.11.2-yarr.patch delete mode 100644 webkitgtk-1.11.5-libatomic.patch create mode 100644 webkitgtk-2.1.1-yarr.patch diff --git a/.gitignore b/.gitignore index ee6b32d..6d7c2d0 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ webkit-1.3.3.tar.gz /webkitgtk-2.0.0.tar.xz /webkitgtk-2.0.1.tar.xz /webkitgtk-2.0.2.tar.xz +/webkitgtk-2.1.1.tar.xz diff --git a/sources b/sources index 6a46942..a0ac1a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4024f4b33d829ec1034179e94f9cab6 webkitgtk-2.0.2.tar.xz +a460cdcd09c7a07f5e63cfe5780f545a webkitgtk-2.1.1.tar.xz diff --git a/webkit-1.11.2-Double2Ints.patch b/webkit-1.11.2-Double2Ints.patch deleted file mode 100644 index 3371964..0000000 --- a/webkit-1.11.2-Double2Ints.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.double2ints webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ---- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.double2ints 2013-02-12 17:22:38.000000000 +0100 -+++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-03-07 18:04:39.778807991 +0100 -@@ -117,6 +118,17 @@ static double Ints2Double(uint32_t lo, u - u.ival64 = (static_cast(hi) << 32) | lo; - return u.dval; - } -+ -+static void Double2Ints(double input, intptr_t& lo, intptr_t& hi) -+{ -+ union { -+ double dval; -+ int64_t ival64; -+ } u; -+ u.dval = input; -+ hi = static_cast(u.ival64 >> 32); -+ lo = static_cast(u.ival64); -+} - #endif // USE(JSVALUE32_64) - - } // namespace LLint diff --git a/webkit-1.11.2-yarr.patch b/webkit-1.11.2-yarr.patch deleted file mode 100644 index 494e5a8..0000000 --- a/webkit-1.11.2-yarr.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig webkitgtk-1.11.2/Source/WTF/wtf/Platform.h ---- webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig 2012-12-16 21:27:29.000000000 +0100 -+++ webkitgtk-1.11.2/Source/WTF/wtf/Platform.h 2012-12-16 23:16:19.000000000 +0100 -@@ -1001,7 +1001,7 @@ - #define ENABLE_REGEXP_TRACING 0 - - /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ --#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT)) -+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT)) - #define ENABLE_YARR_JIT 1 - - /* Setting this flag compares JIT results with interpreter results. */ diff --git a/webkitgtk-1.11.5-libatomic.patch b/webkitgtk-1.11.5-libatomic.patch deleted file mode 100644 index 8c2b721..0000000 --- a/webkitgtk-1.11.5-libatomic.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up webkitgtk-1.11.90/GNUmakefile.in.libatomic webkitgtk-1.11.90/GNUmakefile.in ---- webkitgtk-1.11.90/GNUmakefile.in.libatomic 2013-02-21 19:07:19.000000000 +0100 -+++ webkitgtk-1.11.90/GNUmakefile.in 2013-02-25 11:31:34.824149062 +0100 -@@ -20933,6 +20933,7 @@ libWTF_la_CXXFLAGS = \ - $(libWTF_la_CFLAGS) - - libWTF_la_CFLAGS = \ -+ -latomic \ - -fstrict-aliasing \ - -O3 \ - $(global_cflags) \ -@@ -22305,7 +22306,7 @@ Programs_WebKitPluginProcess_SOURCES = \ - - #if ENABLE_SVG - #endif --Programs_WebKitPluginProcess_LDADD = -lpthread \ -+Programs_WebKitPluginProcess_LDADD = -latomic -lpthread \ - libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ - libWebCore.la libWebCoreSVG.la libWebCorePlatform.la \ - libWebCoreGtk2.la $(CAIRO_LIBS) $(COVERAGE_LDFLAGS) \ -diff -up webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am.libatomic webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am ---- webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am.libatomic 2013-02-25 11:28:58.812154709 +0100 -+++ webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am 2013-02-25 11:29:14.906154126 +0100 -@@ -568,6 +568,7 @@ Programs_WebKitPluginProcess_SOURCES = \ - $(webkit2_plugin_process_sources) - - Programs_WebKitPluginProcess_LDADD = \ -+ -latomic \ - -lpthread \ - libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ - libWebCore.la -diff -up webkitgtk-1.11.90/Source/WTF/GNUmakefile.am.libatomic webkitgtk-1.11.90/Source/WTF/GNUmakefile.am ---- webkitgtk-1.11.90/Source/WTF/GNUmakefile.am.libatomic 2012-07-19 12:02:14.000000000 +0200 -+++ webkitgtk-1.11.90/Source/WTF/GNUmakefile.am 2013-02-25 09:21:31.552243859 +0100 -@@ -25,6 +25,7 @@ libWTF_la_CXXFLAGS = \ - $(libWTF_la_CFLAGS) - - libWTF_la_CFLAGS = \ -+ -latomic \ - -fstrict-aliasing \ - -O3 \ - $(global_cflags) \ -diff -up webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h.libatomic webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h ---- webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h.libatomic 2013-01-29 11:00:42.000000000 +0100 -+++ webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h 2013-02-25 09:21:31.553243859 +0100 -@@ -107,6 +107,17 @@ inline int atomicDecrement(int volatile* - inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; } - inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; } - -+#elif COMPILER(GCC) && (__GNUC__ > 4 || (__GNUC__ == 4 \ -+ && (__GNUC_MINOR__ > 8 || (__GNUC_MINOR__ == 8 \ -+ && (__GNUC_PATCHLEVEL__ > 0 || (__GNUC_PATCHLEVEL__ == 0)))))) \ -+ && CPU(PPC) -+#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 -+inline int atomicIncrement(int volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); } -+inline int atomicDecrement(int volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); } -+ -+inline int64_t atomicIncrement(int64_t volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); } -+inline int64_t atomicDecrement(int64_t volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); } -+ - #elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc - #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 - diff --git a/webkitgtk-2.1.1-yarr.patch b/webkitgtk-2.1.1-yarr.patch new file mode 100644 index 0000000..6752c20 --- /dev/null +++ b/webkitgtk-2.1.1-yarr.patch @@ -0,0 +1,12 @@ +diff -up webkitgtk-2.1.1/Source/WTF/wtf/Platform.h.yarr webkitgtk-2.1.1/Source/WTF/wtf/Platform.h +--- webkitgtk-2.1.1/Source/WTF/wtf/Platform.h.yarr 2013-05-29 15:41:14.572995439 +0200 ++++ webkitgtk-2.1.1/Source/WTF/wtf/Platform.h 2013-05-29 15:42:04.434993292 +0200 +@@ -823,7 +823,7 @@ + #define ENABLE_REGEXP_TRACING 0 + + /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ +-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT)) ++#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT)) + #define ENABLE_YARR_JIT 1 + + /* Setting this flag compares JIT results with interpreter results. */ diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 6c4059e..98a0574 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.0.2 +Version: 2.1.1 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -19,10 +19,8 @@ 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: webkit-1.11.2-yarr.patch +Patch1: webkitgtk-2.1.1-yarr.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 -Patch2: webkit-1.11.2-Double2Ints.patch -Patch3: webkitgtk-1.11.5-libatomic.patch Patch4: webkit-1.11.90-double2intsPPC32.patch BuildRequires: bison @@ -57,10 +55,6 @@ BuildRequires: perl-Switch BuildRequires: ruby BuildRequires: mesa-libGL-devel -%ifarch ppc -BuildRequires: libatomic -%endif - %description WebKitGTK+ is the port of the portable web rendering engine WebKit to the GTK+ platform. @@ -100,11 +94,6 @@ This package contains developer documentation for %{name}. %setup -qn "webkitgtk-%{version}" %patch0 -p1 -b .nspluginwrapper %patch1 -p1 -b .yarr -%patch2 -p1 -b .double2ints -%ifarch ppc -%patch3 -p1 -b .libatomic -%endif -# required for 32-bit big-endians %ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif @@ -143,6 +132,7 @@ mkdir -p DerivedSources/ANGLE mkdir -p DerivedSources/WebKit2 mkdir -p DerivedSources/webkitdom/ mkdir -p DerivedSources/InjectedBundle +mkdir -p DerivedSources/Platform make %{_smp_mflags} V=1 @@ -197,7 +187,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libdir}/libwebkitgtk-3.0.so.* %{_libdir}/libjavascriptcoregtk-3.0.so.* %{_libdir}/girepository-1.0/WebKit-3.0.typelib -%{_libdir}/girepository-1.0/JSCore-3.0.typelib +%{_libdir}/girepository-1.0/JavaScriptCore-3.0.typelib %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/GtkLauncher %{_datadir}/webkitgtk-3.0 @@ -221,7 +211,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_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/JSCore-3.0.gir +%{_datadir}/gir-1.0/JavaScriptCore-3.0.gir %files doc %dir %{_datadir}/gtk-doc @@ -231,6 +221,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Mon Jun 3 2013 Tomas Popela - 2.1.1-1 +- Update to 2.1.1 +- Drop unused patches + * Mon May 13 2013 Tomas Popela - 2.0.2-1 - Update to 2.0.2 From 97e3a5fb0db4638d80f122fc4a83007e2fce881f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 3 Jun 2013 11:53:12 +0200 Subject: [PATCH 098/211] Remove glib-compile-schemas handling The scriptlets are no longer needed as the schemas itself are gone. --- webkitgtk3.spec | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 98a0574..138bd6d 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -171,15 +171,7 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %post -p /sbin/ldconfig - -%postun -/sbin/ldconfig -if [ $1 -eq 0 ] ; then - glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : -fi - -%posttrans -glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : +%postun -p /sbin/ldconfig %files -f WebKitGTK-3.0.lang @@ -221,6 +213,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Mon Jun 03 2013 Kalev Lember - 2.1.1-2 +- Remove glib-compile-schemas scriptlets: the schemas are no longer installed + * Mon Jun 3 2013 Tomas Popela - 2.1.1-1 - Update to 2.1.1 - Drop unused patches From 3d591f294a73d8e0b3b8eebd6ef6db69a45332e5 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 3 Jun 2013 11:53:38 +0200 Subject: [PATCH 099/211] Add ldconfig calls to the libwebkit2gtk subpackage --- webkitgtk3.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 138bd6d..b17f32e 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -173,6 +173,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post -n libwebkit2gtk -p /sbin/ldconfig +%postun -n libwebkit2gtk -p /sbin/ldconfig + %files -f WebKitGTK-3.0.lang %doc %{_docdir}/%{name}-%{version}/ @@ -215,6 +218,7 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog * Mon Jun 03 2013 Kalev Lember - 2.1.1-2 - Remove glib-compile-schemas scriptlets: the schemas are no longer installed +- Add ldconfig calls to the libwebkit2gtk subpackage * Mon Jun 3 2013 Tomas Popela - 2.1.1-1 - Update to 2.1.1 From f627d5c8e4d27e94a95773bcc83a3c20e05f9ddc Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 3 Jun 2013 11:53:47 +0200 Subject: [PATCH 100/211] Remove rpath from MiniBrowser --- webkitgtk3.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index b17f32e..c643892 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -148,6 +148,7 @@ chrpath --delete %{buildroot}%{_bindir}/jsc-3 chrpath --delete %{buildroot}%{_libdir}/libwebkitgtk-3.0.so chrpath --delete %{buildroot}%{_libdir}/libwebkit2gtk-3.0.so chrpath --delete %{buildroot}%{_libexecdir}/%{name}/GtkLauncher +chrpath --delete %{buildroot}%{_libexecdir}/%{name}/MiniBrowser chrpath --delete %{buildroot}%{_libexecdir}/WebKitPluginProcess chrpath --delete %{buildroot}%{_libexecdir}/WebKitWebProcess @@ -219,6 +220,7 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete * Mon Jun 03 2013 Kalev Lember - 2.1.1-2 - Remove glib-compile-schemas scriptlets: the schemas are no longer installed - Add ldconfig calls to the libwebkit2gtk subpackage +- Remove rpath from MiniBrowser * Mon Jun 3 2013 Tomas Popela - 2.1.1-1 - Update to 2.1.1 From 63127f0aae5ce6de0cc873e2fb0ea58301c570bb Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 3 Jun 2013 16:22:42 +0200 Subject: [PATCH 101/211] Re-enable full debuginfo For a while, webkitgtk3 was built with -g1 to avoid running into the 4 GB ar format limit with full -g builds. That issue has been fixed upstream by splitting up the .a libraries. This commit enables the full -g builds and also adds two additional linker flags: --no-keep-memory and --reduce-memory-overheads to further reduce linking memory overhead and avoid running out of memory in koji. https://bugzilla.redhat.com/show_bug.cgi?id=861452 --- webkitgtk3.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index c643892..441afed 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -99,10 +99,9 @@ This package contains developer documentation for %{name}. %endif %build -%ifarch s390 %{arm} ppc -# Use linker flags to reduce memory consumption on low-mem architectures +# Use linker flags to reduce memory consumption %global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads -%endif + %ifarch s390 s390x # Decrease debuginfo verbosity to reduce memory consumption even more %global optflags %(echo %{optflags} | sed 's/-g/-g1/') @@ -113,10 +112,6 @@ This package contains developer documentation for %{name}. %global optflags %{optflags} -Wl,-relax %endif -# Build with -g1 on all platforms to avoid running into 4 GB ar format limit -# https://bugs.webkit.org/show_bug.cgi?id=91154 -%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') - CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ --with-gtk=3.0 \ %ifarch s390 s390x ppc ppc64 @@ -221,6 +216,7 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete - Remove glib-compile-schemas scriptlets: the schemas are no longer installed - Add ldconfig calls to the libwebkit2gtk subpackage - Remove rpath from MiniBrowser +- Re-enable full debuginfo (#861452) * Mon Jun 3 2013 Tomas Popela - 2.1.1-1 - Update to 2.1.1 From 6457308221d8a4b3c193201db98bbfa2557e93cb Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 7 Jun 2013 15:29:01 +0200 Subject: [PATCH 102/211] Special case %{arm} to avoid generating full debuginfo Go back to -g1 on arm; still running out of memory during linking. --- webkitgtk3.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 441afed..a886ed6 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -102,9 +102,9 @@ This package contains developer documentation for %{name}. # Use linker flags to reduce memory consumption %global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads -%ifarch s390 s390x +%ifarch s390 s390x %{arm} # Decrease debuginfo verbosity to reduce memory consumption even more -%global optflags %(echo %{optflags} | sed 's/-g/-g1/') +%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif %ifarch ppc From b169d8f6b19bc9777ef7d083c078fb157f5e3608 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 7 Jun 2013 15:47:17 +0200 Subject: [PATCH 103/211] Link with harfbuzz-icu harfbuzz-icu was split into separate library in harfbuzz 0.9.18 and F19 is getting the new HB now. https://bugzilla.redhat.com/show_bug.cgi?id=971795 --- webkitgtk-fix-harfbuzz-icu.patch | 20 ++++++++++++++++++++ webkitgtk3.spec | 14 +++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-fix-harfbuzz-icu.patch diff --git a/webkitgtk-fix-harfbuzz-icu.patch b/webkitgtk-fix-harfbuzz-icu.patch new file mode 100644 index 0000000..4fc359c --- /dev/null +++ b/webkitgtk-fix-harfbuzz-icu.patch @@ -0,0 +1,20 @@ +https://bugs.webkit.org/show_bug.cgi?id=116978 + +diff --git a/Source/autotools/FindDependencies.m4 b/Source/autotools/FindDependencies.m4 +index a9067c5..aead295 100644 +--- a/Source/autotools/FindDependencies.m4 ++++ b/Source/autotools/FindDependencies.m4 +@@ -373,6 +373,13 @@ + PKG_CHECK_MODULES([FREETYPE], + [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version]) + fi ++# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library. ++# Since we support earlier HarfBuzz versions we keep this conditional for now. ++if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then ++ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version) ++ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS" ++ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS" ++fi + AC_SUBST([FREETYPE_CFLAGS]) + AC_SUBST([FREETYPE_LIBS]) + diff --git a/webkitgtk3.spec b/webkitgtk3.spec index a886ed6..2429db0 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -22,6 +22,8 @@ Patch0: webkit-1.1.14-nspluginwrapper.patch Patch1: webkitgtk-2.1.1-yarr.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch4: webkit-1.11.90-double2intsPPC32.patch +# https://bugs.webkit.org/show_bug.cgi?id=116978 +Patch5: webkitgtk-fix-harfbuzz-icu.patch BuildRequires: bison BuildRequires: cairo-devel @@ -55,6 +57,9 @@ BuildRequires: perl-Switch BuildRequires: ruby BuildRequires: mesa-libGL-devel +# Needed for patch5: +BuildRequires: autoconf automake libtool + %description WebKitGTK+ is the port of the portable web rendering engine WebKit to the GTK+ platform. @@ -97,6 +102,10 @@ This package contains developer documentation for %{name}. %ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif +%patch5 -p1 -b .harfbuzz-icu + +# Needed for patch5: +autoreconf --verbose --install -I Source/autotools %build # Use linker flags to reduce memory consumption @@ -212,6 +221,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Fri Jun 07 2013 Kalev Lember - 2.0.2-3 +- Link with harfbuzz-icu (split into separate library in harfbuzz 0.9.18) + * Mon Jun 03 2013 Kalev Lember - 2.1.1-2 - Remove glib-compile-schemas scriptlets: the schemas are no longer installed - Add ldconfig calls to the libwebkit2gtk subpackage From 48d95de28cb806ca1d125b40933bacdc2ce9ad38 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 19 Jun 2013 09:49:14 +0200 Subject: [PATCH 104/211] Update to 2.1.2 --- .gitignore | 1 + sources | 2 +- webkitgtk-fix-harfbuzz-icu.patch | 20 -------------------- webkitgtk3.spec | 18 ++++++------------ 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 webkitgtk-fix-harfbuzz-icu.patch diff --git a/.gitignore b/.gitignore index 6d7c2d0..f586b59 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ webkit-1.3.3.tar.gz /webkitgtk-2.0.1.tar.xz /webkitgtk-2.0.2.tar.xz /webkitgtk-2.1.1.tar.xz +/webkitgtk-2.1.2.tar.xz diff --git a/sources b/sources index a0ac1a9..9a903ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a460cdcd09c7a07f5e63cfe5780f545a webkitgtk-2.1.1.tar.xz +8e24fbecdb80c1cdd1b0e7ba40654e77 webkitgtk-2.1.2.tar.xz diff --git a/webkitgtk-fix-harfbuzz-icu.patch b/webkitgtk-fix-harfbuzz-icu.patch deleted file mode 100644 index 4fc359c..0000000 --- a/webkitgtk-fix-harfbuzz-icu.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://bugs.webkit.org/show_bug.cgi?id=116978 - -diff --git a/Source/autotools/FindDependencies.m4 b/Source/autotools/FindDependencies.m4 -index a9067c5..aead295 100644 ---- a/Source/autotools/FindDependencies.m4 -+++ b/Source/autotools/FindDependencies.m4 -@@ -373,6 +373,13 @@ - PKG_CHECK_MODULES([FREETYPE], - [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version]) - fi -+# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library. -+# Since we support earlier HarfBuzz versions we keep this conditional for now. -+if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then -+ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version) -+ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS" -+ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS" -+fi - AC_SUBST([FREETYPE_CFLAGS]) - AC_SUBST([FREETYPE_LIBS]) - diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 2429db0..dbe1cdc 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,8 +6,8 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.1.1 -Release: 3%{?dist} +Version: 2.1.2 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -22,8 +22,6 @@ Patch0: webkit-1.1.14-nspluginwrapper.patch Patch1: webkitgtk-2.1.1-yarr.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch4: webkit-1.11.90-double2intsPPC32.patch -# https://bugs.webkit.org/show_bug.cgi?id=116978 -Patch5: webkitgtk-fix-harfbuzz-icu.patch BuildRequires: bison BuildRequires: cairo-devel @@ -57,9 +55,6 @@ BuildRequires: perl-Switch BuildRequires: ruby BuildRequires: mesa-libGL-devel -# Needed for patch5: -BuildRequires: autoconf automake libtool - %description WebKitGTK+ is the port of the portable web rendering engine WebKit to the GTK+ platform. @@ -102,10 +97,6 @@ This package contains developer documentation for %{name}. %ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif -%patch5 -p1 -b .harfbuzz-icu - -# Needed for patch5: -autoreconf --verbose --install -I Source/autotools %build # Use linker flags to reduce memory consumption @@ -221,7 +212,10 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog -* Fri Jun 07 2013 Kalev Lember - 2.0.2-3 +* Wed Jun 19 2013 Tomas Popela - 2.1.2-1 +- Update to 2.1.2 + +* Fri Jun 07 2013 Kalev Lember - 2.1.1-3 - Link with harfbuzz-icu (split into separate library in harfbuzz 0.9.18) * Mon Jun 03 2013 Kalev Lember - 2.1.1-2 From 3af823c8e9ef883485ba5631283f3fc048bfe10d Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 9 Jul 2013 11:07:07 +0200 Subject: [PATCH 105/211] Update to 2.1.3 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f586b59..0970d0a 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ webkit-1.3.3.tar.gz /webkitgtk-2.0.2.tar.xz /webkitgtk-2.1.1.tar.xz /webkitgtk-2.1.2.tar.xz +/webkitgtk-2.1.3.tar.xz diff --git a/sources b/sources index 9a903ad..f885e04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e24fbecdb80c1cdd1b0e7ba40654e77 webkitgtk-2.1.2.tar.xz +4388bdbb23c3c0150cfcc9bd38c4932e webkitgtk-2.1.3.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index dbe1cdc..58378da 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.1.2 +Version: 2.1.3 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -212,6 +212,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Tue Jul 9 2013 Tomas Popela - 2.1.3-1 +- Update to 2.1.3 + * Wed Jun 19 2013 Tomas Popela - 2.1.2-1 - Update to 2.1.2 From 444f02fbbcd0f6b3d6d2f376885c1c47bbaa4b7d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:44:28 -0500 Subject: [PATCH 106/211] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 58378da..87036e2 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -212,6 +212,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 2.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jul 9 2013 Tomas Popela - 2.1.3-1 - Update to 2.1.3 From 9a9f45bc7ba0a4aeba9292ff5e4aaa434ecf1719 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 10 Aug 2013 16:59:29 +0200 Subject: [PATCH 107/211] Switch to unversioned docdirs https://bugzilla.redhat.com/show_bug.cgi?id=993890 --- webkitgtk3.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 87036e2..066ace5 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -2,12 +2,12 @@ ## "LICENSE") so this short macro allows us to distinguish them by using their ## directory names (from the source tree) as prefixes for the files. %global add_to_doc_files() \ - mkdir -p %{buildroot}%{_docdir}/%{name}-%{version} ||: ; \ - cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') + mkdir -p %{buildroot}%{_pkgdocdir} ||: ; \ + cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 Version: 2.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -174,7 +174,7 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %files -f WebKitGTK-3.0.lang -%doc %{_docdir}/%{name}-%{version}/ +%doc %{_pkgdocdir}/ %{_libdir}/libwebkitgtk-3.0.so.* %{_libdir}/libjavascriptcoregtk-3.0.so.* %{_libdir}/girepository-1.0/WebKit-3.0.typelib @@ -212,6 +212,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Sat Aug 10 2013 Kalev Lember - 2.1.3-3 +- Switch to unversioned docdirs (#993890) + * Sun Aug 04 2013 Fedora Release Engineering - 2.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 6e372b73e9567b2f88594a373eb366046822d910 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 12 Aug 2013 10:40:55 +0200 Subject: [PATCH 108/211] Update to 2.1.4 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0970d0a..8fc0b9c 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ webkit-1.3.3.tar.gz /webkitgtk-2.1.1.tar.xz /webkitgtk-2.1.2.tar.xz /webkitgtk-2.1.3.tar.xz +/webkitgtk-2.1.4.tar.xz diff --git a/sources b/sources index f885e04..30ecde2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4388bdbb23c3c0150cfcc9bd38c4932e webkitgtk-2.1.3.tar.xz +af27880847b5f7509da150e642cefdc4 webkitgtk-2.1.4.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 066ace5..fe7d712 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.1.3 -Release: 3%{?dist} +Version: 2.1.4 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -212,6 +212,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Mon Aug 12 2013 Kalev Lember - 2.1.4-1 +- Update to 2.1.4 + * Sat Aug 10 2013 Kalev Lember - 2.1.3-3 - Switch to unversioned docdirs (#993890) From ba3b2d4af86bb579f1188df7aef0a1883d8f760e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 12 Aug 2013 10:57:59 +0200 Subject: [PATCH 109/211] Remove a CFLAGS override LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY is already defined in webkitgtk before all the libsoup includes; we no longer need to do this manually in the spec file. --- webkitgtk3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index fe7d712..315383d 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -112,7 +112,7 @@ This package contains developer documentation for %{name}. %global optflags %{optflags} -Wl,-relax %endif -CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ +%configure \ --with-gtk=3.0 \ %ifarch s390 s390x ppc ppc64 --disable-jit \ From 6146b9dca1d899cdb789a0bd088ee9e6de0fe7cb Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 28 Aug 2013 00:25:33 +0200 Subject: [PATCH 110/211] Update to 2.1.90 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8fc0b9c..491cca2 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ webkit-1.3.3.tar.gz /webkitgtk-2.1.2.tar.xz /webkitgtk-2.1.3.tar.xz /webkitgtk-2.1.4.tar.xz +/webkitgtk-2.1.90.tar.xz diff --git a/sources b/sources index 30ecde2..ddcf201 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af27880847b5f7509da150e642cefdc4 webkitgtk-2.1.4.tar.xz +15cc89485bae7632c5ba47c066e2358e webkitgtk-2.1.90.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 315383d..f8bbcba 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.1.4 +Version: 2.1.90 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -212,6 +212,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Wed Aug 28 2013 Kalev Lember - 2.1.90-1 +- Update to 2.1.90 + * Mon Aug 12 2013 Kalev Lember - 2.1.4-1 - Update to 2.1.4 From 00de21f4c845c94498b3c563ab4bb5a176b0624e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 28 Aug 2013 00:42:16 +0200 Subject: [PATCH 111/211] Add missing at-spi2-core-devel build dep --- webkitgtk3.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index f8bbcba..37335e9 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -23,6 +23,7 @@ Patch1: webkitgtk-2.1.1-yarr.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch4: webkit-1.11.90-double2intsPPC32.patch +BuildRequires: at-spi2-core-devel BuildRequires: bison BuildRequires: cairo-devel BuildRequires: chrpath @@ -214,6 +215,7 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog * Wed Aug 28 2013 Kalev Lember - 2.1.90-1 - Update to 2.1.90 +- Add missing at-spi2-core-devel build dep * Mon Aug 12 2013 Kalev Lember - 2.1.4-1 - Update to 2.1.4 From 2a09137b98b9d5c043393192cfa57f1e4384fbad Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 30 Aug 2013 00:45:45 +0200 Subject: [PATCH 112/211] Update to 2.1.90.1 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 491cca2..9971f0a 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ webkit-1.3.3.tar.gz /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 diff --git a/sources b/sources index ddcf201..1c75d48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -15cc89485bae7632c5ba47c066e2358e webkitgtk-2.1.90.tar.xz +200c8a6fc90b630cba6845591aa96a09 webkitgtk-2.1.90.1.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 37335e9..cdde3e6 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.1.90 +Version: 2.1.90.1 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -213,6 +213,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Fri Aug 30 2013 Kalev Lember - 2.1.90.1-1 +- Update to 2.1.90.1 + * Wed Aug 28 2013 Kalev Lember - 2.1.90-1 - Update to 2.1.90 - Add missing at-spi2-core-devel build dep From ec95e7200bbf5fa763f4efc8fe5e38044a7f355c Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 30 Aug 2013 21:54:02 +0200 Subject: [PATCH 113/211] modify ppc32 patch, the macro interpretResolveWithBase got removed --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index cdde3e6..1f73665 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.1.90.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -213,6 +213,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Fri Aug 30 2013 Karsten Hopp 2.1.90.1-2 +- modify ppc32 patch, the macro interpretResolveWithBase got removed + * Fri Aug 30 2013 Kalev Lember - 2.1.90.1-1 - Update to 2.1.90.1 From 9bd59c570135e6127b90bec143ce2859973d4862 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 30 Aug 2013 22:12:37 +0200 Subject: [PATCH 114/211] modify ppc32 patch, the macro interpretResolveWithBase got removed --- webkit-1.11.90-double2intsPPC32.patch | 9 --------- 1 file changed, 9 deletions(-) diff --git a/webkit-1.11.90-double2intsPPC32.patch b/webkit-1.11.90-double2intsPPC32.patch index be35493..1777547 100644 --- a/webkit-1.11.90-double2intsPPC32.patch +++ b/webkit-1.11.90-double2intsPPC32.patch @@ -29,12 +29,3 @@ diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.d loadp JSFunction::m_executable[targetRegister], targetRegister loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister end -@@ -824,7 +824,7 @@ macro interpretResolveWithBase(opcodeLen - getResolveOperation(4, t0) - btpz t0, .slowPath - -- loadp ScopeChain[cfr], t3 -+ loadp ScopeChain + PayloadOffset[cfr], t3 - # Get the base - loadis ResolveOperation::m_operation[t0], t2 - From f343df567f517adaa9c6b72aa2872abba9c70b62 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 11 Sep 2013 10:57:07 +0200 Subject: [PATCH 115/211] Update to 2.1.91 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9971f0a..26a32c9 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ webkit-1.3.3.tar.gz /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 diff --git a/sources b/sources index 1c75d48..9e15c7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -200c8a6fc90b630cba6845591aa96a09 webkitgtk-2.1.90.1.tar.xz +da483c63c496f6cad7aa5a2e1009e474 webkitgtk-2.1.91.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 1f73665..e7f4fce 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.1.90.1 -Release: 2%{?dist} +Version: 2.1.91 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -213,6 +213,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Wed Sep 11 2013 Kalev Lember - 2.1.91-1 +- Update to 2.1.91 + * Fri Aug 30 2013 Karsten Hopp 2.1.90.1-2 - modify ppc32 patch, the macro interpretResolveWithBase got removed From c7fd078520aabe1ed8aa6c23480db3109e29ba8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 12 Sep 2013 18:16:46 +0200 Subject: [PATCH 116/211] - rediff the ppc32 patch, it failed to apply on s390 --- webkit-1.11.90-double2intsPPC32.patch | 31 --------------------------- webkit-2.1.90-double2intsPPC32.patch | 31 +++++++++++++++++++++++++++ webkitgtk3.spec | 7 ++++-- 3 files changed, 36 insertions(+), 33 deletions(-) delete mode 100644 webkit-1.11.90-double2intsPPC32.patch create mode 100644 webkit-2.1.90-double2intsPPC32.patch diff --git a/webkit-1.11.90-double2intsPPC32.patch b/webkit-1.11.90-double2intsPPC32.patch deleted file mode 100644 index 1777547..0000000 --- a/webkit-1.11.90-double2intsPPC32.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm ---- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 2013-03-07 17:55:22.488831605 +0100 -+++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-03-07 17:56:04.998829804 +0100 -@@ -1729,7 +1729,7 @@ _llint_op_next_pname: - loadi 20[PC], t2 - loadi PayloadOffset[cfr, t2, 8], t2 - loadp JSPropertyNameIterator::m_jsStrings[t2], t3 -- loadi [t3, t0, 8], t3 -+ loadi PayloadOffset[t3, t0, 8], t3 - addi 1, t0 - storei t0, PayloadOffset[cfr, t1, 8] - loadi 4[PC], t1 -diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm ---- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 2013-03-07 17:56:24.953828958 +0100 -+++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-03-07 17:58:05.653824691 +0100 -@@ -263,13 +263,13 @@ macro assertNotConstant(index) - end - - macro functionForCallCodeBlockGetter(targetRegister) -- loadp Callee[cfr], targetRegister -+ loadp Callee + PayloadOffset[cfr], targetRegister - loadp JSFunction::m_executable[targetRegister], targetRegister - loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister - end - - macro functionForConstructCodeBlockGetter(targetRegister) -- loadp Callee[cfr], targetRegister -+ loadp Callee + PayloadOffset[cfr], targetRegister - loadp JSFunction::m_executable[targetRegister], targetRegister - loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister - end diff --git a/webkit-2.1.90-double2intsPPC32.patch b/webkit-2.1.90-double2intsPPC32.patch new file mode 100644 index 0000000..b904490 --- /dev/null +++ b/webkit-2.1.90-double2intsPPC32.patch @@ -0,0 +1,31 @@ +diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +--- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 2013-08-28 21:06:29.000000000 +0200 ++++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-09-12 15:32:34.000000000 +0200 +@@ -1679,7 +1679,7 @@ _llint_op_next_pname: + loadi 20[PC], t2 + loadi PayloadOffset[cfr, t2, 8], t2 + loadp JSPropertyNameIterator::m_jsStrings[t2], t3 +- loadi [t3, t0, 8], t3 ++ loadi PayloadOffset[t3, t0, 8], t3 + addi 1, t0 + storei t0, PayloadOffset[cfr, t1, 8] + loadi 4[PC], t1 +diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm +--- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 2013-08-28 21:06:29.000000000 +0200 ++++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-09-12 15:32:34.000000000 +0200 +@@ -276,13 +276,13 @@ macro assertNotConstant(index) + end + + macro functionForCallCodeBlockGetter(targetRegister) +- loadp Callee[cfr], targetRegister ++ loadp Callee + PayloadOffset[cfr], targetRegister + loadp JSFunction::m_executable[targetRegister], targetRegister + loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister + end + + macro functionForConstructCodeBlockGetter(targetRegister) +- loadp Callee[cfr], targetRegister ++ loadp Callee + PayloadOffset[cfr], targetRegister + loadp JSFunction::m_executable[targetRegister], targetRegister + loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister + end diff --git a/webkitgtk3.spec b/webkitgtk3.spec index e7f4fce..144b362 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.1.91 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -21,7 +21,7 @@ Patch0: webkit-1.1.14-nspluginwrapper.patch # 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-1.11.90-double2intsPPC32.patch +Patch4: webkit-2.1.90-double2intsPPC32.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -213,6 +213,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Thu Sep 12 2013 Dan Horák - 2.1.91-2 +- rediff the ppc32 patch, it failed to apply on s390 + * Wed Sep 11 2013 Kalev Lember - 2.1.91-1 - Update to 2.1.91 From 90bfa7edc72211e3e0bb1c2780e295ee89d9ed5f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 18 Sep 2013 23:12:04 +0200 Subject: [PATCH 117/211] Update to 2.1.92 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 26a32c9..19bd178 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ webkit-1.3.3.tar.gz /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 diff --git a/sources b/sources index 9e15c7e..a37ee8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da483c63c496f6cad7aa5a2e1009e474 webkitgtk-2.1.91.tar.xz +d1d8905c741fe2c22d5bb980fe022cc9 webkitgtk-2.1.92.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 144b362..e85321f 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.1.91 -Release: 2%{?dist} +Version: 2.1.92 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -213,6 +213,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Wed Sep 18 2013 Kalev Lember - 2.1.92-1 +- Update to 2.1.92 + * Thu Sep 12 2013 Dan Horák - 2.1.91-2 - rediff the ppc32 patch, it failed to apply on s390 From d58824394cb019c0f3db63fb410000c687a57e43 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 27 Sep 2013 13:14:47 +0200 Subject: [PATCH 118/211] Drop -devel package deps that rpmbuild autogenerates --- webkitgtk3.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index e85321f..20b358c 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -75,8 +75,6 @@ that is part of %{name}. Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -Requires: gtk3-devel %description devel The %{name}-devel package contains libraries, build data, and header From eb0dea89da587fedb81dcd23af3ebb9d01355ec6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 27 Sep 2013 13:21:33 +0200 Subject: [PATCH 119/211] Update to 2.2.0 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 19bd178..5033442 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ webkit-1.3.3.tar.gz /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 diff --git a/sources b/sources index a37ee8c..fb6e3e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1d8905c741fe2c22d5bb980fe022cc9 webkitgtk-2.1.92.tar.xz +9c337812667c4885ebe29a54084dcd4c webkitgtk-2.2.0.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 20b358c..ff1d2cd 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.1.92 +Version: 2.2.0 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -211,6 +211,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Fri Sep 27 2013 Kalev Lember - 2.2.0-1 +- Update to 2.2.0 + * Wed Sep 18 2013 Kalev Lember - 2.1.92-1 - Update to 2.1.92 From 3f41e480469d5852b8c99ce1e3e4fab525ec991a Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 18 Oct 2013 15:04:00 +0200 Subject: [PATCH 120/211] Update to 2.2.1 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5033442..cd187b6 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ webkit-1.3.3.tar.gz /webkitgtk-2.1.91.tar.xz /webkitgtk-2.1.92.tar.xz /webkitgtk-2.2.0.tar.xz +/webkitgtk-2.2.1.tar.xz diff --git a/sources b/sources index fb6e3e8..f983258 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c337812667c4885ebe29a54084dcd4c webkitgtk-2.2.0.tar.xz +f5decdd76b2c08ab6e01ac47342f680e webkitgtk-2.2.1.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index ff1d2cd..de894ab 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.2.0 +Version: 2.2.1 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -211,6 +211,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Fri Oct 18 2013 Tomas Popela - 2.2.1-1 +- Update to 2.2.1 + * Fri Sep 27 2013 Kalev Lember - 2.2.0-1 - Update to 2.2.0 From ca53401d9758126d29df3fa8786b050e0680dc4e Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 11 Nov 2013 16:47:55 +0100 Subject: [PATCH 121/211] Update to 2.2.2 --- .gitignore | 2 ++ sources | 2 +- webkitgtk3.spec | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cd187b6..d7a9850 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ webkit-1.3.3.tar.gz /webkitgtk-2.1.92.tar.xz /webkitgtk-2.2.0.tar.xz /webkitgtk-2.2.1.tar.xz +/webkitgtk-2.3.1.tar.xz +/webkitgtk-2.2.2.tar.xz diff --git a/sources b/sources index f983258..fa91ba6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f5decdd76b2c08ab6e01ac47342f680e webkitgtk-2.2.1.tar.xz +49cc8fd065de72603776a494e41c1977 webkitgtk-2.2.2.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index de894ab..552c7d7 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.2.1 +Version: 2.2.2 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -211,6 +211,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Mon Nov 11 2013 Tomas Popela - 2.2.2-1 +- Update to 2.2.2 + * Fri Oct 18 2013 Tomas Popela - 2.2.1-1 - Update to 2.2.1 From a169af90b3643f2a0b1d12ef6e5fcb45c510f2a2 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 28 Nov 2013 13:34:21 +0100 Subject: [PATCH 122/211] Fix for RH bug #1035764 - Crashes with certain Google Drive documents --- webkitgtk-2.2.2-get_by_val.patch | 21 +++++++++++++++++++++ webkitgtk3.spec | 9 ++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.2.2-get_by_val.patch diff --git a/webkitgtk-2.2.2-get_by_val.patch b/webkitgtk-2.2.2-get_by_val.patch new file mode 100644 index 0000000..c4e2f1b --- /dev/null +++ b/webkitgtk-2.2.2-get_by_val.patch @@ -0,0 +1,21 @@ +--- webkitgtk-2.2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (revision 158679) ++++ webkitgtk-2.2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (working copy) +@@ -2023,17 +2023,9 @@ void SpeculativeJIT::compileGetByValOnSt + // 8 bit string values don't need the isASCII check. + cont8Bit.link(&m_jit); + +-#if CPU(X86) +- // Don't have enough register, construct our own indexed address and load. +- m_jit.lshift32(MacroAssembler::TrustedImm32(2), scratchReg); ++ m_jit.lshift32(MacroAssembler::TrustedImm32(sizeof(void*) == 4 ? 2 : 3), scratchReg); + m_jit.addPtr(MacroAssembler::TrustedImmPtr(m_jit.vm()->smallStrings.singleCharacterStrings()), scratchReg); + m_jit.loadPtr(scratchReg, scratchReg); +-#else +- GPRTemporary smallStrings(this); +- GPRReg smallStringsReg = smallStrings.gpr(); +- m_jit.move(MacroAssembler::TrustedImmPtr(m_jit.vm()->smallStrings.singleCharacterStrings()), smallStringsReg); +- m_jit.loadPtr(MacroAssembler::BaseIndex(smallStringsReg, scratchReg, MacroAssembler::ScalePtr, 0), scratchReg); +-#endif + + addSlowPathGenerator( + slowPathCall( diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 552c7d7..eeefbf0 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -22,6 +22,9 @@ Patch0: webkit-1.1.14-nspluginwrapper.patch Patch1: webkitgtk-2.1.1-yarr.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch4: webkit-2.1.90-double2intsPPC32.patch +# https://bugs.webkit.org/show_bug.cgi?id=123816 +# Remove when 2.2.3 will be out +Patch5: webkitgtk-2.2.2-get_by_val.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -96,6 +99,7 @@ This package contains developer documentation for %{name}. %ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif +%patch5 -p1 %build # Use linker flags to reduce memory consumption @@ -211,6 +215,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Thu Nov 28 2013 Tomas Popela - 2.2.2-2 +- Fix for RH bug #1035764 - Crashes with certain Google Drive documents + * Mon Nov 11 2013 Tomas Popela - 2.2.2-1 - Update to 2.2.2 From f40f54dda5aec2b6e251b8c9f63e80483d70c05a Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 4 Dec 2013 15:27:08 +0100 Subject: [PATCH 123/211] Update to 2.2.3 --- .gitignore | 1 + sources | 2 +- webkitgtk-2.2.2-get_by_val.patch | 21 --------------------- webkitgtk3.spec | 11 +++++------ 4 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 webkitgtk-2.2.2-get_by_val.patch diff --git a/.gitignore b/.gitignore index d7a9850..f64dc13 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ webkit-1.3.3.tar.gz /webkitgtk-2.2.1.tar.xz /webkitgtk-2.3.1.tar.xz /webkitgtk-2.2.2.tar.xz +/webkitgtk-2.2.3.tar.xz diff --git a/sources b/sources index fa91ba6..bdc6def 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49cc8fd065de72603776a494e41c1977 webkitgtk-2.2.2.tar.xz +613e81c460368ff4d6e02c7887206572 webkitgtk-2.2.3.tar.xz diff --git a/webkitgtk-2.2.2-get_by_val.patch b/webkitgtk-2.2.2-get_by_val.patch deleted file mode 100644 index c4e2f1b..0000000 --- a/webkitgtk-2.2.2-get_by_val.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- webkitgtk-2.2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (revision 158679) -+++ webkitgtk-2.2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (working copy) -@@ -2023,17 +2023,9 @@ void SpeculativeJIT::compileGetByValOnSt - // 8 bit string values don't need the isASCII check. - cont8Bit.link(&m_jit); - --#if CPU(X86) -- // Don't have enough register, construct our own indexed address and load. -- m_jit.lshift32(MacroAssembler::TrustedImm32(2), scratchReg); -+ m_jit.lshift32(MacroAssembler::TrustedImm32(sizeof(void*) == 4 ? 2 : 3), scratchReg); - m_jit.addPtr(MacroAssembler::TrustedImmPtr(m_jit.vm()->smallStrings.singleCharacterStrings()), scratchReg); - m_jit.loadPtr(scratchReg, scratchReg); --#else -- GPRTemporary smallStrings(this); -- GPRReg smallStringsReg = smallStrings.gpr(); -- m_jit.move(MacroAssembler::TrustedImmPtr(m_jit.vm()->smallStrings.singleCharacterStrings()), smallStringsReg); -- m_jit.loadPtr(MacroAssembler::BaseIndex(smallStringsReg, scratchReg, MacroAssembler::ScalePtr, 0), scratchReg); --#endif - - addSlowPathGenerator( - slowPathCall( diff --git a/webkitgtk3.spec b/webkitgtk3.spec index eeefbf0..5bed007 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.2 -Release: 2%{?dist} +Version: 2.2.3 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -22,9 +22,6 @@ Patch0: webkit-1.1.14-nspluginwrapper.patch Patch1: webkitgtk-2.1.1-yarr.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch4: webkit-2.1.90-double2intsPPC32.patch -# https://bugs.webkit.org/show_bug.cgi?id=123816 -# Remove when 2.2.3 will be out -Patch5: webkitgtk-2.2.2-get_by_val.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -99,7 +96,6 @@ This package contains developer documentation for %{name}. %ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif -%patch5 -p1 %build # Use linker flags to reduce memory consumption @@ -215,6 +211,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog +* Wed Dec 4 2013 Tomas Popela - 2.2.3-1 +- Update to 2.2.3 + * Thu Nov 28 2013 Tomas Popela - 2.2.2-2 - Fix for RH bug #1035764 - Crashes with certain Google Drive documents From a93f724122527b530afbec7f8bf837ce8a41f463 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 5 Dec 2013 08:44:28 +0000 Subject: [PATCH 124/211] Add %{?_isa} to the libwebkit2gtk subpackage This ensures that dnf does the right thing if the metadata gets out of sync. --- webkitgtk3.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 5bed007..c4acbc9 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -65,7 +65,7 @@ This package contains WebKitGTK+ for GTK+ 3. %package -n libwebkit2gtk Summary: The libwebkit2gtk library Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description -n libwebkit2gtk The libwebkit2gtk package contains the libwebkit2gtk library @@ -74,7 +74,7 @@ that is part of %{name}. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries, build data, and header From 593b017c8fb5b5fb1b34bcb19d58d1a60bed7860 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 5 Dec 2013 17:07:29 +0100 Subject: [PATCH 125/211] Update to 2.3.2 --- webkitgtk-2.1.1-yarr.patch | 12 -- webkitgtk-2.3.2-libatomic.patch | 19 ++ webkitgtk-2.3.2-no_jit_1.patch | 51 +++++ webkitgtk-2.3.2-no_jit_2.patch | 32 +++ webkitgtk-2.3.2-no_jit_3.patch | 349 ++++++++++++++++++++++++++++++++ webkitgtk-2.3.2-no_jit_4.patch | 31 +++ webkitgtk3.spec | 41 +++- 7 files changed, 516 insertions(+), 19 deletions(-) delete mode 100644 webkitgtk-2.1.1-yarr.patch create mode 100644 webkitgtk-2.3.2-libatomic.patch create mode 100644 webkitgtk-2.3.2-no_jit_1.patch create mode 100644 webkitgtk-2.3.2-no_jit_2.patch create mode 100644 webkitgtk-2.3.2-no_jit_3.patch create mode 100644 webkitgtk-2.3.2-no_jit_4.patch diff --git a/webkitgtk-2.1.1-yarr.patch b/webkitgtk-2.1.1-yarr.patch deleted file mode 100644 index 6752c20..0000000 --- a/webkitgtk-2.1.1-yarr.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up webkitgtk-2.1.1/Source/WTF/wtf/Platform.h.yarr webkitgtk-2.1.1/Source/WTF/wtf/Platform.h ---- webkitgtk-2.1.1/Source/WTF/wtf/Platform.h.yarr 2013-05-29 15:41:14.572995439 +0200 -+++ webkitgtk-2.1.1/Source/WTF/wtf/Platform.h 2013-05-29 15:42:04.434993292 +0200 -@@ -823,7 +823,7 @@ - #define ENABLE_REGEXP_TRACING 0 - - /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ --#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT)) -+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT)) - #define ENABLE_YARR_JIT 1 - - /* Setting this flag compares JIT results with interpreter results. */ diff --git a/webkitgtk-2.3.2-libatomic.patch b/webkitgtk-2.3.2-libatomic.patch new file mode 100644 index 0000000..307a812 --- /dev/null +++ b/webkitgtk-2.3.2-libatomic.patch @@ -0,0 +1,19 @@ +diff -up webkitgtk-2.3.2/Source/WTF/wtf/Atomics.h.libatomic webkitgtk-2.3.2/Source/WTF/wtf/Atomics.h +--- webkitgtk-2.3.2/Source/WTF/wtf/Atomics.h.libatomic 2013-12-05 15:43:22.160186327 +0100 ++++ webkitgtk-2.3.2/Source/WTF/wtf/Atomics.h 2013-12-05 15:44:02.630264977 +0100 +@@ -101,11 +101,11 @@ inline int atomicDecrement(int volatile* + + #elif COMPILER(GCC) + +-inline int atomicIncrement(int volatile* addend) { return __sync_add_and_fetch(addend, 1); } +-inline int atomicDecrement(int volatile* addend) { return __sync_sub_and_fetch(addend, 1); } ++inline int atomicIncrement(int volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); } ++inline int atomicDecrement(int volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); } + +-inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_add_and_fetch(addend, 1); } +-inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_sub_and_fetch(addend, 1); } ++inline int64_t atomicIncrement(int64_t volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); } ++inline int64_t atomicDecrement(int64_t volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); } + + #endif + diff --git a/webkitgtk-2.3.2-no_jit_1.patch b/webkitgtk-2.3.2-no_jit_1.patch new file mode 100644 index 0000000..540b196 --- /dev/null +++ b/webkitgtk-2.3.2-no_jit_1.patch @@ -0,0 +1,51 @@ +diff --git a/Source/JavaScriptCore/bytecode/ValueRecovery.cpp b/Source/JavaScriptCore/bytecode/ValueRecovery.cpp +index 221b175d062ee4b2a396d781ccd1973796213a77..c30e2aef32ea5d17804c16dd5b7bee2f359f1105 100644 +--- a/Source/JavaScriptCore/bytecode/ValueRecovery.cpp ++++ b/Source/JavaScriptCore/bytecode/ValueRecovery.cpp +@@ -60,6 +60,8 @@ JSValue ValueRecovery::recover(ExecState* exec) const + } + } + ++#if ENABLE(JIT) ++ + void ValueRecovery::dumpInContext(PrintStream& out, DumpContext* context) const + { + switch (technique()) { +@@ -130,6 +132,7 @@ void ValueRecovery::dump(PrintStream& out) const + { + dumpInContext(out, 0); + } ++#endif // ENABLE(JIT) + + } // namespace JSC + +diff --git a/Source/JavaScriptCore/bytecode/ValueRecovery.h b/Source/JavaScriptCore/bytecode/ValueRecovery.h +index 7127db703f52ec5668fb8da3d1fae08fcf14162d..dc2d55a289b394ea360a8589d517019b2d2214a9 100644 +--- a/Source/JavaScriptCore/bytecode/ValueRecovery.h ++++ b/Source/JavaScriptCore/bytecode/ValueRecovery.h +@@ -27,12 +27,13 @@ + #define ValueRecovery_h + + #include "DataFormat.h" ++#if ENABLE(JIT) + #include "GPRInfo.h" + #include "FPRInfo.h" ++#endif + #include "JSCJSValue.h" + #include "MacroAssembler.h" + #include "VirtualRegister.h" +-#include + #include + + namespace JSC { +@@ -246,8 +247,10 @@ public: + + JSValue recover(ExecState*) const; + ++#if ENABLE(JIT) + void dumpInContext(PrintStream& out, DumpContext* context) const; + void dump(PrintStream& out) const; ++#endif + + private: + ValueRecoveryTechnique m_technique; diff --git a/webkitgtk-2.3.2-no_jit_2.patch b/webkitgtk-2.3.2-no_jit_2.patch new file mode 100644 index 0000000..7b9d0b9 --- /dev/null +++ b/webkitgtk-2.3.2-no_jit_2.patch @@ -0,0 +1,32 @@ +diff --git a/Source/JavaScriptCore/llint/LLIntThunks.cpp b/Source/JavaScriptCore/llint/LLIntThunks.cpp +index a7387d54c5ad5eedbffa142b94ca890732b11c9b..cd4e7c106c20337a8f45e11d212cdeee09b438e1 100644 +--- a/Source/JavaScriptCore/llint/LLIntThunks.cpp ++++ b/Source/JavaScriptCore/llint/LLIntThunks.cpp +@@ -26,7 +26,7 @@ + #include "config.h" + #include "LLIntThunks.h" + +-#if ENABLE(LLINT) ++#if ENABLE(LLINT) && ENABLE(JIT) + + #include "JSInterfaceJIT.h" + #include "JSObject.h" +@@ -36,8 +36,6 @@ + + namespace JSC { namespace LLInt { + +-#if !ENABLE(LLINT_C_LOOP) +- + static MacroAssemblerCodeRef generateThunkWithJumpTo(VM* vm, void (*target)(), const char *thunkKind) + { + JSInterfaceJIT jit(vm); +@@ -80,8 +78,6 @@ MacroAssemblerCodeRef programEntryThunkGenerator(VM* vm) + return generateThunkWithJumpTo(vm, llint_program_prologue, "program"); + } + +-#endif // !ENABLE(LLINT_C_LOOP) +- + } } // namespace JSC::LLInt + +-#endif // ENABLE(LLINT) ++#endif // ENABLE(LLINT) && ENABLE(JIT) diff --git a/webkitgtk-2.3.2-no_jit_3.patch b/webkitgtk-2.3.2-no_jit_3.patch new file mode 100644 index 0000000..ebfc4d4 --- /dev/null +++ b/webkitgtk-2.3.2-no_jit_3.patch @@ -0,0 +1,349 @@ +diff -up webkitgtk-2.3.2/Source/JavaScriptCore/assembler/LinkBuffer.cpp.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/assembler/LinkBuffer.cpp +--- webkitgtk-2.3.2/Source/JavaScriptCore/assembler/LinkBuffer.cpp.no_jit_3 2013-11-12 08:53:56.000000000 +0100 ++++ webkitgtk-2.3.2/Source/JavaScriptCore/assembler/LinkBuffer.cpp 2013-12-05 13:32:59.623494221 +0100 +@@ -49,7 +49,8 @@ LinkBuffer::CodeRef LinkBuffer::finalize + ASSERT(Options::showDisassembly() || Options::showDFGDisassembly()); + + CodeRef result = finalizeCodeWithoutDisassembly(); +- ++ ++#if ENABLE(DISASSEMBLER) + dataLogF("Generated JIT code for "); + va_list argList; + va_start(argList, format); +@@ -59,6 +60,9 @@ LinkBuffer::CodeRef LinkBuffer::finalize + + dataLogF(" Code at [%p, %p):\n", result.code().executableAddress(), static_cast(result.code().executableAddress()) + result.size()); + disassemble(result.code(), m_size, " ", WTF::dataFile()); ++#else ++ UNUSED_PARAM(format); ++#endif // ENABLE(DISASSEMBLER) + + return result; + } +diff -up webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.cpp.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.cpp +--- webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.cpp.no_jit_3 2013-11-18 08:40:24.000000000 +0100 ++++ webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.cpp 2013-12-05 13:32:59.623494221 +0100 +@@ -26,7 +26,7 @@ + #include "config.h" + #include "DFGDisassembler.h" + +-#if ENABLE(DFG_JIT) ++#if ENABLE(DFG_JIT) && ENABLE(DISASSEMBLER) + + #include "CodeBlockWithJITType.h" + #include "DFGGraph.h" +@@ -172,4 +172,4 @@ void Disassembler::dumpDisassembly(Print + + } } // namespace JSC::DFG + +-#endif // ENABLE(DFG_JIT) ++#endif // ENABLE(DFG_JIT) && ENABLE(DISASSEMBLER) +diff -up webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.h.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.h +--- webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.h.no_jit_3 2013-08-03 18:10:38.000000000 +0200 ++++ webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.h 2013-12-05 13:32:59.623494221 +0100 +@@ -42,6 +42,8 @@ namespace JSC { namespace DFG { + + class Graph; + ++#if ENABLE(DISASSEMBLER) ++ + class Disassembler { + WTF_MAKE_FAST_ALLOCATED; + public: +@@ -97,6 +99,25 @@ private: + MacroAssembler::Label m_endOfCode; + }; + ++#else // ENABLE(DISASSEMBLER) ++ ++class Disassembler { ++ WTF_MAKE_FAST_ALLOCATED; ++public: ++ Disassembler(Graph&) { } ++ ++ void setStartOfCode(MacroAssembler::Label) { } ++ void setForBlockIndex(BlockIndex, MacroAssembler::Label) { } ++ void setForNode(Node*, MacroAssembler::Label) { } ++ void setEndOfMainPath(MacroAssembler::Label) { } ++ void setEndOfCode(MacroAssembler::Label) { } ++ ++ void dump(LinkBuffer&) { } ++ void reportToProfiler(Profiler::Compilation*, LinkBuffer&) { } ++}; ++ ++#endif // ENABLE(DISASSEMBLER) ++ + } } // namespace JSC::DFG + + #endif // ENABLE(DFG_JIT) +diff -up webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/Disassembler.cpp.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/Disassembler.cpp +--- webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/Disassembler.cpp.no_jit_3 2013-08-03 18:10:38.000000000 +0200 ++++ webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/Disassembler.cpp 2013-12-05 13:32:59.623494221 +0100 +@@ -26,6 +26,8 @@ + #include "config.h" + #include "Disassembler.h" + ++#if ENABLE(DISASSEMBLER) ++ + #include "MacroAssemblerCodeRef.h" + #include + +@@ -41,3 +43,4 @@ void disassemble(const MacroAssemblerCod + + } // namespace JSC + ++#endif // ENABLE(DISASSEMBLER) +diff -up webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/X86Disassembler.cpp.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/X86Disassembler.cpp +--- webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/X86Disassembler.cpp.no_jit_3 2013-08-03 18:10:38.000000000 +0200 ++++ webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/X86Disassembler.cpp 2013-12-05 13:32:59.623494221 +0100 +@@ -26,6 +26,7 @@ + #include "config.h" + #include "Disassembler.h" + ++#if ENABLE(DISASSEMBLER) + #if USE(UDIS86) || USE(LLVM_DISASSEMBLER) + + #include "MacroAssemblerCodeRef.h" +@@ -70,4 +71,4 @@ bool tryToDisassemble(const MacroAssembl + } // namespace JSC + + #endif // USE(UDIS86) || USE(LLVM_DISASSEMBLER) +- ++#endif // ENABLE(DISASSEMBLER) +diff -up webkitgtk-2.3.2/Source/JavaScriptCore/jit/FPRInfo.h.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/jit/FPRInfo.h +--- webkitgtk-2.3.2/Source/JavaScriptCore/jit/FPRInfo.h.no_jit_3 2013-11-15 11:39:11.000000000 +0100 ++++ webkitgtk-2.3.2/Source/JavaScriptCore/jit/FPRInfo.h 2013-12-05 13:32:59.623494221 +0100 +@@ -34,6 +34,8 @@ namespace JSC { + typedef MacroAssembler::FPRegisterID FPRReg; + #define InvalidFPRReg ((::JSC::FPRReg)-1) + ++#if ENABLE(JIT) ++ + #if CPU(X86) || CPU(X86_64) + + class FPRInfo { +@@ -108,7 +110,7 @@ public: + static const unsigned InvalidIndex = 0xffffffff; + }; + +-#endif ++#endif // CPU(X86) || CPU(X86_64) + + #if CPU(ARM) + +@@ -172,7 +174,7 @@ public: + static const unsigned InvalidIndex = 0xffffffff; + }; + +-#endif ++#endif // CPU(ARM) + + #if CPU(ARM64) + +@@ -260,7 +262,7 @@ public: + static const unsigned InvalidIndex = 0xffffffff; + }; + +-#endif ++#endif // CPU(ARM64) + + #if CPU(MIPS) + +@@ -327,7 +329,7 @@ public: + static const unsigned InvalidIndex = 0xffffffff; + }; + +-#endif ++#endif // CPU(MIPS) + + #if CPU(SH4) + +@@ -389,7 +391,9 @@ public: + static const unsigned InvalidIndex = 0xffffffff; + }; + +-#endif ++#endif // CPU(SH4) ++ ++#endif // ENABLE(JIT) + + } // namespace JSC + +diff -up webkitgtk-2.3.2/Source/JavaScriptCore/jit/GPRInfo.h.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/jit/GPRInfo.h +--- webkitgtk-2.3.2/Source/JavaScriptCore/jit/GPRInfo.h.no_jit_3 2013-11-15 11:39:11.000000000 +0100 ++++ webkitgtk-2.3.2/Source/JavaScriptCore/jit/GPRInfo.h 2013-12-05 13:32:59.623494221 +0100 +@@ -34,6 +34,8 @@ namespace JSC { + typedef MacroAssembler::RegisterID GPRReg; + #define InvalidGPRReg ((::JSC::GPRReg)-1) + ++#if ENABLE(JIT) ++ + #if USE(JSVALUE64) + class JSValueRegs { + public: +@@ -125,7 +127,7 @@ private: + int32_t m_offset; + GPRReg m_base; + }; +-#endif ++#endif // USE(JSVALUE64) + + #if USE(JSVALUE32_64) + class JSValueRegs { +@@ -276,7 +278,7 @@ private: + int8_t m_payload; + int8_t m_tagType; // Contains the low bits of the tag. + }; +-#endif ++#endif // USE(JSVALUE32_64) + + // The baseline JIT requires that regT3 be callee-preserved. + +@@ -343,7 +345,7 @@ public: + static const unsigned InvalidIndex = 0xffffffff; + }; + +-#endif ++#endif // CPU(X86) + + #if CPU(X86_64) + #if !OS(WINDOWS) +@@ -439,7 +441,7 @@ public: + static const unsigned InvalidIndex = 0xffffffff; + }; + +-#endif ++#endif // CPU(X86_64) + + #if CPU(ARM) + #define NUMBER_OF_ARGUMENT_REGISTERS 4u +@@ -520,7 +522,7 @@ public: + static const unsigned InvalidIndex = 0xffffffff; + }; + +-#endif ++#endif // CPU(ARM) + + #if CPU(ARM64) + #define NUMBER_OF_ARGUMENT_REGISTERS 8u +@@ -618,7 +620,7 @@ public: + static const unsigned InvalidIndex = 0xffffffff; + }; + +-#endif ++#endif // CPU(ARM64) + + #if CPU(MIPS) + #define NUMBER_OF_ARGUMENT_REGISTERS 4u +@@ -694,7 +696,7 @@ public: + static const unsigned InvalidIndex = 0xffffffff; + }; + +-#endif ++#endif // CPU(MIPS) + + #if CPU(SH4) + #define NUMBER_OF_ARGUMENT_REGISTERS 4u +@@ -764,7 +766,7 @@ public: + static const unsigned InvalidIndex = 0xffffffff; + }; + +-#endif ++#endif // CPU(SH4) + + // The baseline JIT uses "accumulator" style execution with regT0 (for 64-bit) + // and regT0 + regT1 (for 32-bit) serving as the accumulator register(s) for +@@ -774,6 +776,8 @@ COMPILE_ASSERT(GPRInfo::regT0 == GPRInfo + COMPILE_ASSERT(GPRInfo::regT1 == GPRInfo::returnValueGPR2, regT1_must_equal_returnValueGPR2); + #endif + ++#endif // ENABLE(JIT) ++ + } // namespace JSC + + namespace WTF { +diff -up webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.cpp.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.cpp +--- webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.cpp.no_jit_3 2013-08-03 18:10:38.000000000 +0200 ++++ webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.cpp 2013-12-05 13:32:59.623494221 +0100 +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2012 Apple Inc. All rights reserved. ++ * Copyright (C) 2012, 2013 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -26,7 +26,7 @@ + #include "config.h" + #include "JITDisassembler.h" + +-#if ENABLE(JIT) ++#if ENABLE(JIT) && ENABLE(DISASSEMBLER) + + #include "CodeBlock.h" + #include "CodeBlockWithJITType.h" +@@ -164,5 +164,5 @@ void JITDisassembler::dumpDisassembly(Pr + + } // namespace JSC + +-#endif // ENABLE(JIT) ++#endif // ENABLE(JIT) && ENABLE(DISASSEMBLER) + +diff -up webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.h.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.h +--- webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.h.no_jit_3 2013-08-03 18:10:38.000000000 +0200 ++++ webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.h 2013-12-05 13:32:59.623494221 +0100 +@@ -39,6 +39,8 @@ namespace JSC { + + class CodeBlock; + ++#if ENABLE(DISASSEMBLER) ++ + class JITDisassembler { + WTF_MAKE_FAST_ALLOCATED; + public: +@@ -84,6 +86,25 @@ private: + MacroAssembler::Label m_endOfCode; + }; + ++#else // ENABLE(DISASSEMBLER) ++ ++class JITDisassembler { ++ WTF_MAKE_FAST_ALLOCATED; ++public: ++ JITDisassembler(CodeBlock*) { } ++ ++ void setStartOfCode(MacroAssembler::Label) { } ++ void setForBytecodeMainPath(unsigned, MacroAssembler::Label) { } ++ void setForBytecodeSlowPath(unsigned, MacroAssembler::Label) { } ++ void setEndOfSlowPath(MacroAssembler::Label) { } ++ void setEndOfCode(MacroAssembler::Label) { } ++ ++ void dump(LinkBuffer&) { } ++ void reportToProfiler(Profiler::Compilation*, LinkBuffer&) { } ++}; ++ ++#endif // ENABLE(DISASSEMBLER) ++ + } // namespace JSC + + #endif // ENABLE(JIT) +diff -up webkitgtk-2.3.2/Source/WTF/wtf/Platform.h.no_jit_3 webkitgtk-2.3.2/Source/WTF/wtf/Platform.h +--- webkitgtk-2.3.2/Source/WTF/wtf/Platform.h.no_jit_3 2013-12-05 13:32:59.613494190 +0100 ++++ webkitgtk-2.3.2/Source/WTF/wtf/Platform.h 2013-12-05 13:32:59.623494221 +0100 +@@ -868,6 +868,16 @@ + #endif + #endif + ++/* If the Disassembler is enabled, then the Assembler must be enabled as well: */ ++#if ENABLE(DISASSEMBLER) ++#if defined(ENABLE_ASSEMBLER) && !ENABLE_ASSEMBLER ++#error "Cannot enable the Disassembler without enabling the Assembler" ++#else ++#undef ENABLE_ASSEMBLER ++#define ENABLE_ASSEMBLER 1 ++#endif ++#endif ++ + /* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in. + On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */ + #if ENABLE(ASSEMBLER) diff --git a/webkitgtk-2.3.2-no_jit_4.patch b/webkitgtk-2.3.2-no_jit_4.patch new file mode 100644 index 0000000..692ff21 --- /dev/null +++ b/webkitgtk-2.3.2-no_jit_4.patch @@ -0,0 +1,31 @@ +diff -up webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.no_jit_4 webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.asm +--- webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.no_jit_4 2013-12-05 13:37:50.064205163 +0100 ++++ webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-12-05 13:38:25.544272612 +0100 +@@ -426,12 +426,15 @@ macro doReturn() + ret + end + ++if C_LOOP ++else + # stub to call into JavaScript + # EncodedJSValue callToJavaScript(void* code, Register* topOfStack) + # Note, if this stub or one of it's related macros is changed, make the + # equivalent changes in jit/JITStubsX86.h and/or jit/JITStubsMSVC64.asm + _callToJavaScript: + doCallToJavaScript() ++end + + # Indicate the beginning of LLInt. + _llint_begin: +diff -up webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.no_jit_4 webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +--- webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.no_jit_4 2013-12-05 13:40:54.414566332 +0100 ++++ webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-12-05 13:41:17.944614906 +0100 +@@ -309,7 +309,7 @@ JSValue CLoop::execute(CallFrame* callFr + // 2. 32 bit result values will be in the low 32-bit of t0. + // 3. 64 bit result values will be in t0. + +- CLoopRegister t0, t1, t2, t3, a1; ++ CLoopRegister t0, t1, t2, t3; + #if USE(JSVALUE64) + CLoopRegister rBasePC, tagTypeNumber, tagMask; + #endif diff --git a/webkitgtk3.spec b/webkitgtk3.spec index c4acbc9..6a966a3 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.2.3 +Version: 2.3.2 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -17,11 +17,21 @@ 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 +# https://bugs.webkit.org/show_bug.cgi?id=125062 +# Remove when 2.3.3 will be released +Patch5: webkitgtk-2.3.2-no_jit_1.patch +# https://bugs.webkit.org/show_bug.cgi?id=125063 +# Remove when 2.3.3 will be released +Patch6: webkitgtk-2.3.2-no_jit_2.patch +# https://bugs.webkit.org/show_bug.cgi?id=123809 +# Remove when 2.3.3 will be released +Patch7: webkitgtk-2.3.2-no_jit_3.patch +# https://bugs.webkit.org/show_bug.cgi?id=125186 +# Remove when 2.3.3 will be released +Patch8: webkitgtk-2.3.2-no_jit_4.patch +Patch9: webkitgtk-2.3.2-libatomic.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -56,6 +66,10 @@ BuildRequires: perl-Switch BuildRequires: ruby BuildRequires: mesa-libGL-devel +%ifarch ppc +BuildRequires: libatomic +%endif + %description WebKitGTK+ is the port of the portable web rendering engine WebKit to the GTK+ platform. @@ -92,10 +106,16 @@ 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 +%patch5 -p1 -b .no_jit_1 +%patch6 -p1 -b .no_jit_2 +%patch7 -p1 -b .no_jit_3 +%patch8 -p1 -b .no_jit_4 +%ifarch ppc +%patch9 -p1 -b .libatomic +%endif %build # Use linker flags to reduce memory consumption @@ -108,7 +128,11 @@ This package contains developer documentation for %{name}. %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 +%global optflags %{optflags} -DENABLE_YARR_JIT=0 %endif %configure \ @@ -208,9 +232,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 Dec 5 2013 Tomas Popela - 2.3.2-1 +- Update to 2.3.2 + * Wed Dec 4 2013 Tomas Popela - 2.2.3-1 - Update to 2.2.3 From eedcb5bbb5ebd32eea5c32899d28766d8563cb06 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 5 Dec 2013 17:20:35 +0100 Subject: [PATCH 126/211] Forgot to update sources From 984710265474e732050c741aa2800fc542e70bec Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 5 Dec 2013 17:25:13 +0100 Subject: [PATCH 127/211] Update sources and changelog fro 2.3.2 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f64dc13..976c4ac 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ webkit-1.3.3.tar.gz /webkitgtk-2.3.1.tar.xz /webkitgtk-2.2.2.tar.xz /webkitgtk-2.2.3.tar.xz +/webkitgtk-2.3.2.tar.xz diff --git a/sources b/sources index bdc6def..1782d59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -613e81c460368ff4d6e02c7887206572 webkitgtk-2.2.3.tar.xz +f9c8e0f985cfd1808b2740c5efb31ca7 webkitgtk-2.3.2.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 6a966a3..ff6b25f 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -237,6 +237,7 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog * Thu Dec 5 2013 Tomas Popela - 2.3.2-1 - Update to 2.3.2 +- Add libatomic as BR on ppc * Wed Dec 4 2013 Tomas Popela - 2.2.3-1 - Update to 2.2.3 From af59a78b1bb2a26ab046701c7135e385a438f76b Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 19 Dec 2013 08:59:35 +0100 Subject: [PATCH 128/211] Update to 2.3.3 --- .gitignore | 1 + sources | 2 +- webkitgtk-2.3.2-no_jit_1.patch | 51 ----- webkitgtk-2.3.2-no_jit_2.patch | 32 --- webkitgtk-2.3.2-no_jit_3.patch | 349 --------------------------------- webkitgtk-2.3.2-no_jit_4.patch | 31 --- webkitgtk3.spec | 21 +- 7 files changed, 6 insertions(+), 481 deletions(-) delete mode 100644 webkitgtk-2.3.2-no_jit_1.patch delete mode 100644 webkitgtk-2.3.2-no_jit_2.patch delete mode 100644 webkitgtk-2.3.2-no_jit_3.patch delete mode 100644 webkitgtk-2.3.2-no_jit_4.patch diff --git a/.gitignore b/.gitignore index 976c4ac..43ed7e4 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ webkit-1.3.3.tar.gz /webkitgtk-2.2.2.tar.xz /webkitgtk-2.2.3.tar.xz /webkitgtk-2.3.2.tar.xz +/webkitgtk-2.3.3.tar.xz diff --git a/sources b/sources index 1782d59..cdc130b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9c8e0f985cfd1808b2740c5efb31ca7 webkitgtk-2.3.2.tar.xz +c51782e37af0af230adf171d97ecdb37 webkitgtk-2.3.3.tar.xz diff --git a/webkitgtk-2.3.2-no_jit_1.patch b/webkitgtk-2.3.2-no_jit_1.patch deleted file mode 100644 index 540b196..0000000 --- a/webkitgtk-2.3.2-no_jit_1.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/Source/JavaScriptCore/bytecode/ValueRecovery.cpp b/Source/JavaScriptCore/bytecode/ValueRecovery.cpp -index 221b175d062ee4b2a396d781ccd1973796213a77..c30e2aef32ea5d17804c16dd5b7bee2f359f1105 100644 ---- a/Source/JavaScriptCore/bytecode/ValueRecovery.cpp -+++ b/Source/JavaScriptCore/bytecode/ValueRecovery.cpp -@@ -60,6 +60,8 @@ JSValue ValueRecovery::recover(ExecState* exec) const - } - } - -+#if ENABLE(JIT) -+ - void ValueRecovery::dumpInContext(PrintStream& out, DumpContext* context) const - { - switch (technique()) { -@@ -130,6 +132,7 @@ void ValueRecovery::dump(PrintStream& out) const - { - dumpInContext(out, 0); - } -+#endif // ENABLE(JIT) - - } // namespace JSC - -diff --git a/Source/JavaScriptCore/bytecode/ValueRecovery.h b/Source/JavaScriptCore/bytecode/ValueRecovery.h -index 7127db703f52ec5668fb8da3d1fae08fcf14162d..dc2d55a289b394ea360a8589d517019b2d2214a9 100644 ---- a/Source/JavaScriptCore/bytecode/ValueRecovery.h -+++ b/Source/JavaScriptCore/bytecode/ValueRecovery.h -@@ -27,12 +27,13 @@ - #define ValueRecovery_h - - #include "DataFormat.h" -+#if ENABLE(JIT) - #include "GPRInfo.h" - #include "FPRInfo.h" -+#endif - #include "JSCJSValue.h" - #include "MacroAssembler.h" - #include "VirtualRegister.h" --#include - #include - - namespace JSC { -@@ -246,8 +247,10 @@ public: - - JSValue recover(ExecState*) const; - -+#if ENABLE(JIT) - void dumpInContext(PrintStream& out, DumpContext* context) const; - void dump(PrintStream& out) const; -+#endif - - private: - ValueRecoveryTechnique m_technique; diff --git a/webkitgtk-2.3.2-no_jit_2.patch b/webkitgtk-2.3.2-no_jit_2.patch deleted file mode 100644 index 7b9d0b9..0000000 --- a/webkitgtk-2.3.2-no_jit_2.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/Source/JavaScriptCore/llint/LLIntThunks.cpp b/Source/JavaScriptCore/llint/LLIntThunks.cpp -index a7387d54c5ad5eedbffa142b94ca890732b11c9b..cd4e7c106c20337a8f45e11d212cdeee09b438e1 100644 ---- a/Source/JavaScriptCore/llint/LLIntThunks.cpp -+++ b/Source/JavaScriptCore/llint/LLIntThunks.cpp -@@ -26,7 +26,7 @@ - #include "config.h" - #include "LLIntThunks.h" - --#if ENABLE(LLINT) -+#if ENABLE(LLINT) && ENABLE(JIT) - - #include "JSInterfaceJIT.h" - #include "JSObject.h" -@@ -36,8 +36,6 @@ - - namespace JSC { namespace LLInt { - --#if !ENABLE(LLINT_C_LOOP) -- - static MacroAssemblerCodeRef generateThunkWithJumpTo(VM* vm, void (*target)(), const char *thunkKind) - { - JSInterfaceJIT jit(vm); -@@ -80,8 +78,6 @@ MacroAssemblerCodeRef programEntryThunkGenerator(VM* vm) - return generateThunkWithJumpTo(vm, llint_program_prologue, "program"); - } - --#endif // !ENABLE(LLINT_C_LOOP) -- - } } // namespace JSC::LLInt - --#endif // ENABLE(LLINT) -+#endif // ENABLE(LLINT) && ENABLE(JIT) diff --git a/webkitgtk-2.3.2-no_jit_3.patch b/webkitgtk-2.3.2-no_jit_3.patch deleted file mode 100644 index ebfc4d4..0000000 --- a/webkitgtk-2.3.2-no_jit_3.patch +++ /dev/null @@ -1,349 +0,0 @@ -diff -up webkitgtk-2.3.2/Source/JavaScriptCore/assembler/LinkBuffer.cpp.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/assembler/LinkBuffer.cpp ---- webkitgtk-2.3.2/Source/JavaScriptCore/assembler/LinkBuffer.cpp.no_jit_3 2013-11-12 08:53:56.000000000 +0100 -+++ webkitgtk-2.3.2/Source/JavaScriptCore/assembler/LinkBuffer.cpp 2013-12-05 13:32:59.623494221 +0100 -@@ -49,7 +49,8 @@ LinkBuffer::CodeRef LinkBuffer::finalize - ASSERT(Options::showDisassembly() || Options::showDFGDisassembly()); - - CodeRef result = finalizeCodeWithoutDisassembly(); -- -+ -+#if ENABLE(DISASSEMBLER) - dataLogF("Generated JIT code for "); - va_list argList; - va_start(argList, format); -@@ -59,6 +60,9 @@ LinkBuffer::CodeRef LinkBuffer::finalize - - dataLogF(" Code at [%p, %p):\n", result.code().executableAddress(), static_cast(result.code().executableAddress()) + result.size()); - disassemble(result.code(), m_size, " ", WTF::dataFile()); -+#else -+ UNUSED_PARAM(format); -+#endif // ENABLE(DISASSEMBLER) - - return result; - } -diff -up webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.cpp.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.cpp ---- webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.cpp.no_jit_3 2013-11-18 08:40:24.000000000 +0100 -+++ webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.cpp 2013-12-05 13:32:59.623494221 +0100 -@@ -26,7 +26,7 @@ - #include "config.h" - #include "DFGDisassembler.h" - --#if ENABLE(DFG_JIT) -+#if ENABLE(DFG_JIT) && ENABLE(DISASSEMBLER) - - #include "CodeBlockWithJITType.h" - #include "DFGGraph.h" -@@ -172,4 +172,4 @@ void Disassembler::dumpDisassembly(Print - - } } // namespace JSC::DFG - --#endif // ENABLE(DFG_JIT) -+#endif // ENABLE(DFG_JIT) && ENABLE(DISASSEMBLER) -diff -up webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.h.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.h ---- webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.h.no_jit_3 2013-08-03 18:10:38.000000000 +0200 -+++ webkitgtk-2.3.2/Source/JavaScriptCore/dfg/DFGDisassembler.h 2013-12-05 13:32:59.623494221 +0100 -@@ -42,6 +42,8 @@ namespace JSC { namespace DFG { - - class Graph; - -+#if ENABLE(DISASSEMBLER) -+ - class Disassembler { - WTF_MAKE_FAST_ALLOCATED; - public: -@@ -97,6 +99,25 @@ private: - MacroAssembler::Label m_endOfCode; - }; - -+#else // ENABLE(DISASSEMBLER) -+ -+class Disassembler { -+ WTF_MAKE_FAST_ALLOCATED; -+public: -+ Disassembler(Graph&) { } -+ -+ void setStartOfCode(MacroAssembler::Label) { } -+ void setForBlockIndex(BlockIndex, MacroAssembler::Label) { } -+ void setForNode(Node*, MacroAssembler::Label) { } -+ void setEndOfMainPath(MacroAssembler::Label) { } -+ void setEndOfCode(MacroAssembler::Label) { } -+ -+ void dump(LinkBuffer&) { } -+ void reportToProfiler(Profiler::Compilation*, LinkBuffer&) { } -+}; -+ -+#endif // ENABLE(DISASSEMBLER) -+ - } } // namespace JSC::DFG - - #endif // ENABLE(DFG_JIT) -diff -up webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/Disassembler.cpp.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/Disassembler.cpp ---- webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/Disassembler.cpp.no_jit_3 2013-08-03 18:10:38.000000000 +0200 -+++ webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/Disassembler.cpp 2013-12-05 13:32:59.623494221 +0100 -@@ -26,6 +26,8 @@ - #include "config.h" - #include "Disassembler.h" - -+#if ENABLE(DISASSEMBLER) -+ - #include "MacroAssemblerCodeRef.h" - #include - -@@ -41,3 +43,4 @@ void disassemble(const MacroAssemblerCod - - } // namespace JSC - -+#endif // ENABLE(DISASSEMBLER) -diff -up webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/X86Disassembler.cpp.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/X86Disassembler.cpp ---- webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/X86Disassembler.cpp.no_jit_3 2013-08-03 18:10:38.000000000 +0200 -+++ webkitgtk-2.3.2/Source/JavaScriptCore/disassembler/X86Disassembler.cpp 2013-12-05 13:32:59.623494221 +0100 -@@ -26,6 +26,7 @@ - #include "config.h" - #include "Disassembler.h" - -+#if ENABLE(DISASSEMBLER) - #if USE(UDIS86) || USE(LLVM_DISASSEMBLER) - - #include "MacroAssemblerCodeRef.h" -@@ -70,4 +71,4 @@ bool tryToDisassemble(const MacroAssembl - } // namespace JSC - - #endif // USE(UDIS86) || USE(LLVM_DISASSEMBLER) -- -+#endif // ENABLE(DISASSEMBLER) -diff -up webkitgtk-2.3.2/Source/JavaScriptCore/jit/FPRInfo.h.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/jit/FPRInfo.h ---- webkitgtk-2.3.2/Source/JavaScriptCore/jit/FPRInfo.h.no_jit_3 2013-11-15 11:39:11.000000000 +0100 -+++ webkitgtk-2.3.2/Source/JavaScriptCore/jit/FPRInfo.h 2013-12-05 13:32:59.623494221 +0100 -@@ -34,6 +34,8 @@ namespace JSC { - typedef MacroAssembler::FPRegisterID FPRReg; - #define InvalidFPRReg ((::JSC::FPRReg)-1) - -+#if ENABLE(JIT) -+ - #if CPU(X86) || CPU(X86_64) - - class FPRInfo { -@@ -108,7 +110,7 @@ public: - static const unsigned InvalidIndex = 0xffffffff; - }; - --#endif -+#endif // CPU(X86) || CPU(X86_64) - - #if CPU(ARM) - -@@ -172,7 +174,7 @@ public: - static const unsigned InvalidIndex = 0xffffffff; - }; - --#endif -+#endif // CPU(ARM) - - #if CPU(ARM64) - -@@ -260,7 +262,7 @@ public: - static const unsigned InvalidIndex = 0xffffffff; - }; - --#endif -+#endif // CPU(ARM64) - - #if CPU(MIPS) - -@@ -327,7 +329,7 @@ public: - static const unsigned InvalidIndex = 0xffffffff; - }; - --#endif -+#endif // CPU(MIPS) - - #if CPU(SH4) - -@@ -389,7 +391,9 @@ public: - static const unsigned InvalidIndex = 0xffffffff; - }; - --#endif -+#endif // CPU(SH4) -+ -+#endif // ENABLE(JIT) - - } // namespace JSC - -diff -up webkitgtk-2.3.2/Source/JavaScriptCore/jit/GPRInfo.h.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/jit/GPRInfo.h ---- webkitgtk-2.3.2/Source/JavaScriptCore/jit/GPRInfo.h.no_jit_3 2013-11-15 11:39:11.000000000 +0100 -+++ webkitgtk-2.3.2/Source/JavaScriptCore/jit/GPRInfo.h 2013-12-05 13:32:59.623494221 +0100 -@@ -34,6 +34,8 @@ namespace JSC { - typedef MacroAssembler::RegisterID GPRReg; - #define InvalidGPRReg ((::JSC::GPRReg)-1) - -+#if ENABLE(JIT) -+ - #if USE(JSVALUE64) - class JSValueRegs { - public: -@@ -125,7 +127,7 @@ private: - int32_t m_offset; - GPRReg m_base; - }; --#endif -+#endif // USE(JSVALUE64) - - #if USE(JSVALUE32_64) - class JSValueRegs { -@@ -276,7 +278,7 @@ private: - int8_t m_payload; - int8_t m_tagType; // Contains the low bits of the tag. - }; --#endif -+#endif // USE(JSVALUE32_64) - - // The baseline JIT requires that regT3 be callee-preserved. - -@@ -343,7 +345,7 @@ public: - static const unsigned InvalidIndex = 0xffffffff; - }; - --#endif -+#endif // CPU(X86) - - #if CPU(X86_64) - #if !OS(WINDOWS) -@@ -439,7 +441,7 @@ public: - static const unsigned InvalidIndex = 0xffffffff; - }; - --#endif -+#endif // CPU(X86_64) - - #if CPU(ARM) - #define NUMBER_OF_ARGUMENT_REGISTERS 4u -@@ -520,7 +522,7 @@ public: - static const unsigned InvalidIndex = 0xffffffff; - }; - --#endif -+#endif // CPU(ARM) - - #if CPU(ARM64) - #define NUMBER_OF_ARGUMENT_REGISTERS 8u -@@ -618,7 +620,7 @@ public: - static const unsigned InvalidIndex = 0xffffffff; - }; - --#endif -+#endif // CPU(ARM64) - - #if CPU(MIPS) - #define NUMBER_OF_ARGUMENT_REGISTERS 4u -@@ -694,7 +696,7 @@ public: - static const unsigned InvalidIndex = 0xffffffff; - }; - --#endif -+#endif // CPU(MIPS) - - #if CPU(SH4) - #define NUMBER_OF_ARGUMENT_REGISTERS 4u -@@ -764,7 +766,7 @@ public: - static const unsigned InvalidIndex = 0xffffffff; - }; - --#endif -+#endif // CPU(SH4) - - // The baseline JIT uses "accumulator" style execution with regT0 (for 64-bit) - // and regT0 + regT1 (for 32-bit) serving as the accumulator register(s) for -@@ -774,6 +776,8 @@ COMPILE_ASSERT(GPRInfo::regT0 == GPRInfo - COMPILE_ASSERT(GPRInfo::regT1 == GPRInfo::returnValueGPR2, regT1_must_equal_returnValueGPR2); - #endif - -+#endif // ENABLE(JIT) -+ - } // namespace JSC - - namespace WTF { -diff -up webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.cpp.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.cpp ---- webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.cpp.no_jit_3 2013-08-03 18:10:38.000000000 +0200 -+++ webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.cpp 2013-12-05 13:32:59.623494221 +0100 -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2012 Apple Inc. All rights reserved. -+ * Copyright (C) 2012, 2013 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -26,7 +26,7 @@ - #include "config.h" - #include "JITDisassembler.h" - --#if ENABLE(JIT) -+#if ENABLE(JIT) && ENABLE(DISASSEMBLER) - - #include "CodeBlock.h" - #include "CodeBlockWithJITType.h" -@@ -164,5 +164,5 @@ void JITDisassembler::dumpDisassembly(Pr - - } // namespace JSC - --#endif // ENABLE(JIT) -+#endif // ENABLE(JIT) && ENABLE(DISASSEMBLER) - -diff -up webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.h.no_jit_3 webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.h ---- webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.h.no_jit_3 2013-08-03 18:10:38.000000000 +0200 -+++ webkitgtk-2.3.2/Source/JavaScriptCore/jit/JITDisassembler.h 2013-12-05 13:32:59.623494221 +0100 -@@ -39,6 +39,8 @@ namespace JSC { - - class CodeBlock; - -+#if ENABLE(DISASSEMBLER) -+ - class JITDisassembler { - WTF_MAKE_FAST_ALLOCATED; - public: -@@ -84,6 +86,25 @@ private: - MacroAssembler::Label m_endOfCode; - }; - -+#else // ENABLE(DISASSEMBLER) -+ -+class JITDisassembler { -+ WTF_MAKE_FAST_ALLOCATED; -+public: -+ JITDisassembler(CodeBlock*) { } -+ -+ void setStartOfCode(MacroAssembler::Label) { } -+ void setForBytecodeMainPath(unsigned, MacroAssembler::Label) { } -+ void setForBytecodeSlowPath(unsigned, MacroAssembler::Label) { } -+ void setEndOfSlowPath(MacroAssembler::Label) { } -+ void setEndOfCode(MacroAssembler::Label) { } -+ -+ void dump(LinkBuffer&) { } -+ void reportToProfiler(Profiler::Compilation*, LinkBuffer&) { } -+}; -+ -+#endif // ENABLE(DISASSEMBLER) -+ - } // namespace JSC - - #endif // ENABLE(JIT) -diff -up webkitgtk-2.3.2/Source/WTF/wtf/Platform.h.no_jit_3 webkitgtk-2.3.2/Source/WTF/wtf/Platform.h ---- webkitgtk-2.3.2/Source/WTF/wtf/Platform.h.no_jit_3 2013-12-05 13:32:59.613494190 +0100 -+++ webkitgtk-2.3.2/Source/WTF/wtf/Platform.h 2013-12-05 13:32:59.623494221 +0100 -@@ -868,6 +868,16 @@ - #endif - #endif - -+/* If the Disassembler is enabled, then the Assembler must be enabled as well: */ -+#if ENABLE(DISASSEMBLER) -+#if defined(ENABLE_ASSEMBLER) && !ENABLE_ASSEMBLER -+#error "Cannot enable the Disassembler without enabling the Assembler" -+#else -+#undef ENABLE_ASSEMBLER -+#define ENABLE_ASSEMBLER 1 -+#endif -+#endif -+ - /* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in. - On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */ - #if ENABLE(ASSEMBLER) diff --git a/webkitgtk-2.3.2-no_jit_4.patch b/webkitgtk-2.3.2-no_jit_4.patch deleted file mode 100644 index 692ff21..0000000 --- a/webkitgtk-2.3.2-no_jit_4.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.no_jit_4 webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.asm ---- webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.no_jit_4 2013-12-05 13:37:50.064205163 +0100 -+++ webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-12-05 13:38:25.544272612 +0100 -@@ -426,12 +426,15 @@ macro doReturn() - ret - end - -+if C_LOOP -+else - # stub to call into JavaScript - # EncodedJSValue callToJavaScript(void* code, Register* topOfStack) - # Note, if this stub or one of it's related macros is changed, make the - # equivalent changes in jit/JITStubsX86.h and/or jit/JITStubsMSVC64.asm - _callToJavaScript: - doCallToJavaScript() -+end - - # Indicate the beginning of LLInt. - _llint_begin: -diff -up webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.no_jit_4 webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ---- webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.no_jit_4 2013-12-05 13:40:54.414566332 +0100 -+++ webkitgtk-2.3.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-12-05 13:41:17.944614906 +0100 -@@ -309,7 +309,7 @@ JSValue CLoop::execute(CallFrame* callFr - // 2. 32 bit result values will be in the low 32-bit of t0. - // 3. 64 bit result values will be in t0. - -- CLoopRegister t0, t1, t2, t3, a1; -+ CLoopRegister t0, t1, t2, t3; - #if USE(JSVALUE64) - CLoopRegister rBasePC, tagTypeNumber, tagMask; - #endif diff --git a/webkitgtk3.spec b/webkitgtk3.spec index ff6b25f..fcb8b1e 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.3.2 +Version: 2.3.3 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -19,18 +19,6 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch0: webkit-1.1.14-nspluginwrapper.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch4: webkit-2.1.90-double2intsPPC32.patch -# https://bugs.webkit.org/show_bug.cgi?id=125062 -# Remove when 2.3.3 will be released -Patch5: webkitgtk-2.3.2-no_jit_1.patch -# https://bugs.webkit.org/show_bug.cgi?id=125063 -# Remove when 2.3.3 will be released -Patch6: webkitgtk-2.3.2-no_jit_2.patch -# https://bugs.webkit.org/show_bug.cgi?id=123809 -# Remove when 2.3.3 will be released -Patch7: webkitgtk-2.3.2-no_jit_3.patch -# https://bugs.webkit.org/show_bug.cgi?id=125186 -# Remove when 2.3.3 will be released -Patch8: webkitgtk-2.3.2-no_jit_4.patch Patch9: webkitgtk-2.3.2-libatomic.patch BuildRequires: at-spi2-core-devel @@ -109,10 +97,6 @@ This package contains developer documentation for %{name}. %ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif -%patch5 -p1 -b .no_jit_1 -%patch6 -p1 -b .no_jit_2 -%patch7 -p1 -b .no_jit_3 -%patch8 -p1 -b .no_jit_4 %ifarch ppc %patch9 -p1 -b .libatomic %endif @@ -235,6 +219,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Thu Dec 19 2013 Tomas Popela - 2.3.3-1 +- Update to 2.3.3 + * Thu Dec 5 2013 Tomas Popela - 2.3.2-1 - Update to 2.3.2 - Add libatomic as BR on ppc From 4e16f80caabbb4916bc3f8dfddcb7101e284aef7 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 1 Jan 2014 21:45:56 -0700 Subject: [PATCH 129/211] Rebuild for libwebp soname bump --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index fcb8b1e..1329f4c 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -219,6 +219,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Thu Jan 02 2014 Orion Poplawski - 2.3.3-2 +- Rebuild for libwebp soname bump + * Thu Dec 19 2013 Tomas Popela - 2.3.3-1 - Update to 2.3.3 From 6f6b8b4e3e149cdfb857654ef42e596acfbe1ee1 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 13 Jan 2014 14:41:05 +0100 Subject: [PATCH 130/211] Update to 2.3.4 --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 43ed7e4..9b17195 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ webkit-1.3.3.tar.gz /webkitgtk-2.2.3.tar.xz /webkitgtk-2.3.2.tar.xz /webkitgtk-2.3.3.tar.xz +/webkitgtk-2.3.4.tar.xz diff --git a/sources b/sources index cdc130b..43eaf84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c51782e37af0af230adf171d97ecdb37 webkitgtk-2.3.3.tar.xz +9f4271fb19c92c4b854b3e59d95b1e57 webkitgtk-2.3.4.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 1329f4c..043b846 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.3.3 +Version: 2.3.4 Release: 2%{?dist} Summary: GTK+ Web content engine library @@ -219,6 +219,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Mon Jan 13 2014 Tomas Popela - 2.3.4-1 +- Update to 2.3.4 + * Thu Jan 02 2014 Orion Poplawski - 2.3.3-2 - Rebuild for libwebp soname bump From b4c792c7a5f74e0f17e82590c390bc8348c09e5b Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 17 Jan 2014 07:52:12 +0100 Subject: [PATCH 131/211] Add patch that fixes compilation on i686 --- webkitgtk-2.3.4-atomics_h.patch | 12 ++++++++++++ webkitgtk3.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.3.4-atomics_h.patch 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 - 2.3.4-1 - Update to 2.3.4 +- Add patch that fixes compilation on i686 * Thu Jan 02 2014 Orion Poplawski - 2.3.3-2 - Rebuild for libwebp soname bump From 9c0bad912f1781026fff49d6ca5a552fd36dc763 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 17 Jan 2014 10:39:15 +0100 Subject: [PATCH 132/211] Add newly introduced files --- webkitgtk3.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 817fdca..8e2fb09 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -198,7 +198,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 @@ -213,6 +215,7 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_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 From 4ed3fcb7b2f5ae8701982236afb93f69ae717240 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 6 Feb 2014 14:41:30 +0100 Subject: [PATCH 133/211] Update to 2.3.5 --- .gitignore | 1 + sources | 2 +- webkitgtk-2.3.4-atomics_h.patch | 12 ------------ webkitgtk3.spec | 9 ++++----- 4 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 webkitgtk-2.3.4-atomics_h.patch diff --git a/.gitignore b/.gitignore index 9b17195..9d82b5c 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ webkit-1.3.3.tar.gz /webkitgtk-2.3.2.tar.xz /webkitgtk-2.3.3.tar.xz /webkitgtk-2.3.4.tar.xz +/webkitgtk-2.3.5.tar.xz diff --git a/sources b/sources index 43eaf84..78a80c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f4271fb19c92c4b854b3e59d95b1e57 webkitgtk-2.3.4.tar.xz +8e677aa4bb867b3ef1c4e083c58d771e webkitgtk-2.3.5.tar.xz diff --git a/webkitgtk-2.3.4-atomics_h.patch b/webkitgtk-2.3.4-atomics_h.patch deleted file mode 100644 index 68dcf87..0000000 --- a/webkitgtk-2.3.4-atomics_h.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 8e2fb09..5de1dd0 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.3.4 +Version: 2.3.5 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -20,9 +20,6 @@ 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 @@ -103,7 +100,6 @@ 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 @@ -226,6 +222,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Thu Feb 6 2014 Tomas Popela - 2.3.5-1 +- Update to 2.3.5 + * Mon Jan 13 2014 Tomas Popela - 2.3.4-1 - Update to 2.3.4 - Add patch that fixes compilation on i686 From 04f73efdf6ee6c5cf6a080d26f01e2620a432402 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 7 Feb 2014 10:52:25 +0000 Subject: [PATCH 134/211] Add support for aarch64 --- webkitgtk3.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 5de1dd0..34a6543 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -20,6 +20,7 @@ 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 +Patch10: webkitgtk-aarch64.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -100,6 +101,7 @@ This package contains developer documentation for %{name}. %ifarch ppc %patch9 -p1 -b .libatomic %endif +%patch10 -p1 -b .aarch64 %build # Use linker flags to reduce memory consumption @@ -222,6 +224,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Fri Feb 7 2014 Peter Robinson 2.3.5-2 +- Add support for aarch64 + * Thu Feb 6 2014 Tomas Popela - 2.3.5-1 - Update to 2.3.5 From 750a878a146c94517dcdb94347828da71d5df290 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 7 Feb 2014 10:56:36 +0000 Subject: [PATCH 135/211] add aarch64 patch --- webkitgtk-aarch64.patch | 47 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 webkitgtk-aarch64.patch diff --git a/webkitgtk-aarch64.patch b/webkitgtk-aarch64.patch new file mode 100644 index 0000000..e6601b8 --- /dev/null +++ b/webkitgtk-aarch64.patch @@ -0,0 +1,47 @@ +--- 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 +@@ -807,7 +816,7 @@ + #define ENABLE_REGEXP_TRACING 0 + + /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ +-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) ++#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !CPU(AARCH64) && !CPU(PPC) + #define ENABLE_YARR_JIT 1 + + /* Setting this flag compares JIT results with interpreter results. */ +--- 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) From 92da13a472c7df837f61725cd2c6424fd6407975 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Thu, 13 Feb 2014 18:18:47 +0000 Subject: [PATCH 136/211] Rebuild against new libicu --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 34a6543..6b286b7 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -224,6 +224,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Fri Feb 7 2014 Paul Howarth - 2.3.5-3 +- Rebuild against new libicu + * Fri Feb 7 2014 Peter Robinson 2.3.5-2 - Add support for aarch64 From 818580ec2a6e7c929882c2fc60c2c41ecb4fac74 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Thu, 13 Feb 2014 18:19:58 +0000 Subject: [PATCH 137/211] Fix wrong date in changelog --- webkitgtk3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 6b286b7..984446b 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -224,7 +224,7 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog -* Fri Feb 7 2014 Paul Howarth - 2.3.5-3 +* Thu Feb 13 2014 Paul Howarth - 2.3.5-3 - Rebuild against new libicu * Fri Feb 7 2014 Peter Robinson 2.3.5-2 From e03186d5d440f8e21ba7e5c53da0bc2e4d43af32 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 18 Feb 2014 09:21:01 +0100 Subject: [PATCH 138/211] Update to 2.3.90 Enable full debuginfo on s390x --- .gitignore | 1 + sources | 2 +- webkitgtk3.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9d82b5c..926d02b 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ webkit-1.3.3.tar.gz /webkitgtk-2.3.3.tar.xz /webkitgtk-2.3.4.tar.xz /webkitgtk-2.3.5.tar.xz +/webkitgtk-2.3.90.tar.xz diff --git a/sources b/sources index 78a80c8..9e2a685 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e677aa4bb867b3ef1c4e083c58d771e webkitgtk-2.3.5.tar.xz +870c7e41e816d25dc33b8fc786fc5328 webkitgtk-2.3.90.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 984446b..fbf3c66 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.3.5 -Release: 3%{?dist} +Version: 2.3.90 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -107,7 +107,7 @@ This package contains developer documentation for %{name}. # 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 @@ -224,6 +224,10 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Feb 18 2014 Tomas Popela - 2.3.90-1 +- Update to 2.3.90 +- Enable full debuginfo on s390x + * Thu Feb 13 2014 Paul Howarth - 2.3.5-3 - Rebuild against new libicu From 527ebb445dfe1c5a30d807dccac9ce6b07c74418 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 18 Feb 2014 16:26:00 +0000 Subject: [PATCH 139/211] Disable JIT on aarch64 --- .gitignore | 57 +------------------------------------------------ webkitgtk3.spec | 7 ++++-- 2 files changed, 6 insertions(+), 58 deletions(-) diff --git a/.gitignore b/.gitignore index 926d02b..90f2733 100644 --- a/.gitignore +++ b/.gitignore @@ -1,56 +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.3.1.tar.xz -/webkitgtk-2.2.2.tar.xz -/webkitgtk-2.2.3.tar.xz -/webkitgtk-2.3.2.tar.xz -/webkitgtk-2.3.3.tar.xz -/webkitgtk-2.3.4.tar.xz -/webkitgtk-2.3.5.tar.xz -/webkitgtk-2.3.90.tar.xz +/webkitgtk-2.*.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index fbf3c66..112ee2d 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.3.90 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -123,7 +123,7 @@ This package contains developer documentation for %{name}. %configure \ --with-gtk=3.0 \ -%ifarch s390 s390x ppc ppc64 +%ifarch s390 s390x ppc ppc64 aarch64 --disable-jit \ %else --enable-jit \ @@ -224,6 +224,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Feb 18 2014 Peter Robinson 2.3.90-2 +- Disable JIT on aarch64 + * Tue Feb 18 2014 Tomas Popela - 2.3.90-1 - Update to 2.3.90 - Enable full debuginfo on s390x From 500c54515d567ba3c8d1b4f7a04ff88de93ad9d0 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 27 Feb 2014 18:48:20 +0100 Subject: [PATCH 140/211] disable libatomic patch on ppc. webkitgtk3 now uses std::atomic --- webkitgtk3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 112ee2d..6336887 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.3.90 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -99,7 +99,7 @@ This package contains developer documentation for %{name}. %patch4 -p1 -b .double2intsPPC32 %endif %ifarch ppc -%patch9 -p1 -b .libatomic +#patch9 -p1 -b .libatomic %endif %patch10 -p1 -b .aarch64 @@ -224,6 +224,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Thu Feb 27 2014 Karsten Hopp 2.3.90-3 +- disable libatomic patch on ppc. webkitgtk3 now uses std::atomic + * Tue Feb 18 2014 Peter Robinson 2.3.90-2 - Disable JIT on aarch64 From a4dd5144f0e731fe65c058e33a2cd270384a9fe6 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 4 Mar 2014 09:20:42 +0100 Subject: [PATCH 141/211] Update to 2.3.91 --- sources | 2 +- webkitgtk-2.3.2-libatomic.patch | 19 ------------------- webkitgtk3.spec | 15 +++++---------- 3 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 webkitgtk-2.3.2-libatomic.patch diff --git a/sources b/sources index 9e2a685..f4c8083 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -870c7e41e816d25dc33b8fc786fc5328 webkitgtk-2.3.90.tar.xz +97e0a3c3d2155c3d64410743bada9f4d webkitgtk-2.3.91.tar.xz diff --git a/webkitgtk-2.3.2-libatomic.patch b/webkitgtk-2.3.2-libatomic.patch deleted file mode 100644 index 307a812..0000000 --- a/webkitgtk-2.3.2-libatomic.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up webkitgtk-2.3.2/Source/WTF/wtf/Atomics.h.libatomic webkitgtk-2.3.2/Source/WTF/wtf/Atomics.h ---- webkitgtk-2.3.2/Source/WTF/wtf/Atomics.h.libatomic 2013-12-05 15:43:22.160186327 +0100 -+++ webkitgtk-2.3.2/Source/WTF/wtf/Atomics.h 2013-12-05 15:44:02.630264977 +0100 -@@ -101,11 +101,11 @@ inline int atomicDecrement(int volatile* - - #elif COMPILER(GCC) - --inline int atomicIncrement(int volatile* addend) { return __sync_add_and_fetch(addend, 1); } --inline int atomicDecrement(int volatile* addend) { return __sync_sub_and_fetch(addend, 1); } -+inline int atomicIncrement(int volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); } -+inline int atomicDecrement(int volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); } - --inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_add_and_fetch(addend, 1); } --inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_sub_and_fetch(addend, 1); } -+inline int64_t atomicIncrement(int64_t volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); } -+inline int64_t atomicDecrement(int64_t volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); } - - #endif - diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 6336887..4a4578b 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.3.90 -Release: 3%{?dist} +Version: 2.3.91 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -19,7 +19,6 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz 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 Patch10: webkitgtk-aarch64.patch BuildRequires: at-spi2-core-devel @@ -55,10 +54,6 @@ BuildRequires: perl-Switch BuildRequires: ruby BuildRequires: mesa-libGL-devel -%ifarch ppc -BuildRequires: libatomic -%endif - %description WebKitGTK+ is the port of the portable web rendering engine WebKit to the GTK+ platform. @@ -98,9 +93,6 @@ This package contains developer documentation for %{name}. %ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif -%ifarch ppc -#patch9 -p1 -b .libatomic -%endif %patch10 -p1 -b .aarch64 %build @@ -224,6 +216,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Mar 4 2014 Tomas Popela - 2.3.91-1 +- Update to 2.3.91 + * Thu Feb 27 2014 Karsten Hopp 2.3.90-3 - disable libatomic patch on ppc. webkitgtk3 now uses std::atomic From 45fdd76fbf294d44a5b01f2656b5ef935e0e7df3 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 4 Mar 2014 14:53:06 +0100 Subject: [PATCH 142/211] Add newly installed file --- webkitgtk3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 4a4578b..08174ad 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -202,6 +202,7 @@ 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 From 9bc60cb0e5e7002fee1a381d736d744b93089563 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 18 Mar 2014 10:03:39 +0100 Subject: [PATCH 143/211] Update to 2.3.92 --- sources | 2 +- webkitgtk-aarch64.patch | 9 --------- webkitgtk3.spec | 7 +++++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/sources b/sources index f4c8083..b802e8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97e0a3c3d2155c3d64410743bada9f4d webkitgtk-2.3.91.tar.xz +cd9ba6233421c6d0eefc511daf79001b webkitgtk-2.3.92.tar.xz diff --git a/webkitgtk-aarch64.patch b/webkitgtk-aarch64.patch index e6601b8..fe54daa 100644 --- a/webkitgtk-aarch64.patch +++ b/webkitgtk-aarch64.patch @@ -25,15 +25,6 @@ #define WTF_USE_JSVALUE64 1 #else #define WTF_USE_JSVALUE32_64 1 -@@ -807,7 +816,7 @@ - #define ENABLE_REGEXP_TRACING 0 - - /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ --#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) -+#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !CPU(AARCH64) && !CPU(PPC) - #define ENABLE_YARR_JIT 1 - - /* Setting this flag compares JIT results with interpreter results. */ --- 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 @@ diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 08174ad..6decf76 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.3.91 +Version: 2.3.92 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -109,7 +109,7 @@ This package contains developer documentation for %{name}. %global optflags %{optflags} -Wl,-relax -latomic %endif -%ifarch s390 s390x ppc ppc64 +%ifarch s390 s390x ppc ppc64 aarch64 %global optflags %{optflags} -DENABLE_YARR_JIT=0 %endif @@ -217,6 +217,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Mar 18 2014 Tomas Popela - 2.3.92-1 +- Update to 2.3.92 + * Tue Mar 4 2014 Tomas Popela - 2.3.91-1 - Update to 2.3.91 From 2648ec3813cd3f977bf07d0f08fae81e0e181923 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 19 Mar 2014 11:39:26 +0100 Subject: [PATCH 144/211] Switch over to geoclue2 --- webkitgtk3.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 6decf76..e1048f2 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.3.92 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -29,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 @@ -53,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 @@ -64,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 @@ -217,6 +219,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Wed Mar 19 2014 Kalev Lember - 2.3.92-2 +- Switch over to geoclue2 + * Tue Mar 18 2014 Tomas Popela - 2.3.92-1 - Update to 2.3.92 From f4e69b2b3f85fc6bfa8bb09843b986e00dabf773 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 25 Mar 2014 11:09:13 +0100 Subject: [PATCH 145/211] Update to 2.4.0 --- sources | 2 +- webkitgtk3.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index b802e8b..21acbc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd9ba6233421c6d0eefc511daf79001b webkitgtk-2.3.92.tar.xz +c759bf11fe4cadd1268630f16a97f7b9 webkitgtk-2.4.0.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index e1048f2..1c2b79d 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.3.92 -Release: 2%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -219,6 +219,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Mar 25 2014 Kalev Lember - 2.4.0-1 +- Update to 2.4.0 + * Wed Mar 19 2014 Kalev Lember - 2.3.92-2 - Switch over to geoclue2 From e719f0f6158786df11b2a46c9a79fcbbc53dd6b7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 14 Apr 2014 21:54:24 +0200 Subject: [PATCH 146/211] Update to 2.4.1 --- sources | 2 +- webkitgtk3.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 21acbc5..eda5de3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c759bf11fe4cadd1268630f16a97f7b9 webkitgtk-2.4.0.tar.xz +c57ebecff1ba7663b303e21a64840c48 webkitgtk-2.4.1.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 1c2b79d..06c136e 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -6,7 +6,7 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.4.0 +Version: 2.4.1 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -219,6 +219,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Mon Apr 14 2014 Kalev Lember - 2.4.1-1 +- Update to 2.4.1 + * Tue Mar 25 2014 Kalev Lember - 2.4.0-1 - Update to 2.4.0 From db35e9b3b08361a9507f0f497c1f613a450fb923 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 7 May 2014 10:49:33 +0200 Subject: [PATCH 147/211] Make sure -devel pulls in libwebkit2gtk --- webkitgtk3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 06c136e..bcd74c5 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -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 @@ -219,6 +220,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Wed May 07 2014 Kalev Lember - 2.4.1-2 +- Make sure -devel pulls in libwebkit2gtk + * Mon Apr 14 2014 Kalev Lember - 2.4.1-1 - Update to 2.4.1 From 7f1513c796e9d0f0e0e0eebf65423109725223f0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 12 May 2014 11:04:26 +0200 Subject: [PATCH 148/211] Update to 2.4.2 --- sources | 2 +- webkitgtk3.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index eda5de3..083f89b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c57ebecff1ba7663b303e21a64840c48 webkitgtk-2.4.1.tar.xz +da2b1b0f0863f3f21bdbc0476001589f webkitgtk-2.4.2.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index bcd74c5..02dedc0 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.4.1 -Release: 2%{?dist} +Version: 2.4.2 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -220,6 +220,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Mon May 12 2014 Kalev Lember - 2.4.2-1 +- Update to 2.4.2 + * Wed May 07 2014 Kalev Lember - 2.4.1-2 - Make sure -devel pulls in libwebkit2gtk From cef621fe9b24ec4d4abfc6396ddde9960ca31f44 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 13 May 2014 18:05:58 +0200 Subject: [PATCH 149/211] PPC (32bit) needs libatomic in the buildroot --- webkitgtk3.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 02dedc0..1459d5a 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -53,6 +53,9 @@ BuildRequires: gobject-introspection-devel >= 1.32.0 BuildRequires: perl-Switch BuildRequires: ruby BuildRequires: mesa-libGL-devel +%ifarch ppc +BuildRequires: libatomic +%endif Requires: geoclue2 %description @@ -220,6 +223,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue May 13 2014 Karsten Hopp 2.4.2-2 +- PPC (32bit) needs libatomic in the buildroot + * Mon May 12 2014 Kalev Lember - 2.4.2-1 - Update to 2.4.2 From 769a1f3710fb68105c9cff782af2f7d4221627d6 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 14 May 2014 16:51:33 +0200 Subject: [PATCH 150/211] Add support for ppc64le Fix for CLoop on ppc64, ppc64le and s390x --- webkitgtk-2.4.1-cloop_fix.patch | 138 ++++++++++++++++++++++++++++++ webkitgtk-2.4.1-ppc64_align.patch | 45 ++++++++++ webkitgtk-2.4.2-ppc64le.patch | 69 +++++++++++++++ webkitgtk3.spec | 22 ++++- 4 files changed, 271 insertions(+), 3 deletions(-) create mode 100644 webkitgtk-2.4.1-cloop_fix.patch create mode 100644 webkitgtk-2.4.1-ppc64_align.patch create mode 100644 webkitgtk-2.4.2-ppc64le.patch diff --git a/webkitgtk-2.4.1-cloop_fix.patch b/webkitgtk-2.4.1-cloop_fix.patch new file mode 100644 index 0000000..c5d9668 --- /dev/null +++ b/webkitgtk-2.4.1-cloop_fix.patch @@ -0,0 +1,138 @@ +diff -up webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h +--- webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix 2014-04-14 08:40:44.000000000 +0200 ++++ webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h 2014-04-30 16:10:49.120156216 +0200 +@@ -36,7 +36,7 @@ struct ProtoCallFrame { + Register calleeValue; + Register argCountAndCodeOriginValue; + Register thisArg; +- size_t paddedArgCount; ++ uint32_t paddedArgCount; + JSValue *args; + + void init(CodeBlock*, JSScope*, JSObject*, JSValue, int, JSValue* otherArgs = 0); +@@ -53,7 +53,7 @@ struct ProtoCallFrame { + int argumentCountIncludingThis() const { return argCountAndCodeOriginValue.payload(); } + int argumentCount() const { return argumentCountIncludingThis() - 1; } + void setArgumentCountIncludingThis(int count) { argCountAndCodeOriginValue.payload() = count; } +- void setPaddedArgsCount(size_t argCount) { paddedArgCount = argCount; } ++ void setPaddedArgsCount(uint32_t argCount) { paddedArgCount = argCount; } + + void clearCurrentVPC() { argCountAndCodeOriginValue.tag() = 0; } + +diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp +--- webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix 2014-04-30 16:11:18.457540050 +0200 ++++ webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-04-30 16:11:50.944965101 +0200 +@@ -1354,7 +1354,7 @@ LLINT_SLOW_PATH_DECL(slow_path_get_from_ + CodeBlock* codeBlock = exec->codeBlock(); + ConcurrentJITLocker locker(codeBlock->m_lock); + pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure()); +- pc[6].u.operand = slot.cachedOffset(); ++ pc[6].u.pointer = reinterpret_cast(slot.cachedOffset()); + } + } + +@@ -1381,7 +1381,7 @@ LLINT_SLOW_PATH_DECL(slow_path_put_to_sc + if (slot.isCacheable() && slot.base() == scope && scope->structure()->propertyAccessesAreCacheable()) { + ConcurrentJITLocker locker(codeBlock->m_lock); + pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure()); +- pc[6].u.operand = slot.cachedOffset(); ++ pc[6].u.pointer = reinterpret_cast(slot.cachedOffset()); + } + } + +diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +--- webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix 2014-04-14 08:40:44.000000000 +0200 ++++ webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-04-30 16:12:35.648549985 +0200 +@@ -282,7 +282,7 @@ macro doCallToJavaScript(makeCall, doRet + storep temp3, CodeBlock+4[cfr, temp1, 8] + btinz temp1, .copyHeaderLoop + +- loadi ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2 ++ loadi PayloadOffset + ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2 + subi 1, temp2 + loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp3 + subi 1, temp3 +@@ -2277,7 +2277,7 @@ macro loadWithStructureCheck(operand, sl + end + + macro getProperty() +- loadisFromInstruction(6, t3) ++ loadpFromInstruction(6, t3) + loadPropertyAtVariableOffset(t3, t0, t1, t2) + valueProfile(t1, t2, 28, t0) + loadisFromInstruction(1, t0) +@@ -2297,7 +2297,7 @@ end + + macro getClosureVar() + loadp JSVariableObject::m_registers[t0], t0 +- loadisFromInstruction(6, t3) ++ loadpFromInstruction(6, t3) + loadp TagOffset[t0, t3, 8], t1 + loadp PayloadOffset[t0, t3, 8], t2 + valueProfile(t1, t2, 28, t0) +@@ -2356,7 +2356,7 @@ _llint_op_get_from_scope: + macro putProperty() + loadisFromInstruction(3, t1) + loadConstantOrVariable(t1, t2, t3) +- loadisFromInstruction(6, t1) ++ loadpFromInstruction(6, t1) + storePropertyAtVariableOffset(t1, t0, t2, t3) + end + +@@ -2374,7 +2374,7 @@ macro putClosureVar() + loadisFromInstruction(3, t1) + loadConstantOrVariable(t1, t2, t3) + loadp JSVariableObject::m_registers[t0], t0 +- loadisFromInstruction(6, t1) ++ loadpFromInstruction(6, t1) + storei t2, TagOffset[t0, t1, 8] + storei t3, PayloadOffset[t0, t1, 8] + end +diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm +--- webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix 2014-04-14 08:40:44.000000000 +0200 ++++ webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-04-30 16:10:49.121156229 +0200 +@@ -171,7 +171,7 @@ macro doCallToJavaScript(makeCall, doRet + storep temp3, CodeBlock[cfr, temp1, 8] + btinz temp1, .copyHeaderLoop + +- loadi ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2 ++ loadi PayloadOffset + ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2 + subi 1, temp2 + loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp3 + subi 1, temp3 +@@ -2047,7 +2047,7 @@ macro loadWithStructureCheck(operand, sl + end + + macro getProperty() +- loadisFromInstruction(6, t1) ++ loadpFromInstruction(6, t1) + loadPropertyAtVariableOffset(t1, t0, t2) + valueProfile(t2, 7, t0) + loadisFromInstruction(1, t0) +@@ -2064,7 +2064,7 @@ end + + macro getClosureVar() + loadp JSVariableObject::m_registers[t0], t0 +- loadisFromInstruction(6, t1) ++ loadpFromInstruction(6, t1) + loadq [t0, t1, 8], t0 + valueProfile(t0, 7, t1) + loadisFromInstruction(1, t1) +@@ -2121,7 +2121,7 @@ _llint_op_get_from_scope: + macro putProperty() + loadisFromInstruction(3, t1) + loadConstantOrVariable(t1, t2) +- loadisFromInstruction(6, t1) ++ loadpFromInstruction(6, t1) + storePropertyAtVariableOffset(t1, t0, t2) + end + +@@ -2138,7 +2138,7 @@ macro putClosureVar() + loadisFromInstruction(3, t1) + loadConstantOrVariable(t1, t2) + loadp JSVariableObject::m_registers[t0], t0 +- loadisFromInstruction(6, t1) ++ loadpFromInstruction(6, t1) + storeq t2, [t0, t1, 8] + end + diff --git a/webkitgtk-2.4.1-ppc64_align.patch b/webkitgtk-2.4.1-ppc64_align.patch new file mode 100644 index 0000000..5186d60 --- /dev/null +++ b/webkitgtk-2.4.1-ppc64_align.patch @@ -0,0 +1,45 @@ +diff -up webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h +--- webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align 2014-05-12 08:03:53.000000000 +0200 ++++ webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h 2014-05-14 15:16:36.946318596 +0200 +@@ -81,7 +81,7 @@ public: + size_t size(); + size_t capacity(); + +- static const size_t blockSize = 32 * KB; ++ static const size_t blockSize = 64 * KB; + + bool hasWorkList(); + CopyWorkList& workList(); +diff -up webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp +--- webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align 2014-05-12 08:03:53.000000000 +0200 ++++ webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp 2014-05-14 15:17:35.617171141 +0200 +@@ -49,7 +49,8 @@ JSStack::JSStack(VM& vm, size_t capacity + { + ASSERT(capacity && isPageAligned(capacity)); + +- m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitSize), OSAllocator::JSVMStackPages); ++ size_t commitsize = pageSize(); ++ m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitsize), OSAllocator::JSVMStackPages); + updateStackLimit(highAddress()); + m_commitEnd = highAddress(); + +@@ -78,7 +79,8 @@ bool JSStack::growSlowCase(Register* new + // Compute the chunk size of additional memory to commit, and see if we + // have it is still within our budget. If not, we'll fail to grow and + // return false. +- long delta = roundUpAllocationSize(reinterpret_cast(m_commitEnd) - reinterpret_cast(newEnd), commitSize); ++ size_t commitsize = pageSize(); ++ long delta = roundUpAllocationSize(reinterpret_cast(m_commitEnd) - reinterpret_cast(newEnd), commitsize); + if (reinterpret_cast(m_commitEnd) - delta <= reinterpret_cast(m_useableEnd)) + return false; + +@@ -134,7 +136,8 @@ void JSStack::enableErrorStackReserve() + + void JSStack::disableErrorStackReserve() + { +- char* useableEnd = reinterpret_cast(reservationEnd()) + commitSize; ++ size_t commitsize = pageSize(); ++ char* useableEnd = reinterpret_cast(reservationEnd()) + commitsize; + m_useableEnd = reinterpret_cast_ptr(useableEnd); + + // By the time we get here, we are guaranteed to be destructing the last diff --git a/webkitgtk-2.4.2-ppc64le.patch b/webkitgtk-2.4.2-ppc64le.patch new file mode 100644 index 0000000..3618d98 --- /dev/null +++ b/webkitgtk-2.4.2-ppc64le.patch @@ -0,0 +1,69 @@ +diff -up webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h.ppc64le webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h +--- webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h.ppc64le 2014-05-14 15:37:26.360159487 +0200 ++++ webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h 2014-05-14 15:38:46.938315499 +0200 +@@ -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) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) + #if defined(_WIN32) +diff -up webkitgtk-2.4.2/Source/WTF/wtf/Platform.h.ppc64le webkitgtk-2.4.2/Source/WTF/wtf/Platform.h +--- webkitgtk-2.4.2/Source/WTF/wtf/Platform.h.ppc64le 2014-05-12 08:03:53.000000000 +0200 ++++ webkitgtk-2.4.2/Source/WTF/wtf/Platform.h 2014-05-14 15:39:08.402622454 +0200 +@@ -101,24 +101,38 @@ + #endif /* MIPS */ + + /* CPU(PPC) - PowerPC 32-bit */ +-#if defined(__ppc__) \ ++#if ( defined(__ppc__) \ + || defined(__PPC__) \ + || defined(__powerpc__) \ + || defined(__powerpc) \ + || defined(__POWERPC__) \ + || defined(_M_PPC) \ +- || defined(__PPC) ++ || defined(__PPC)) \ ++ && defined(__BYTE_ORDER__) \ ++ && (__BYTE_ORDER__==__ORDER_BIG_ENDIAN__) + #define WTF_CPU_PPC 1 + #define WTF_CPU_BIG_ENDIAN 1 + #endif + +-/* CPU(PPC64) - PowerPC 64-bit */ +-#if defined(__ppc64__) \ +- || defined(__PPC64__) ++/* CPU(PPC64) - PowerPC 64-bit Big Endian */ ++#if ( defined(__ppc64__) \ ++ || defined(__PPC64__)) \ ++ && defined(__BYTE_ORDER__) \ ++ && (__BYTE_ORDER__==__ORDER_BIG_ENDIAN__) + #define WTF_CPU_PPC64 1 + #define WTF_CPU_BIG_ENDIAN 1 + #endif + ++/* CPU(PPC64) - PowerPC 64-bit Little Endian */ ++#if ( defined(__ppc64__) \ ++ || defined(__PPC64__) \ ++ || defined(__ppc64le__) \ ++ || defined(__PPC64LE__)) \ ++ && defined(__BYTE_ORDER__) \ ++ && (__BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__) ++#define WTF_CPU_PPC64LE 1 ++#endif ++ + /* CPU(SH4) - SuperH SH-4 */ + #if defined(__SH4__) + #define WTF_CPU_SH4 1 +@@ -641,7 +655,8 @@ + || CPU(ALPHA) \ + || CPU(ARM64) \ + || CPU(S390X) \ +- || CPU(PPC64) ++ || CPU(PPC64) \ ++ || CPU(PPC64LE) + #define WTF_USE_JSVALUE64 1 + #else + #define WTF_USE_JSVALUE32_64 1 diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 1459d5a..61eebb2 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.2 -Release: 2%{?dist} +Release: 3%{?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 Patch10: webkitgtk-aarch64.patch +Patch11: webkitgtk-2.4.1-cloop_fix.patch +Patch12: webkitgtk-2.4.1-ppc64_align.patch +Patch13: webkitgtk-2.4.2-ppc64le.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -99,7 +102,16 @@ This package contains developer documentation for %{name}. %ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif +%ifarch aarch64 %patch10 -p1 -b .aarch64 +%endif +%ifarch %{power64} s390x +%patch11 -p1 -b .cloop_fix +%endif +%ifarch %{power64} +%patch12 -p1 -b .ppc64_align +%endif +%patch13 -p1 -b .ppc64le %build # Use linker flags to reduce memory consumption @@ -115,13 +127,13 @@ This package contains developer documentation for %{name}. %global optflags %{optflags} -Wl,-relax -latomic %endif -%ifarch s390 s390x ppc ppc64 aarch64 +%ifarch s390 s390x ppc %{power64} aarch64 %global optflags %{optflags} -DENABLE_YARR_JIT=0 %endif %configure \ --with-gtk=3.0 \ -%ifarch s390 s390x ppc ppc64 aarch64 +%ifarch s390 s390x ppc %{power64} aarch64 --disable-jit \ %else --enable-jit \ @@ -223,6 +235,10 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Wed May 14 2014 Tomas Popela 2.4.2-3 +- Add support for ppc64le +- Fix for CLoop on ppc64, ppc64le and s390x + * Tue May 13 2014 Karsten Hopp 2.4.2-2 - PPC (32bit) needs libatomic in the buildroot From edd519f2224b5a4567ec3d1c943d562ed5a3daf6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 18 May 2014 09:16:15 +0100 Subject: [PATCH 151/211] Fix aarch64 build --- webkitgtk3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 61eebb2..db82f65 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -110,8 +110,8 @@ This package contains developer documentation for %{name}. %endif %ifarch %{power64} %patch12 -p1 -b .ppc64_align -%endif %patch13 -p1 -b .ppc64le +%endif %build # Use linker flags to reduce memory consumption @@ -235,6 +235,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Sun May 18 2014 Peter Robinson 2.4.2-4 +- Fix aarch64 build + * Wed May 14 2014 Tomas Popela 2.4.2-3 - Add support for ppc64le - Fix for CLoop on ppc64, ppc64le and s390x From 581a9135c5110b0c36cdc434f7990f43a3c19745 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 27 May 2014 12:20:01 +0200 Subject: [PATCH 152/211] Update to 2.4.3 --- sources | 2 +- webkitgtk3.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 083f89b..b34b0cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da2b1b0f0863f3f21bdbc0476001589f webkitgtk-2.4.2.tar.xz +c5861552d9ecd6d7854a4d462ff25924 webkitgtk-2.4.3.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index db82f65..4c2b84e 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.4.2 -Release: 4%{?dist} +Version: 2.4.3 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -235,6 +235,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue May 27 2014 Tomas Popela 2.4.3-1 +- Update to 2.4.3 + * Sun May 18 2014 Peter Robinson 2.4.2-4 - Fix aarch64 build From 5e6b5ed2669b85972ac64d2c2d2a765271dbb1e7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 23:20:54 -0500 Subject: [PATCH 153/211] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 4c2b84e..be1fab5 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -235,6 +235,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 2.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue May 27 2014 Tomas Popela 2.4.3-1 - Update to 2.4.3 From 2f4f7015ee0ce1a83f6d40f40e89df976775c987 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 4 Jul 2014 07:25:21 +0200 Subject: [PATCH 154/211] rhbz#1088480 - [abrt] libwebkit2gtk: TSymbolTableLevel::~TSymbolTableLevel(): WebKitWebProcess killed by SIGSEGV --- webkitgtk-2.4.3-angle_symbol_table.patch | 12 ++++++++++++ webkitgtk3.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.4.3-angle_symbol_table.patch diff --git a/webkitgtk-2.4.3-angle_symbol_table.patch b/webkitgtk-2.4.3-angle_symbol_table.patch new file mode 100644 index 0000000..e358042 --- /dev/null +++ b/webkitgtk-2.4.3-angle_symbol_table.patch @@ -0,0 +1,12 @@ +--- a/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp ++++ b/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp +@@ -171,7 +171,8 @@ TFunction::~TFunction() + TSymbolTableLevel::~TSymbolTableLevel() + { + for (tLevel::iterator it = level.begin(); it != level.end(); ++it) +- delete (*it).second; ++ if ((*it).first == (*it).second->getMangledName()) ++ delete (*it).second; + } + + // diff --git a/webkitgtk3.spec b/webkitgtk3.spec index be1fab5..ecb10a1 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -19,6 +19,9 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch0: webkit-1.1.14-nspluginwrapper.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch4: webkit-2.1.90-double2intsPPC32.patch +# https://bugs.webkit.org/show_bug.cgi?id=134593 +# Remove when 2.4.4 will be out +Patch5: webkitgtk-2.4.3-angle_symbol_table.patch Patch10: webkitgtk-aarch64.patch Patch11: webkitgtk-2.4.1-cloop_fix.patch Patch12: webkitgtk-2.4.1-ppc64_align.patch @@ -99,6 +102,7 @@ This package contains developer documentation for %{name}. %prep %setup -qn "webkitgtk-%{version}" %patch0 -p1 -b .nspluginwrapper +%patch5 -p1 -b .angle_symbol_table %ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif @@ -235,6 +239,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Fri Jul 04 2014 Tomas Popela 2.4.3-3 +- rhbz#1088480 - [abrt] libwebkit2gtk: TSymbolTableLevel::~TSymbolTableLevel(): WebKitWebProcess killed by SIGSEGV + * Sun Jun 08 2014 Fedora Release Engineering - 2.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From d70e882febc0538ff78898e72813db92607e690e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 4 Jul 2014 16:35:09 +0100 Subject: [PATCH 155/211] Fix for 64k pages on aarch64 (#1074093, #1113345) --- webkitgtk3.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index ecb10a1..eb8ab03 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -112,8 +112,10 @@ This package contains developer documentation for %{name}. %ifarch %{power64} s390x %patch11 -p1 -b .cloop_fix %endif -%ifarch %{power64} +%ifarch %{power64} aarch64 %patch12 -p1 -b .ppc64_align +%endif +%ifarch %{power64} %patch13 -p1 -b .ppc64le %endif @@ -239,6 +241,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Fri Jul 4 2014 Yaakov Selkowitz - 2.4.3-4 +- Fix for 64k pages on aarch64 (#1074093, #1113345) + * Fri Jul 04 2014 Tomas Popela 2.4.3-3 - rhbz#1088480 - [abrt] libwebkit2gtk: TSymbolTableLevel::~TSymbolTableLevel(): WebKitWebProcess killed by SIGSEGV From c118d3b9bbdb1a187595dc3aec26321152e65a38 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 8 Jul 2014 17:30:46 +0200 Subject: [PATCH 156/211] Update to 2.4.4 --- sources | 2 +- webkitgtk-2.4.3-angle_symbol_table.patch | 12 ------------ webkitgtk3.spec | 11 +++++------ 3 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 webkitgtk-2.4.3-angle_symbol_table.patch diff --git a/sources b/sources index b34b0cf..f691369 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5861552d9ecd6d7854a4d462ff25924 webkitgtk-2.4.3.tar.xz +79edd28d32172abc17a8861622cc274f webkitgtk-2.4.4.tar.xz diff --git a/webkitgtk-2.4.3-angle_symbol_table.patch b/webkitgtk-2.4.3-angle_symbol_table.patch deleted file mode 100644 index e358042..0000000 --- a/webkitgtk-2.4.3-angle_symbol_table.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp -+++ b/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp -@@ -171,7 +171,8 @@ TFunction::~TFunction() - TSymbolTableLevel::~TSymbolTableLevel() - { - for (tLevel::iterator it = level.begin(); it != level.end(); ++it) -- delete (*it).second; -+ if ((*it).first == (*it).second->getMangledName()) -+ delete (*it).second; - } - - // diff --git a/webkitgtk3.spec b/webkitgtk3.spec index eb8ab03..0135838 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.4.3 -Release: 4%{?dist} +Version: 2.4.4 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -19,9 +19,6 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch0: webkit-1.1.14-nspluginwrapper.patch # https://bugs.webkit.org/show_bug.cgi?id=103128 Patch4: webkit-2.1.90-double2intsPPC32.patch -# https://bugs.webkit.org/show_bug.cgi?id=134593 -# Remove when 2.4.4 will be out -Patch5: webkitgtk-2.4.3-angle_symbol_table.patch Patch10: webkitgtk-aarch64.patch Patch11: webkitgtk-2.4.1-cloop_fix.patch Patch12: webkitgtk-2.4.1-ppc64_align.patch @@ -102,7 +99,6 @@ This package contains developer documentation for %{name}. %prep %setup -qn "webkitgtk-%{version}" %patch0 -p1 -b .nspluginwrapper -%patch5 -p1 -b .angle_symbol_table %ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif @@ -241,6 +237,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Jul 08 2014 Kalev Lember - 2.4.4-1 +- Update to 2.4.4 + * Fri Jul 4 2014 Yaakov Selkowitz - 2.4.3-4 - Fix for 64k pages on aarch64 (#1074093, #1113345) From 14e6cfeaaced0fd8df3e276fba334c4efa3caf15 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 22 Jul 2014 20:39:24 +0200 Subject: [PATCH 157/211] Rebuilt for gobject-introspection 1.41.4 --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 0135838..e68d9b1 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -237,6 +237,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Jul 22 2014 Kalev Lember - 2.4.4-2 +- Rebuilt for gobject-introspection 1.41.4 + * Tue Jul 08 2014 Kalev Lember - 2.4.4-1 - Update to 2.4.4 From 9aaa67b26d9df06f325279b84a0f03969ff9be12 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 23 Jul 2014 15:46:17 +0200 Subject: [PATCH 158/211] Fix CLoop on ppc32 and s390 Add geoclue-devel as BR as WK1 needs it --- webkitgtk-2.4.1-cloop_fix.patch | 87 ++++++++++++++++++++++++++++----- webkitgtk3.spec | 13 +++-- 2 files changed, 82 insertions(+), 18 deletions(-) diff --git a/webkitgtk-2.4.1-cloop_fix.patch b/webkitgtk-2.4.1-cloop_fix.patch index c5d9668..2675caf 100644 --- a/webkitgtk-2.4.1-cloop_fix.patch +++ b/webkitgtk-2.4.1-cloop_fix.patch @@ -1,6 +1,6 @@ -diff -up webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h ---- webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix 2014-04-14 08:40:44.000000000 +0200 -+++ webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h 2014-04-30 16:10:49.120156216 +0200 +diff -up webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h +--- webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix 2014-07-23 14:15:45.497658648 +0200 ++++ webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h 2014-07-23 14:16:46.997687779 +0200 @@ -36,7 +36,7 @@ struct ProtoCallFrame { Register calleeValue; Register argCountAndCodeOriginValue; @@ -19,9 +19,9 @@ diff -up webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloo void clearCurrentVPC() { argCountAndCodeOriginValue.tag() = 0; } -diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp ---- webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix 2014-04-30 16:11:18.457540050 +0200 -+++ webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-04-30 16:11:50.944965101 +0200 +diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp +--- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix 2014-07-23 14:16:02.057667404 +0200 ++++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-07-23 14:16:46.997687779 +0200 @@ -1354,7 +1354,7 @@ LLINT_SLOW_PATH_DECL(slow_path_get_from_ CodeBlock* codeBlock = exec->codeBlock(); ConcurrentJITLocker locker(codeBlock->m_lock); @@ -40,9 +40,9 @@ diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fi } } -diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm ---- webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix 2014-04-14 08:40:44.000000000 +0200 -+++ webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-04-30 16:12:35.648549985 +0200 +diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +--- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix 2014-07-23 14:16:13.047672325 +0200 ++++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-07-23 14:18:27.547721786 +0200 @@ -282,7 +282,7 @@ macro doCallToJavaScript(makeCall, doRet storep temp3, CodeBlock+4[cfr, temp1, 8] btinz temp1, .copyHeaderLoop @@ -52,7 +52,68 @@ diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.as subi 1, temp2 loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp3 subi 1, temp3 -@@ -2277,7 +2277,7 @@ macro loadWithStructureCheck(operand, sl +@@ -321,7 +321,7 @@ macro doCallToJavaScript(makeCall, doRet + + .calleeFramePopped: + loadp Callee[cfr], temp3 # VM.topCallFrame +- loadp ScopeChain[cfr], temp4 ++ loadp ScopeChain + PayloadOffset[cfr], temp4 + storep temp4, [temp3] + + doReturn(extraStackSpace) +@@ -598,7 +598,7 @@ end + + + macro branchIfException(label) +- loadp ScopeChain[cfr], t3 ++ loadp ScopeChain + PayloadOffset[cfr], t3 + andp MarkedBlockMask, t3 + loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 + bieq VM::m_exception + TagOffset[t3], EmptyValueTag, .noException +@@ -2039,7 +2039,7 @@ _llint_op_catch: + # the interpreter's throw trampoline (see _llint_throw_trampoline). + # The throwing code must have known that we were throwing to the interpreter, + # and have set VM::targetInterpreterPCForThrow. +- loadp ScopeChain[cfr], t3 ++ loadp ScopeChain + PayloadOffset[cfr], t3 + andp MarkedBlockMask, t3 + loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 + loadp VM::callFrameForThrow[t3], cfr +@@ -2159,7 +2159,7 @@ macro nativeCallTrampoline(executableOff + andp MarkedBlockMask, t3 + loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 + elsif C_LOOP +- loadp ScopeChain[cfr], t3 ++ loadp ScopeChain + PayloadOffset[cfr], t3 + andp MarkedBlockMask, t3 + loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 + storep cfr, VM::topCallFrame[t3] +@@ -2172,7 +2172,7 @@ macro nativeCallTrampoline(executableOff + move t2, cfr + cloopCallNative executableOffsetToFunction[t1] + restoreReturnAddressBeforeReturn(t3) +- loadp ScopeChain[cfr], t3 ++ loadp ScopeChain + PayloadOffset[cfr], t3 + andp MarkedBlockMask, t3 + loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 + else +@@ -2212,7 +2212,7 @@ macro resolveScope() + addi 1, t2 + + .resolveScopeAfterActivationCheck: +- loadp ScopeChain[cfr], t0 ++ loadp ScopeChain + PayloadOffset[cfr], t0 + btiz t2, .resolveScopeLoopEnd + + .resolveScopeLoop: +@@ -2271,13 +2271,13 @@ _llint_op_resolve_scope: + + macro loadWithStructureCheck(operand, slowPath) + loadisFromInstruction(operand, t0) +- loadp [cfr, t0, 8], t0 ++ loadp PayloadOffset[cfr, t0, 8], t0 + loadpFromInstruction(5, t1) + bpneq JSCell::m_structure[t0], t1, slowPath end macro getProperty() @@ -88,9 +149,9 @@ diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.as storei t2, TagOffset[t0, t1, 8] storei t3, PayloadOffset[t0, t1, 8] end -diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm ---- webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix 2014-04-14 08:40:44.000000000 +0200 -+++ webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-04-30 16:10:49.121156229 +0200 +diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm +--- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix 2014-07-23 14:16:19.147675074 +0200 ++++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-07-23 14:16:46.997687779 +0200 @@ -171,7 +171,7 @@ macro doCallToJavaScript(makeCall, doRet storep temp3, CodeBlock[cfr, temp1, 8] btinz temp1, .copyHeaderLoop diff --git a/webkitgtk3.spec b/webkitgtk3.spec index e68d9b1..bbdf15f 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -33,6 +33,7 @@ BuildRequires: flex BuildRequires: fontconfig-devel >= 2.5 BuildRequires: freetype-devel BuildRequires: geoclue2-devel +BuildRequires: geoclue-devel BuildRequires: gettext BuildRequires: gperf BuildRequires: gstreamer1-devel @@ -99,16 +100,14 @@ This package contains developer documentation for %{name}. %prep %setup -qn "webkitgtk-%{version}" %patch0 -p1 -b .nspluginwrapper +%patch11 -p1 -b .cloop_fix %ifarch ppc s390 %patch4 -p1 -b .double2intsPPC32 %endif %ifarch aarch64 %patch10 -p1 -b .aarch64 %endif -%ifarch %{power64} s390x -%patch11 -p1 -b .cloop_fix -%endif -%ifarch %{power64} aarch64 +%ifarch %{power64} aarch64 ppc %patch12 -p1 -b .ppc64_align %endif %ifarch %{power64} @@ -237,6 +236,10 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Wed Jul 23 2014 Tomas Popela - 2.4.4-3 +- Fix CLoop on ppc32 and s390 +- Add geoclue-devel as BR as WK1 needs it + * Tue Jul 22 2014 Kalev Lember - 2.4.4-2 - Rebuilt for gobject-introspection 1.41.4 From 7a8e66fd1cc6918782c573e3d50aefe7bd83f50a Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 23 Jul 2014 16:35:00 +0200 Subject: [PATCH 159/211] Remove geoclue-devel from BR --- webkitgtk3.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index bbdf15f..f56c128 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -33,7 +33,6 @@ BuildRequires: flex BuildRequires: fontconfig-devel >= 2.5 BuildRequires: freetype-devel BuildRequires: geoclue2-devel -BuildRequires: geoclue-devel BuildRequires: gettext BuildRequires: gperf BuildRequires: gstreamer1-devel @@ -236,6 +235,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Wed Jul 23 2014 Tomas Popela - 2.4.4-4 +- Remove geoclue-devel from BR + * Wed Jul 23 2014 Tomas Popela - 2.4.4-3 - Fix CLoop on ppc32 and s390 - Add geoclue-devel as BR as WK1 needs it From 769d0fc82a8b4ad860593ac23f322208b1a3f2e9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 08:26:26 +0000 Subject: [PATCH 160/211] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index f56c128..2f0e97c 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -235,6 +235,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 2.4.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Jul 23 2014 Tomas Popela - 2.4.4-4 - Remove geoclue-devel from BR From a43fec5ce60b36cbb165f22c1b43e12d21119c5e Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 26 Aug 2014 12:58:01 +0200 Subject: [PATCH 161/211] Update to 2.4.5 --- sources | 2 +- ...atch => webkitgtk-2.4.5-cloop_fix_32.patch | 12 ++++---- webkitgtk3.spec | 28 +++++++++---------- 3 files changed, 20 insertions(+), 22 deletions(-) rename webkit-2.1.90-double2intsPPC32.patch => webkitgtk-2.4.5-cloop_fix_32.patch (54%) diff --git a/sources b/sources index f691369..6b4c673 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79edd28d32172abc17a8861622cc274f webkitgtk-2.4.4.tar.xz +c2e1687bb0314a0948fbf78e2d1e931f webkitgtk-2.4.5.tar.xz diff --git a/webkit-2.1.90-double2intsPPC32.patch b/webkitgtk-2.4.5-cloop_fix_32.patch similarity index 54% rename from webkit-2.1.90-double2intsPPC32.patch rename to webkitgtk-2.4.5-cloop_fix_32.patch index b904490..96c53ad 100644 --- a/webkit-2.1.90-double2intsPPC32.patch +++ b/webkitgtk-2.4.5-cloop_fix_32.patch @@ -1,6 +1,6 @@ -diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm ---- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 2013-08-28 21:06:29.000000000 +0200 -+++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-09-12 15:32:34.000000000 +0200 +diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32 webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +--- webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32 2013-08-28 21:06:29.000000000 +0200 ++++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-09-12 15:32:34.000000000 +0200 @@ -1679,7 +1679,7 @@ _llint_op_next_pname: loadi 20[PC], t2 loadi PayloadOffset[cfr, t2, 8], t2 @@ -10,9 +10,9 @@ diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64 addi 1, t0 storei t0, PayloadOffset[cfr, t1, 8] loadi 4[PC], t1 -diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm ---- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 2013-08-28 21:06:29.000000000 +0200 -+++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-09-12 15:32:34.000000000 +0200 +diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm +--- webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 2013-08-28 21:06:29.000000000 +0200 ++++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-09-12 15:32:34.000000000 +0200 @@ -276,13 +276,13 @@ macro assertNotConstant(index) end diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 2f0e97c..2da9831 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.4.4 -Release: 5%{?dist} +Version: 2.4.5 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -17,12 +17,10 @@ URL: http://www.webkitgtk.org/ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch0: webkit-1.1.14-nspluginwrapper.patch -# https://bugs.webkit.org/show_bug.cgi?id=103128 -Patch4: webkit-2.1.90-double2intsPPC32.patch -Patch10: webkitgtk-aarch64.patch -Patch11: webkitgtk-2.4.1-cloop_fix.patch -Patch12: webkitgtk-2.4.1-ppc64_align.patch -Patch13: webkitgtk-2.4.2-ppc64le.patch +Patch1: webkitgtk-aarch64.patch +Patch2: webkitgtk-2.4.1-cloop_fix.patch +Patch3: webkitgtk-2.4.5-cloop_fix_32.patch +Patch4: webkitgtk-2.4.1-ppc64_align.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -99,18 +97,15 @@ This package contains developer documentation for %{name}. %prep %setup -qn "webkitgtk-%{version}" %patch0 -p1 -b .nspluginwrapper -%patch11 -p1 -b .cloop_fix +%patch2 -p1 -b .cloop_fix %ifarch ppc s390 -%patch4 -p1 -b .double2intsPPC32 +%patch3 -p1 -b .cloop_fix_32 %endif %ifarch aarch64 -%patch10 -p1 -b .aarch64 +%patch1 -p1 -b .aarch64 %endif %ifarch %{power64} aarch64 ppc -%patch12 -p1 -b .ppc64_align -%endif -%ifarch %{power64} -%patch13 -p1 -b .ppc64le +%patch4 -p1 -b .ppc64_align %endif %build @@ -235,6 +230,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Aug 26 2014 Tomas Popela - 2.4.5-1 +- Update to 2.4.5 + * Mon Aug 18 2014 Fedora Release Engineering - 2.4.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From b3197c85b6dbeaacff92b0099f8126cdc3cdcc42 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 26 Aug 2014 13:06:55 +0200 Subject: [PATCH 162/211] Remove the PPC64LE patch that was upstreamed --- webkitgtk-2.4.2-ppc64le.patch | 69 ----------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 webkitgtk-2.4.2-ppc64le.patch diff --git a/webkitgtk-2.4.2-ppc64le.patch b/webkitgtk-2.4.2-ppc64le.patch deleted file mode 100644 index 3618d98..0000000 --- a/webkitgtk-2.4.2-ppc64le.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -up webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h.ppc64le webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h ---- webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h.ppc64le 2014-05-14 15:37:26.360159487 +0200 -+++ webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h 2014-05-14 15:38:46.938315499 +0200 -@@ -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) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) - #if defined(_WIN32) -diff -up webkitgtk-2.4.2/Source/WTF/wtf/Platform.h.ppc64le webkitgtk-2.4.2/Source/WTF/wtf/Platform.h ---- webkitgtk-2.4.2/Source/WTF/wtf/Platform.h.ppc64le 2014-05-12 08:03:53.000000000 +0200 -+++ webkitgtk-2.4.2/Source/WTF/wtf/Platform.h 2014-05-14 15:39:08.402622454 +0200 -@@ -101,24 +101,38 @@ - #endif /* MIPS */ - - /* CPU(PPC) - PowerPC 32-bit */ --#if defined(__ppc__) \ -+#if ( defined(__ppc__) \ - || defined(__PPC__) \ - || defined(__powerpc__) \ - || defined(__powerpc) \ - || defined(__POWERPC__) \ - || defined(_M_PPC) \ -- || defined(__PPC) -+ || defined(__PPC)) \ -+ && defined(__BYTE_ORDER__) \ -+ && (__BYTE_ORDER__==__ORDER_BIG_ENDIAN__) - #define WTF_CPU_PPC 1 - #define WTF_CPU_BIG_ENDIAN 1 - #endif - --/* CPU(PPC64) - PowerPC 64-bit */ --#if defined(__ppc64__) \ -- || defined(__PPC64__) -+/* CPU(PPC64) - PowerPC 64-bit Big Endian */ -+#if ( defined(__ppc64__) \ -+ || defined(__PPC64__)) \ -+ && defined(__BYTE_ORDER__) \ -+ && (__BYTE_ORDER__==__ORDER_BIG_ENDIAN__) - #define WTF_CPU_PPC64 1 - #define WTF_CPU_BIG_ENDIAN 1 - #endif - -+/* CPU(PPC64) - PowerPC 64-bit Little Endian */ -+#if ( defined(__ppc64__) \ -+ || defined(__PPC64__) \ -+ || defined(__ppc64le__) \ -+ || defined(__PPC64LE__)) \ -+ && defined(__BYTE_ORDER__) \ -+ && (__BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__) -+#define WTF_CPU_PPC64LE 1 -+#endif -+ - /* CPU(SH4) - SuperH SH-4 */ - #if defined(__SH4__) - #define WTF_CPU_SH4 1 -@@ -641,7 +655,8 @@ - || CPU(ALPHA) \ - || CPU(ARM64) \ - || CPU(S390X) \ -- || CPU(PPC64) -+ || CPU(PPC64) \ -+ || CPU(PPC64LE) - #define WTF_USE_JSVALUE64 1 - #else - #define WTF_USE_JSVALUE32_64 1 From 59380741c1f1cd06715b62487ae0f8955375fe95 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 26 Aug 2014 16:48:20 +0200 Subject: [PATCH 163/211] rebuild for ICU 53.1 --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 2da9831..979b209 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -230,6 +230,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Aug 26 2014 David Tardon - 2.4.5-2 +- rebuild for ICU 53.1 + * Tue Aug 26 2014 Tomas Popela - 2.4.5-1 - Update to 2.4.5 From c688535f1009d139be55d6a1035a092e6ca9b08b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 26 Aug 2014 17:52:14 +0200 Subject: [PATCH 164/211] Disable support for webkit2 API It's now provided by the webkitgtk4 package. --- webkitgtk3.spec | 42 ++++++------------------------------------ 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 979b209..131ef6e 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -65,21 +65,10 @@ GTK+ platform. This package contains WebKitGTK+ for GTK+ 3. -%package -n libwebkit2gtk -Summary: The libwebkit2gtk library -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: geoclue2 - -%description -n libwebkit2gtk -The libwebkit2gtk package contains the libwebkit2gtk library -that is part of %{name}. - %package devel 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 @@ -128,6 +117,7 @@ This package contains developer documentation for %{name}. %configure \ --with-gtk=3.0 \ + --disable-webkit2 \ %ifarch s390 s390x ppc %{power64} aarch64 --disable-jit \ %else @@ -150,16 +140,11 @@ make install DESTDIR=%{buildroot} install -d -m 755 %{buildroot}%{_libexecdir}/%{name} install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name} -install -m 755 Programs/MiniBrowser %{buildroot}%{_libexecdir}/%{name} # Remove lib64 rpaths chrpath --delete %{buildroot}%{_bindir}/jsc-3 chrpath --delete %{buildroot}%{_libdir}/libwebkitgtk-3.0.so -chrpath --delete %{buildroot}%{_libdir}/libwebkit2gtk-3.0.so chrpath --delete %{buildroot}%{_libexecdir}/%{name}/GtkLauncher -chrpath --delete %{buildroot}%{_libexecdir}/%{name}/MiniBrowser -chrpath --delete %{buildroot}%{_libexecdir}/WebKitPluginProcess -chrpath --delete %{buildroot}%{_libexecdir}/WebKitWebProcess # Remove .la files find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete @@ -183,9 +168,6 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%post -n libwebkit2gtk -p /sbin/ldconfig -%postun -n libwebkit2gtk -p /sbin/ldconfig - %files -f WebKitGTK-3.0.lang %doc %{_pkgdocdir}/ @@ -197,39 +179,27 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_libexecdir}/%{name}/GtkLauncher %{_datadir}/webkitgtk-3.0 -%files -n libwebkit2gtk -%{_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 - %files devel %{_bindir}/jsc-3 %{_includedir}/webkitgtk-3.0 %{_libdir}/libwebkitgtk-3.0.so -%{_libdir}/libwebkit2gtk-3.0.so %{_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 %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/webkitgtk -%{_datadir}/gtk-doc/html/webkit2gtk %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Aug 26 2014 Kalev Lember - 2.4.5-3 +- Disable support for webkit2 API which is now provided by the webkitgtk4 + package + * Tue Aug 26 2014 David Tardon - 2.4.5-2 - rebuild for ICU 53.1 From 7bba4f66509e88c11de796f8c27ccaa7ce53dc76 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 2 Sep 2014 11:44:13 +0200 Subject: [PATCH 165/211] Rebase the aarch64 patch --- webkitgtk-aarch64.patch | 38 ++++++++++++++++++++------------------ webkitgtk3.spec | 9 +++++---- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/webkitgtk-aarch64.patch b/webkitgtk-aarch64.patch index fe54daa..7272bc1 100644 --- a/webkitgtk-aarch64.patch +++ b/webkitgtk-aarch64.patch @@ -1,6 +1,19 @@ ---- 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 @@ +diff -up webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h.aarch64 webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h +--- webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h.aarch64 2014-09-02 11:39:15.782812173 +0200 ++++ webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h 2014-09-02 11:41:23.022637099 +0200 +@@ -49,7 +49,7 @@ + defined(__ARMEL__) || \ + defined(_MIPS_ARCH_MIPS32R2) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) ++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || 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 -up webkitgtk-2.4.5/Source/WTF/wtf/Platform.h.aarch64 webkitgtk-2.4.5/Source/WTF/wtf/Platform.h +--- webkitgtk-2.4.5/Source/WTF/wtf/Platform.h.aarch64 2014-08-25 14:50:32.000000000 +0200 ++++ webkitgtk-2.4.5/Source/WTF/wtf/Platform.h 2014-09-02 11:40:40.925033307 +0200 +@@ -331,6 +331,14 @@ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 #endif @@ -15,24 +28,13 @@ /* ==== 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) \ +@@ -656,7 +664,8 @@ || CPU(ARM64) \ || CPU(S390X) \ -- || CPU(PPC64) -+ || CPU(PPC64) \ + || CPU(PPC64) \ +- || CPU(PPC64LE) ++ || CPU(PPC64LE) \ + || 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 131ef6e..006dd4f 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -86,13 +86,11 @@ This package contains developer documentation for %{name}. %prep %setup -qn "webkitgtk-%{version}" %patch0 -p1 -b .nspluginwrapper +%patch1 -p1 -b .aarch64 %patch2 -p1 -b .cloop_fix %ifarch ppc s390 %patch3 -p1 -b .cloop_fix_32 %endif -%ifarch aarch64 -%patch1 -p1 -b .aarch64 -%endif %ifarch %{power64} aarch64 ppc %patch4 -p1 -b .ppc64_align %endif @@ -196,6 +194,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Sep 02 2014 Tomas Popela - 2.4.5-4 +- Rebase the aarch64 patch + * Tue Aug 26 2014 Kalev Lember - 2.4.5-3 - Disable support for webkit2 API which is now provided by the webkitgtk4 package From 21a1a932ab5910de161e14eb55e4a962587e1fc3 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 29 Sep 2014 11:45:06 +0200 Subject: [PATCH 166/211] Update to 2.4.6 --- sources | 2 +- webkitgtk3.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 6b4c673..6f48645 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c2e1687bb0314a0948fbf78e2d1e931f webkitgtk-2.4.5.tar.xz +b0d019777754bb5779de8b9ad1dd6bfe webkitgtk-2.4.6.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 006dd4f..8e042f0 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.4.5 -Release: 4%{?dist} +Version: 2.4.6 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -194,6 +194,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Mon Sep 29 2014 Tomas Popela - 2.4.6-1 +- Update to 2.4.6 + * Tue Sep 02 2014 Tomas Popela - 2.4.5-4 - Rebase the aarch64 patch From 85c10ccf6da32fa0de7dde7d230448b3baa227fc Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 29 Sep 2014 12:40:16 +0200 Subject: [PATCH 167/211] Run make with -j1 to let it successfully compile in brew --- webkitgtk3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 8e042f0..c8427a6 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -131,7 +131,10 @@ mkdir -p DerivedSources/webkitdom/ mkdir -p DerivedSources/InjectedBundle mkdir -p DerivedSources/Platform -make %{_smp_mflags} V=1 +# Disable the parallel compilation as it fails to compile in brew. +# https://bugs.webkit.org/show_bug.cgi?id=34846 +# make %{_smp_mflags} V=1 +make -j1 V=1 %install make install DESTDIR=%{buildroot} @@ -196,6 +199,7 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %changelog * Mon Sep 29 2014 Tomas Popela - 2.4.6-1 - Update to 2.4.6 +- Run make with -j1 to let it successfully compile in brew * Tue Sep 02 2014 Tomas Popela - 2.4.5-4 - Rebase the aarch64 patch From 8b06b4157bd0351c11ea844019a8caeff2bad43a Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 21 Oct 2014 10:18:42 +0200 Subject: [PATCH 168/211] Disable the SSLv3 to address the POODLE vulnerability --- webkitgtk-2.4.6-poodle.patch | 47 ++++++++++++++++++++++++++++++++++++ webkitgtk3.spec | 8 +++++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.4.6-poodle.patch diff --git a/webkitgtk-2.4.6-poodle.patch b/webkitgtk-2.4.6-poodle.patch new file mode 100644 index 0000000..2404f6f --- /dev/null +++ b/webkitgtk-2.4.6-poodle.patch @@ -0,0 +1,47 @@ +diff -up webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp.poodle webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp +--- webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp.poodle 2014-10-21 10:08:32.851222903 +0200 ++++ webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp 2014-10-21 10:08:31.234199110 +0200 +@@ -26,7 +26,19 @@ + + #include "WebProcessMainGtk.h" + ++#include ++ + int main(int argc, char** argv) + { ++ // Disable SSLv3 very early because it is practically impossible to safely ++ // use setenv() when multiple threads are running, as another thread calling ++ // getenv() could cause a crash, and many functions use getenv() internally. ++ // This workaround will stop working if glib-networking switches away from ++ // GnuTLS or simply stops parsing this variable. We intentionally do not ++ // overwrite this priority string if it's already set by the user. ++ // Keep this in sync with NetworkMainUnix.cpp. ++ // https://bugzilla.gnome.org/show_bug.cgi?id=738633 ++ setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", 0); ++ + return WebKit::WebProcessMainGtk(argc, argv); + } +diff -up webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp.poodle webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp +--- webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp.poodle 2014-10-21 10:03:39.622908372 +0200 ++++ webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp 2014-10-21 10:07:38.017416084 +0200 +@@ -30,8 +30,20 @@ + + #include "NetworkProcessMainUnix.h" + ++#include ++ + int main(int argc, char** argv) + { ++ // Disable SSLv3 very early because it is practically impossible to safely ++ // use setenv() when multiple threads are running, as another thread calling ++ // getenv() could cause a crash, and many functions use getenv() internally. ++ // This workaround will stop working if glib-networking switches away from ++ // GnuTLS or simply stops parsing this variable. We intentionally do not ++ // overwrite this priority string if it's already set by the user. ++ // Keep this in sync with MainGtk.cpp. ++ // https://bugzilla.gnome.org/show_bug.cgi?id=738633 ++ setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", 0); ++ + return WebKit::NetworkProcessMain(argc, argv); + } + diff --git a/webkitgtk3.spec b/webkitgtk3.spec index c8427a6..bbfab0c 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -7,7 +7,7 @@ Name: webkitgtk3 Version: 2.4.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -21,6 +21,8 @@ Patch1: webkitgtk-aarch64.patch Patch2: webkitgtk-2.4.1-cloop_fix.patch Patch3: webkitgtk-2.4.5-cloop_fix_32.patch Patch4: webkitgtk-2.4.1-ppc64_align.patch +# https://bugs.webkit.org/show_bug.cgi?id=137859 +Patch5: webkitgtk-2.4.6-poodle.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -88,6 +90,7 @@ This package contains developer documentation for %{name}. %patch0 -p1 -b .nspluginwrapper %patch1 -p1 -b .aarch64 %patch2 -p1 -b .cloop_fix +%patch5 -p1 -b .poodle %ifarch ppc s390 %patch3 -p1 -b .cloop_fix_32 %endif @@ -197,6 +200,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Oct 21 2014 Tomas Popela - 2.4.6-2 +- Disable the SSLv3 to address the POODLE vulnerability + * Mon Sep 29 2014 Tomas Popela - 2.4.6-1 - Update to 2.4.6 - Run make with -j1 to let it successfully compile in brew From 40a90579ddcede69b822f53c3e66c7545d6516e8 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 22 Oct 2014 14:50:23 +0200 Subject: [PATCH 169/211] Update to 2.4.7 --- sources | 2 +- webkitgtk-2.4.6-poodle.patch | 47 ------------------------------------ webkitgtk3.spec | 10 ++++---- 3 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 webkitgtk-2.4.6-poodle.patch diff --git a/sources b/sources index 6f48645..3390423 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0d019777754bb5779de8b9ad1dd6bfe webkitgtk-2.4.6.tar.xz +e1a10b4730f501980e3681db9b0e5d25 webkitgtk-2.4.7.tar.xz diff --git a/webkitgtk-2.4.6-poodle.patch b/webkitgtk-2.4.6-poodle.patch deleted file mode 100644 index 2404f6f..0000000 --- a/webkitgtk-2.4.6-poodle.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp.poodle webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp ---- webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp.poodle 2014-10-21 10:08:32.851222903 +0200 -+++ webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp 2014-10-21 10:08:31.234199110 +0200 -@@ -26,7 +26,19 @@ - - #include "WebProcessMainGtk.h" - -+#include -+ - int main(int argc, char** argv) - { -+ // Disable SSLv3 very early because it is practically impossible to safely -+ // use setenv() when multiple threads are running, as another thread calling -+ // getenv() could cause a crash, and many functions use getenv() internally. -+ // This workaround will stop working if glib-networking switches away from -+ // GnuTLS or simply stops parsing this variable. We intentionally do not -+ // overwrite this priority string if it's already set by the user. -+ // Keep this in sync with NetworkMainUnix.cpp. -+ // https://bugzilla.gnome.org/show_bug.cgi?id=738633 -+ setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", 0); -+ - return WebKit::WebProcessMainGtk(argc, argv); - } -diff -up webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp.poodle webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp ---- webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp.poodle 2014-10-21 10:03:39.622908372 +0200 -+++ webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp 2014-10-21 10:07:38.017416084 +0200 -@@ -30,8 +30,20 @@ - - #include "NetworkProcessMainUnix.h" - -+#include -+ - int main(int argc, char** argv) - { -+ // Disable SSLv3 very early because it is practically impossible to safely -+ // use setenv() when multiple threads are running, as another thread calling -+ // getenv() could cause a crash, and many functions use getenv() internally. -+ // This workaround will stop working if glib-networking switches away from -+ // GnuTLS or simply stops parsing this variable. We intentionally do not -+ // overwrite this priority string if it's already set by the user. -+ // Keep this in sync with MainGtk.cpp. -+ // https://bugzilla.gnome.org/show_bug.cgi?id=738633 -+ setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", 0); -+ - return WebKit::NetworkProcessMain(argc, argv); - } - diff --git a/webkitgtk3.spec b/webkitgtk3.spec index bbfab0c..d4fb60f 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.4.6 -Release: 2%{?dist} +Version: 2.4.7 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -21,8 +21,6 @@ Patch1: webkitgtk-aarch64.patch Patch2: webkitgtk-2.4.1-cloop_fix.patch Patch3: webkitgtk-2.4.5-cloop_fix_32.patch Patch4: webkitgtk-2.4.1-ppc64_align.patch -# https://bugs.webkit.org/show_bug.cgi?id=137859 -Patch5: webkitgtk-2.4.6-poodle.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -90,7 +88,6 @@ This package contains developer documentation for %{name}. %patch0 -p1 -b .nspluginwrapper %patch1 -p1 -b .aarch64 %patch2 -p1 -b .cloop_fix -%patch5 -p1 -b .poodle %ifarch ppc s390 %patch3 -p1 -b .cloop_fix_32 %endif @@ -200,6 +197,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Wed Oct 22 2014 Tomas Popela - 2.4.7-1 +- Update to 2.4.7 + * Tue Oct 21 2014 Tomas Popela - 2.4.6-2 - Disable the SSLv3 to address the POODLE vulnerability From d58dd95b97504082b84c02bdae4d896c7a1fc243 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 29 Oct 2014 17:07:42 +0000 Subject: [PATCH 170/211] trivial: Fix rebuild on non-Fedora --- webkitgtk3.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index d4fb60f..a6b94de 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -1,3 +1,6 @@ +# Fix rebuild on non-Fedora +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + ## NOTE: Lots of files in various subdirectories have the same name (such as ## "LICENSE") so this short macro allows us to distinguish them by using their ## directory names (from the source tree) as prefixes for the files. From 71df8dc785f699c16702d8ee8e095d9357d222b4 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 7 Jan 2015 13:34:21 +0100 Subject: [PATCH 171/211] Update to 2.4.8 --- sources | 2 +- webkitgtk3.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 3390423..a69c671 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1a10b4730f501980e3681db9b0e5d25 webkitgtk-2.4.7.tar.xz +bcdcef8e1ba28dbd5bb05f86c79f76b8 webkitgtk-2.4.8.tar.xz diff --git a/webkitgtk3.spec b/webkitgtk3.spec index a6b94de..a1eb28a 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -9,7 +9,7 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.4.7 +Version: 2.4.8 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -200,6 +200,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Wed Jan 07 2015 Tomas Popela - 2.4.8-1 +- Update to 2.4.8 + * Wed Oct 22 2014 Tomas Popela - 2.4.7-1 - Update to 2.4.7 From 95bd1465b593c200d6560c4c9c1b02a250a4aefc Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 8 Jan 2015 11:41:27 +0100 Subject: [PATCH 172/211] Fix the build when the WebKit2 is disabled --- webkitgtk-2.4.8-plugin_none.patch | 27 +++++++++++++++++++++++++++ webkitgtk3.spec | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 webkitgtk-2.4.8-plugin_none.patch diff --git a/webkitgtk-2.4.8-plugin_none.patch b/webkitgtk-2.4.8-plugin_none.patch new file mode 100644 index 0000000..19ae387 --- /dev/null +++ b/webkitgtk-2.4.8-plugin_none.patch @@ -0,0 +1,27 @@ +diff -up webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am.plugin_none webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am +--- webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am.plugin_none 2015-01-08 11:08:03.261853581 +0100 ++++ webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am 2015-01-08 11:08:53.650619552 +0100 +@@ -6254,9 +6254,11 @@ endif # END USE_GLX + endif # END TARGET_X11 + + if TARGET_WAYLAND ++if ENABLE_WEBKIT2 + webcore_sources += \ + Source/WebCore/plugins/PluginPackageNone.cpp \ + Source/WebCore/plugins/PluginViewNone.cpp ++endif # END ENABLE_WEBKIT2 + endif # END TARGET_WAYLAND + + if TARGET_X11_OR_WAYLAND +@@ -6305,9 +6307,11 @@ webcoregtk_sources += \ + endif # END TARGET_WIN32 + + if TARGET_QUARTZ ++if ENABLE_WEBKIT2 + webcore_sources += \ + Source/WebCore/plugins/PluginPackageNone.cpp \ + Source/WebCore/plugins/PluginViewNone.cpp ++endif # END ENABLE_WEBKIT2 + platformgtk_sources += \ + Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \ + Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp diff --git a/webkitgtk3.spec b/webkitgtk3.spec index a1eb28a..88e117c 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -24,6 +24,7 @@ Patch1: webkitgtk-aarch64.patch Patch2: webkitgtk-2.4.1-cloop_fix.patch Patch3: webkitgtk-2.4.5-cloop_fix_32.patch Patch4: webkitgtk-2.4.1-ppc64_align.patch +Patch5: webkitgtk-2.4.8-plugin_none.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -91,6 +92,7 @@ This package contains developer documentation for %{name}. %patch0 -p1 -b .nspluginwrapper %patch1 -p1 -b .aarch64 %patch2 -p1 -b .cloop_fix +%patch5 -p1 -b .plugin_none %ifarch ppc s390 %patch3 -p1 -b .cloop_fix_32 %endif From 0582279e2d3a58da73105ae769cc3e46908ad597 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 8 Jan 2015 12:15:29 +0100 Subject: [PATCH 173/211] Add automake as BR --- webkitgtk3.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 88e117c..9a1cb49 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -24,6 +24,7 @@ Patch1: webkitgtk-aarch64.patch Patch2: webkitgtk-2.4.1-cloop_fix.patch Patch3: webkitgtk-2.4.5-cloop_fix_32.patch Patch4: webkitgtk-2.4.1-ppc64_align.patch +# https://bugs.webkit.org/show_bug.cgi?id=140241 Patch5: webkitgtk-2.4.8-plugin_none.patch BuildRequires: at-spi2-core-devel @@ -58,6 +59,9 @@ BuildRequires: gobject-introspection-devel >= 1.32.0 BuildRequires: perl-Switch BuildRequires: ruby BuildRequires: mesa-libGL-devel +# Remove when 2.4.9 will be released +# Needed for https://bugs.webkit.org/show_bug.cgi?id=140241 +BuildRequires: automake %ifarch ppc BuildRequires: libatomic %endif From ea88a33878c8b6a0c29269bf97173f8200a8084a Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 8 Jan 2015 13:47:03 +0100 Subject: [PATCH 174/211] There is automake-1.15 in rawhide so we need to run autoreconf --- webkitgtk3.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 9a1cb49..8827050 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -59,9 +59,6 @@ BuildRequires: gobject-introspection-devel >= 1.32.0 BuildRequires: perl-Switch BuildRequires: ruby BuildRequires: mesa-libGL-devel -# Remove when 2.4.9 will be released -# Needed for https://bugs.webkit.org/show_bug.cgi?id=140241 -BuildRequires: automake %ifarch ppc BuildRequires: libatomic %endif @@ -104,6 +101,10 @@ This package contains developer documentation for %{name}. %patch4 -p1 -b .ppc64_align %endif +# Remove when 2.4.9 will be released +# Needed for https://bugs.webkit.org/show_bug.cgi?id=140241 +autoreconf -v + %build # Use linker flags to reduce memory consumption %global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads From 557c6dfe241d36750db4b12ef219951dec483160 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 26 Jan 2015 17:15:30 +0100 Subject: [PATCH 175/211] rebuild for ICU 54.1 --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 8827050..2416773 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -207,6 +207,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Mon Jan 26 2015 David Tardon - 2.4.8-2 +- rebuild for ICU 54.1 + * Wed Jan 07 2015 Tomas Popela - 2.4.8-1 - Update to 2.4.8 From 632ad9bf9dd65bd86a2eaab7ab45be9b93abc141 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 18 Feb 2015 18:09:35 +0100 Subject: [PATCH 176/211] Add support for gcc 5.0 Let the package compile with latest glib --- webkitgtk-2.4.8-gcc5.patch | 33 ++++ webkitgtk-2.4.8-gmutexlocker.patch | 281 +++++++++++++++++++++++++++++ webkitgtk3.spec | 13 +- 3 files changed, 326 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.4.8-gcc5.patch create mode 100644 webkitgtk-2.4.8-gmutexlocker.patch diff --git a/webkitgtk-2.4.8-gcc5.patch b/webkitgtk-2.4.8-gcc5.patch new file mode 100644 index 0000000..73f6855 --- /dev/null +++ b/webkitgtk-2.4.8-gcc5.patch @@ -0,0 +1,33 @@ +diff -up webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4.gcc5 webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4 +--- webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4.gcc5 2015-01-07 10:45:43.000000000 +0100 ++++ webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4 2015-02-18 13:09:57.359888184 +0100 +@@ -87,12 +87,12 @@ AC_SYS_LARGEFILE + c_compiler="unknown" + AC_LANG_PUSH([C]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) ++#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) + #error Not a supported GCC compiler + #endif + ])], [c_compiler="gcc"], []) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3) ++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3))))) + #error Not a supported Clang compiler + #endif + ])], [c_compiler="clang"], []) +@@ -106,12 +106,12 @@ fi + cxx_compiler="unknown" + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) ++#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) + #error Not a supported G++ compiler + #endif + ])], [cxx_compiler="g++"], []) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3) ++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3))))) + #error Not a supported Clang++ compiler + #endif + ])], [cxx_compiler="clang++"], []) diff --git a/webkitgtk-2.4.8-gmutexlocker.patch b/webkitgtk-2.4.8-gmutexlocker.patch new file mode 100644 index 0000000..226da3d --- /dev/null +++ b/webkitgtk-2.4.8-gmutexlocker.patch @@ -0,0 +1,281 @@ +diff -up webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.gmutexlocker webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp +--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.gmutexlocker 2015-02-18 15:40:21.851816374 +0100 ++++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-02-18 15:45:58.560092191 +0100 +@@ -316,7 +316,7 @@ void MediaPlayerPrivateGStreamerBase::mu + #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS) + PassRefPtr MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper) + { +- GMutexLocker lock(m_bufferMutex); ++ WebCore::GMutexLocker lock(m_bufferMutex); + if (!m_buffer) + return nullptr; + +@@ -366,7 +366,7 @@ void MediaPlayerPrivateGStreamerBase::tr + g_return_if_fail(GST_IS_BUFFER(buffer)); + + { +- GMutexLocker lock(m_bufferMutex); ++ WebCore::GMutexLocker lock(m_bufferMutex); + gst_buffer_replace(&m_buffer, buffer); + } + +@@ -398,7 +398,7 @@ void MediaPlayerPrivateGStreamerBase::pa + if (!m_player->visible()) + return; + +- GMutexLocker lock(m_bufferMutex); ++ WebCore::GMutexLocker lock(m_bufferMutex); + if (!m_buffer) + return; + +diff -up webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp.gmutexlocker webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp +diff -up webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.gmutexlocker webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp +--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.gmutexlocker 2015-02-18 15:16:11.995228731 +0100 ++++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-02-18 15:45:42.686843477 +0100 +@@ -118,7 +118,7 @@ static gboolean webkitVideoSinkTimeoutCa + WebKitVideoSink* sink = reinterpret_cast(data); + WebKitVideoSinkPrivate* priv = sink->priv; + +- GMutexLocker lock(priv->bufferMutex); ++ WebCore::GMutexLocker lock(priv->bufferMutex); + GstBuffer* buffer = priv->buffer; + priv->buffer = 0; + priv->timeoutId = 0; +@@ -140,7 +140,7 @@ static GstFlowReturn webkitVideoSinkRend + WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink); + WebKitVideoSinkPrivate* priv = sink->priv; + +- GMutexLocker lock(priv->bufferMutex); ++ WebCore::GMutexLocker lock(priv->bufferMutex); + + if (priv->unlocked) + return GST_FLOW_OK; +@@ -279,7 +279,7 @@ static void webkitVideoSinkGetProperty(G + + static void unlockBufferMutex(WebKitVideoSinkPrivate* priv) + { +- GMutexLocker lock(priv->bufferMutex); ++ WebCore::GMutexLocker lock(priv->bufferMutex); + + if (priv->buffer) { + gst_buffer_unref(priv->buffer); +@@ -305,7 +305,7 @@ static gboolean webkitVideoSinkUnlockSto + WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv; + + { +- GMutexLocker lock(priv->bufferMutex); ++ WebCore::GMutexLocker lock(priv->bufferMutex); + priv->unlocked = false; + } + +@@ -330,7 +330,7 @@ static gboolean webkitVideoSinkStart(Gst + { + WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv; + +- GMutexLocker lock(priv->bufferMutex); ++ WebCore::GMutexLocker lock(priv->bufferMutex); + priv->unlocked = false; + return TRUE; + } +diff -up webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.gmutexlocker webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp +--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.gmutexlocker 2015-02-18 15:16:40.954678407 +0100 ++++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-02-18 15:45:19.567481225 +0100 +@@ -346,7 +346,7 @@ static void webKitWebSrcSetProperty(GObj + + switch (propID) { + case PROP_IRADIO_MODE: { +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + priv->iradioMode = g_value_get_boolean(value); + break; + } +@@ -364,7 +364,7 @@ static void webKitWebSrcGetProperty(GObj + WebKitWebSrc* src = WEBKIT_WEB_SRC(object); + WebKitWebSrcPrivate* priv = src->priv; + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + switch (propID) { + case PROP_IRADIO_MODE: + g_value_set_boolean(value, priv->iradioMode); +@@ -417,7 +417,7 @@ static gboolean webKitWebSrcStop(WebKitW + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + bool seeking = priv->seekID; + +@@ -476,7 +476,7 @@ static gboolean webKitWebSrcStart(WebKit + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + priv->startID = 0; + priv->corsAccessCheck = CORSNoCheck; +@@ -573,7 +573,7 @@ static GstStateChangeReturn webKitWebSrc + return ret; + } + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + switch (transition) { + case GST_STATE_CHANGE_READY_TO_PAUSED: + GST_DEBUG_OBJECT(src, "READY->PAUSED"); +@@ -604,7 +604,7 @@ static gboolean webKitWebSrcQueryWithPar + gst_query_parse_duration(query, &format, NULL); + + GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format)); +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (format == GST_FORMAT_BYTES && src->priv->size > 0) { + gst_query_set_duration(query, format, src->priv->size); + result = TRUE; +@@ -612,7 +612,7 @@ static gboolean webKitWebSrcQueryWithPar + break; + } + case GST_QUERY_URI: { +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + gst_query_set_uri(query, src->priv->uri); + result = TRUE; + break; +@@ -653,7 +653,7 @@ static gchar* webKitWebSrcGetUri(GstURIH + WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); + gchar* ret; + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + ret = g_strdup(src->priv->uri); + return ret; + } +@@ -668,7 +668,7 @@ static gboolean webKitWebSrcSetUri(GstUR + return FALSE; + } + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + g_free(priv->uri); + priv->uri = 0; +@@ -704,7 +704,7 @@ static gboolean webKitWebSrcNeedDataMain + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + // already stopped + if (!priv->needDataID) + return FALSE; +@@ -725,7 +725,7 @@ static void webKitWebSrcNeedDataCb(GstAp + + GST_DEBUG_OBJECT(src, "Need more data: %u", length); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (priv->needDataID || !priv->paused) { + return; + } +@@ -739,7 +739,7 @@ static gboolean webKitWebSrcEnoughDataMa + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + // already stopped + if (!priv->enoughDataID) + return FALSE; +@@ -760,7 +760,7 @@ static void webKitWebSrcEnoughDataCb(Gst + + GST_DEBUG_OBJECT(src, "Have enough data"); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (priv->enoughDataID || priv->paused) { + return; + } +@@ -774,7 +774,7 @@ static gboolean webKitWebSrcSeekMainCb(W + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + // already stopped + if (!priv->seekID) + return FALSE; +@@ -792,7 +792,7 @@ static gboolean webKitWebSrcSeekDataCb(G + WebKitWebSrcPrivate* priv = src->priv; + + GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset); +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (offset == priv->offset && priv->requestedOffset == priv->offset) + return TRUE; + +@@ -811,7 +811,7 @@ static gboolean webKitWebSrcSeekDataCb(G + void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player) + { + ASSERT(player); +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + src->priv->player = player; + } + +@@ -841,7 +841,7 @@ char* StreamingClient::createReadBuffer( + + mapGstBuffer(buffer); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + priv->buffer = adoptGRef(buffer); + locker.unlock(); + +@@ -867,7 +867,7 @@ void StreamingClient::handleResponseRece + return; + } + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + priv->corsAccessCheck = corsAccessCheck; + +@@ -966,7 +966,7 @@ void StreamingClient::handleDataReceived + WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src); + WebKitWebSrcPrivate* priv = src->priv; + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast(gst_buffer_get_size(priv->buffer.get())) : length); + +@@ -1035,7 +1035,7 @@ void StreamingClient::handleNotifyFinish + + GST_DEBUG_OBJECT(src, "Have EOS"); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (!priv->seekID) { + locker.unlock(); + gst_app_src_end_of_stream(priv->appsrc); +@@ -1194,7 +1194,7 @@ void ResourceHandleStreamingClient::wasB + + GST_ERROR_OBJECT(src, "Request was blocked"); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + uri.reset(g_strdup(src->priv->uri)); + locker.unlock(); + +@@ -1208,7 +1208,7 @@ void ResourceHandleStreamingClient::cann + + GST_ERROR_OBJECT(src, "Cannot show URL"); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + uri.reset(g_strdup(src->priv->uri)); + locker.unlock(); + +diff -up webkitgtk-2.4.8/Source/WTF/wtf/gobject/GMutexLocker.h.gmutexlocker webkitgtk-2.4.8/Source/WTF/wtf/gobject/GMutexLocker.h diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 2416773..2539bf3 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -26,6 +26,10 @@ Patch3: webkitgtk-2.4.5-cloop_fix_32.patch Patch4: webkitgtk-2.4.1-ppc64_align.patch # https://bugs.webkit.org/show_bug.cgi?id=140241 Patch5: webkitgtk-2.4.8-plugin_none.patch +# https://bugs.webkit.org/show_bug.cgi?id=126324 +Patch6: webkitgtk-2.4.8-gcc5.patch +# https://bugs.webkit.org/show_bug.cgi?id=141381 +Patch7: webkitgtk-2.4.8-gmutexlocker.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -94,6 +98,8 @@ This package contains developer documentation for %{name}. %patch1 -p1 -b .aarch64 %patch2 -p1 -b .cloop_fix %patch5 -p1 -b .plugin_none +%patch6 -p1 -b .gcc5 +%patch7 -p1 -b .gmutex_locker %ifarch ppc s390 %patch3 -p1 -b .cloop_fix_32 %endif @@ -103,6 +109,7 @@ This package contains developer documentation for %{name}. # Remove when 2.4.9 will be released # Needed for https://bugs.webkit.org/show_bug.cgi?id=140241 +# Regenerate configure to pick up the gcc 5.0 changes autoreconf -v %build @@ -207,6 +214,10 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Wed Feb 18 2015 Tomas Popela - 2.4.8-3 +- Add support for gcc 5.0 +- Let the package compile with latest glib + * Mon Jan 26 2015 David Tardon - 2.4.8-2 - rebuild for ICU 54.1 From cff315d44b062c19a4952071a5186571024c30e0 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 21 Feb 2015 22:28:10 +0100 Subject: [PATCH 177/211] Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code --- webkitgtk3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 2539bf3..e60b0e1 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -214,6 +214,10 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Sat Feb 21 2015 Till Maas - 2.4.8-4 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + * Wed Feb 18 2015 Tomas Popela - 2.4.8-3 - Add support for gcc 5.0 - Let the package compile with latest glib From 2fcf16f8ece082ff3c447d5c382bd88c20c565c7 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Fri, 27 Feb 2015 14:45:27 -0600 Subject: [PATCH 178/211] Add Fedora branding to the user agent --- webkitgtk-2.4.8-user-agent.patch | 27 +++++++++++++++++++++++++++ webkitgtk3.spec | 12 +++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.4.8-user-agent.patch diff --git a/webkitgtk-2.4.8-user-agent.patch b/webkitgtk-2.4.8-user-agent.patch new file mode 100644 index 0000000..84b5117 --- /dev/null +++ b/webkitgtk-2.4.8-user-agent.patch @@ -0,0 +1,27 @@ +From 050232bc122d6785fea01d39121c2f93e8dd16f1 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Thu, 26 Feb 2015 16:06:36 -0600 +Subject: [PATCH] Allow branding the user agent + +--- + Source/WebCore/platform/gtk/UserAgentGtk.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Source/WebCore/platform/gtk/UserAgentGtk.cpp b/Source/WebCore/platform/gtk/UserAgentGtk.cpp +index 91641dc..727fbaf 100644 +--- a/Source/WebCore/platform/gtk/UserAgentGtk.cpp ++++ b/Source/WebCore/platform/gtk/UserAgentGtk.cpp +@@ -84,7 +84,9 @@ static const char* cpuDescriptionForUAString() + + static const char* platformForUAString() + { +-#if PLATFORM(X11) ++#if defined USER_AGENT_GTK_DISTRIBUTOR_NAME ++ return USER_AGENT_GTK_DISTRIBUTOR_NAME; ++#elif PLATFORM(X11) + return "X11"; + #elif OS(WINDOWS) + return ""; +-- +2.1.0 + diff --git a/webkitgtk3.spec b/webkitgtk3.spec index e60b0e1..46a2782 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -30,6 +30,8 @@ Patch5: webkitgtk-2.4.8-plugin_none.patch Patch6: webkitgtk-2.4.8-gcc5.patch # https://bugs.webkit.org/show_bug.cgi?id=141381 Patch7: webkitgtk-2.4.8-gmutexlocker.patch +# https://bugs.webkit.org/show_bug.cgi?id=142074 +Patch8: webkitgtk-2.4.8-user-agent.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -100,6 +102,7 @@ This package contains developer documentation for %{name}. %patch5 -p1 -b .plugin_none %patch6 -p1 -b .gcc5 %patch7 -p1 -b .gmutex_locker +%patch8 -p1 -b .user_agent %ifarch ppc s390 %patch3 -p1 -b .cloop_fix_32 %endif @@ -130,6 +133,10 @@ autoreconf -v %global optflags %{optflags} -DENABLE_YARR_JIT=0 %endif +%if 0%{?fedora} +%global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"Fedora\\"\' +%endif + %configure \ --with-gtk=3.0 \ --disable-webkit2 \ @@ -214,6 +221,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Fri Feb 27 2015 Michael Catanzaro - 2.4.8-5 +- Add Fedora branding to the user agent + * Sat Feb 21 2015 Till Maas - 2.4.8-4 - Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code From 9ec7d79f874d10c7efe3f568814952f9216f3355 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 10 Mar 2015 07:27:49 +0100 Subject: [PATCH 179/211] Backport fix for use-after-free when destroying frame --- webkitgtk-2.4.8-g_object_destroyed.patch | 23 +++++++++++++++++++++++ webkitgtk3.spec | 8 +++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.4.8-g_object_destroyed.patch diff --git a/webkitgtk-2.4.8-g_object_destroyed.patch b/webkitgtk-2.4.8-g_object_destroyed.patch new file mode 100644 index 0000000..479f1de --- /dev/null +++ b/webkitgtk-2.4.8-g_object_destroyed.patch @@ -0,0 +1,23 @@ +diff --git a/Source/WebCore/bindings/gobject/GObjectEventListener.cpp b/Source/WebCore/bindings/gobject/GObjectEventListener.cpp +index 76cf279..9d1b881 100644 +--- a/Source/WebCore/bindings/gobject/GObjectEventListener.cpp ++++ b/Source/WebCore/bindings/gobject/GObjectEventListener.cpp +@@ -52,12 +52,13 @@ void GObjectEventListener::gobjectDestroyed() + { + ASSERT(m_coreTarget); + +- // We must set m_coreTarget to null, because removeEventListener +- // may call the destructor as a side effect and we must be in the +- // proper state to prevent g_object_weak_unref. +- EventTarget* target = m_coreTarget; ++ // Protect 'this' class in case the 'm_coreTarget' holds the last reference, ++ // which may cause, inside removeEventListener(), free of this object ++ // and later use-after-free with the m_handler = 0; assignment. ++ RefPtr protect(this); ++ ++ m_coreTarget->removeEventListener(m_domEventName.data(), this, m_capture); + m_coreTarget = 0; +- target->removeEventListener(m_domEventName.data(), this, m_capture); + m_handler = 0; + } + diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 46a2782..c96b968 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -32,6 +32,8 @@ Patch6: webkitgtk-2.4.8-gcc5.patch Patch7: webkitgtk-2.4.8-gmutexlocker.patch # https://bugs.webkit.org/show_bug.cgi?id=142074 Patch8: webkitgtk-2.4.8-user-agent.patch +#https://bugs.webkit.org/show_bug.cgi?id=127474 +Patch9: webkitgtk-2.4.8-g_object_destroyed.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -103,6 +105,7 @@ This package contains developer documentation for %{name}. %patch6 -p1 -b .gcc5 %patch7 -p1 -b .gmutex_locker %patch8 -p1 -b .user_agent +%patch9 -p1 -b .g_object_destroyed %ifarch ppc s390 %patch3 -p1 -b .cloop_fix_32 %endif @@ -221,6 +224,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Mar 10 2015 Tomas Popela - 2.4.8-6 +- Backport fix for use-after-free when destroying frame + * Fri Feb 27 2015 Michael Catanzaro - 2.4.8-5 - Add Fedora branding to the user agent From cc1f80644e51c64135ede719c7c14753d73dd1ef Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 17 Mar 2015 13:26:28 -0500 Subject: [PATCH 180/211] Backport fix for late certificate validation --- webkitgtk3.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index c96b968..2338f6a 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -34,6 +34,8 @@ Patch7: webkitgtk-2.4.8-gmutexlocker.patch Patch8: webkitgtk-2.4.8-user-agent.patch #https://bugs.webkit.org/show_bug.cgi?id=127474 Patch9: webkitgtk-2.4.8-g_object_destroyed.patch +# http://trac.webkit.org/changeset/181074/ +Patch10: webkitgtk-2.4.8-late-certificate-validation.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -106,6 +108,7 @@ This package contains developer documentation for %{name}. %patch7 -p1 -b .gmutex_locker %patch8 -p1 -b .user_agent %patch9 -p1 -b .g_object_destroyed +%patch10 -p1 -b .certificate_validation %ifarch ppc s390 %patch3 -p1 -b .cloop_fix_32 %endif @@ -224,6 +227,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Mar 17 2015 Michael Catanzaro - 2.4.8-7 +- Backport fix for late certificate validation + * Tue Mar 10 2015 Tomas Popela - 2.4.8-6 - Backport fix for use-after-free when destroying frame From c27e97ddd33cc41648c8d3c508e1ab131a3501ec Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 17 Mar 2015 13:27:37 -0500 Subject: [PATCH 181/211] Backport fix for late certificate validation --- webkitgtk3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 2338f6a..d9d8340 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries From 697baed4b1bc800db34e303207605e8a26ac53e8 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 17 Mar 2015 13:32:01 -0500 Subject: [PATCH 182/211] Backport fix for late certificate validation --- ...tk-2.4.8-late-certificate-validation.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 webkitgtk-2.4.8-late-certificate-validation.patch diff --git a/webkitgtk-2.4.8-late-certificate-validation.patch b/webkitgtk-2.4.8-late-certificate-validation.patch new file mode 100644 index 0000000..6aa0437 --- /dev/null +++ b/webkitgtk-2.4.8-late-certificate-validation.patch @@ -0,0 +1,32 @@ +--- a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp ++++ b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp +@@ -331,5 +331,5 @@ + } + +-static void gotHeadersCallback(SoupMessage* message, gpointer data) ++static void tlsErrorsChangedCallback(SoupMessage* message, GParamSpec*, gpointer data) + { + ResourceHandle* handle = static_cast(data); +@@ -337,8 +337,13 @@ + return; + +- if (handleUnignoredTLSErrors(handle, message)) { ++ if (handleUnignoredTLSErrors(handle, message)) + handle->cancel(); +- return; +- } ++} ++ ++static void gotHeadersCallback(SoupMessage* message, gpointer data) ++{ ++ ResourceHandle* handle = static_cast(data); ++ if (!handle || handle->cancelledOrClientless()) ++ return; + + ResourceHandleInternal* d = handle->getInternal(); +@@ -935,4 +940,5 @@ + soup_message_headers_set_content_length(soupMessage->request_headers, 0); + ++ g_signal_connect(d->m_soupMessage.get(), "notify::tls-errors", G_CALLBACK(tlsErrorsChangedCallback), handle); + g_signal_connect(d->m_soupMessage.get(), "got-headers", G_CALLBACK(gotHeadersCallback), handle); + g_signal_connect(d->m_soupMessage.get(), "wrote-body-data", G_CALLBACK(wroteBodyDataCallback), handle); From d924530f009cc4d0d72167d8760f4775fc87ff18 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 17 Mar 2015 14:50:48 -0500 Subject: [PATCH 183/211] Backport fix for late certificate validation --- webkitgtk3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index d9d8340..a60bb82 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -34,7 +34,7 @@ Patch7: webkitgtk-2.4.8-gmutexlocker.patch Patch8: webkitgtk-2.4.8-user-agent.patch #https://bugs.webkit.org/show_bug.cgi?id=127474 Patch9: webkitgtk-2.4.8-g_object_destroyed.patch -# http://trac.webkit.org/changeset/181074/ +# http://seclists.org/oss-sec/2015/q1/871 Patch10: webkitgtk-2.4.8-late-certificate-validation.patch BuildRequires: at-spi2-core-devel From 7433f334cc84866af5ef0b2c25ead931e6e603ea Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 17 Mar 2015 14:53:48 -0500 Subject: [PATCH 184/211] Remove the fix for late certificate validation because we use --disable-webkit2 --- ...tk-2.4.8-late-certificate-validation.patch | 32 ------------------- webkitgtk3.spec | 8 ++--- 2 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 webkitgtk-2.4.8-late-certificate-validation.patch diff --git a/webkitgtk-2.4.8-late-certificate-validation.patch b/webkitgtk-2.4.8-late-certificate-validation.patch deleted file mode 100644 index 6aa0437..0000000 --- a/webkitgtk-2.4.8-late-certificate-validation.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp -+++ b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp -@@ -331,5 +331,5 @@ - } - --static void gotHeadersCallback(SoupMessage* message, gpointer data) -+static void tlsErrorsChangedCallback(SoupMessage* message, GParamSpec*, gpointer data) - { - ResourceHandle* handle = static_cast(data); -@@ -337,8 +337,13 @@ - return; - -- if (handleUnignoredTLSErrors(handle, message)) { -+ if (handleUnignoredTLSErrors(handle, message)) - handle->cancel(); -- return; -- } -+} -+ -+static void gotHeadersCallback(SoupMessage* message, gpointer data) -+{ -+ ResourceHandle* handle = static_cast(data); -+ if (!handle || handle->cancelledOrClientless()) -+ return; - - ResourceHandleInternal* d = handle->getInternal(); -@@ -935,4 +940,5 @@ - soup_message_headers_set_content_length(soupMessage->request_headers, 0); - -+ g_signal_connect(d->m_soupMessage.get(), "notify::tls-errors", G_CALLBACK(tlsErrorsChangedCallback), handle); - g_signal_connect(d->m_soupMessage.get(), "got-headers", G_CALLBACK(gotHeadersCallback), handle); - g_signal_connect(d->m_soupMessage.get(), "wrote-body-data", G_CALLBACK(wroteBodyDataCallback), handle); diff --git a/webkitgtk3.spec b/webkitgtk3.spec index a60bb82..12635ee 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -34,8 +34,6 @@ Patch7: webkitgtk-2.4.8-gmutexlocker.patch Patch8: webkitgtk-2.4.8-user-agent.patch #https://bugs.webkit.org/show_bug.cgi?id=127474 Patch9: webkitgtk-2.4.8-g_object_destroyed.patch -# http://seclists.org/oss-sec/2015/q1/871 -Patch10: webkitgtk-2.4.8-late-certificate-validation.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -108,7 +106,6 @@ This package contains developer documentation for %{name}. %patch7 -p1 -b .gmutex_locker %patch8 -p1 -b .user_agent %patch9 -p1 -b .g_object_destroyed -%patch10 -p1 -b .certificate_validation %ifarch ppc s390 %patch3 -p1 -b .cloop_fix_32 %endif @@ -227,6 +224,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Mar 17 2015 Michael Catanzaro - 2.4.8-7 +- Remove the fix for late certificate validation because we use --disable-webkit2 + * Tue Mar 17 2015 Michael Catanzaro - 2.4.8-7 - Backport fix for late certificate validation From aaa7b5adfc7e1d2b9e167b968e18d7fa2ba97732 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 22:29:17 +0200 Subject: [PATCH 185/211] Rebuilt for GCC 5 C++11 ABI change --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 12635ee..d221a88 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -224,6 +224,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Sat May 02 2015 Kalev Lember - 2.4.8-9 +- Rebuilt for GCC 5 C++11 ABI change + * Tue Mar 17 2015 Michael Catanzaro - 2.4.8-7 - Remove the fix for late certificate validation because we use --disable-webkit2 From f13611ff0e60a07be75a656f704bbeb5144b43b1 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 20 May 2015 13:54:24 +0200 Subject: [PATCH 186/211] Update to 2.4.9 --- sources | 2 +- webkitgtk-2.4.8-g_object_destroyed.patch | 23 -- webkitgtk-2.4.8-gcc5.patch | 33 --- webkitgtk-2.4.8-gmutexlocker.patch | 281 ----------------------- webkitgtk-2.4.8-plugin_none.patch | 27 --- webkitgtk-aarch64.patch | 33 ++- webkitgtk3.spec | 28 +-- 7 files changed, 24 insertions(+), 403 deletions(-) delete mode 100644 webkitgtk-2.4.8-g_object_destroyed.patch delete mode 100644 webkitgtk-2.4.8-gcc5.patch delete mode 100644 webkitgtk-2.4.8-gmutexlocker.patch delete mode 100644 webkitgtk-2.4.8-plugin_none.patch diff --git a/sources b/sources index a69c671..1f8355d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcdcef8e1ba28dbd5bb05f86c79f76b8 webkitgtk-2.4.8.tar.xz +312fd29eb7f5970660c6a64b8bf8420e webkitgtk-2.4.9.tar.xz diff --git a/webkitgtk-2.4.8-g_object_destroyed.patch b/webkitgtk-2.4.8-g_object_destroyed.patch deleted file mode 100644 index 479f1de..0000000 --- a/webkitgtk-2.4.8-g_object_destroyed.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/Source/WebCore/bindings/gobject/GObjectEventListener.cpp b/Source/WebCore/bindings/gobject/GObjectEventListener.cpp -index 76cf279..9d1b881 100644 ---- a/Source/WebCore/bindings/gobject/GObjectEventListener.cpp -+++ b/Source/WebCore/bindings/gobject/GObjectEventListener.cpp -@@ -52,12 +52,13 @@ void GObjectEventListener::gobjectDestroyed() - { - ASSERT(m_coreTarget); - -- // We must set m_coreTarget to null, because removeEventListener -- // may call the destructor as a side effect and we must be in the -- // proper state to prevent g_object_weak_unref. -- EventTarget* target = m_coreTarget; -+ // Protect 'this' class in case the 'm_coreTarget' holds the last reference, -+ // which may cause, inside removeEventListener(), free of this object -+ // and later use-after-free with the m_handler = 0; assignment. -+ RefPtr protect(this); -+ -+ m_coreTarget->removeEventListener(m_domEventName.data(), this, m_capture); - m_coreTarget = 0; -- target->removeEventListener(m_domEventName.data(), this, m_capture); - m_handler = 0; - } - diff --git a/webkitgtk-2.4.8-gcc5.patch b/webkitgtk-2.4.8-gcc5.patch deleted file mode 100644 index 73f6855..0000000 --- a/webkitgtk-2.4.8-gcc5.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4.gcc5 webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4 ---- webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4.gcc5 2015-01-07 10:45:43.000000000 +0100 -+++ webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4 2015-02-18 13:09:57.359888184 +0100 -@@ -87,12 +87,12 @@ AC_SYS_LARGEFILE - c_compiler="unknown" - AC_LANG_PUSH([C]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ --#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) -+#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) - #error Not a supported GCC compiler - #endif - ])], [c_compiler="gcc"], []) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ --#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3) -+#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3))))) - #error Not a supported Clang compiler - #endif - ])], [c_compiler="clang"], []) -@@ -106,12 +106,12 @@ fi - cxx_compiler="unknown" - AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ --#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) -+#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) - #error Not a supported G++ compiler - #endif - ])], [cxx_compiler="g++"], []) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ --#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3) -+#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3))))) - #error Not a supported Clang++ compiler - #endif - ])], [cxx_compiler="clang++"], []) diff --git a/webkitgtk-2.4.8-gmutexlocker.patch b/webkitgtk-2.4.8-gmutexlocker.patch deleted file mode 100644 index 226da3d..0000000 --- a/webkitgtk-2.4.8-gmutexlocker.patch +++ /dev/null @@ -1,281 +0,0 @@ -diff -up webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.gmutexlocker webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp ---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.gmutexlocker 2015-02-18 15:40:21.851816374 +0100 -+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-02-18 15:45:58.560092191 +0100 -@@ -316,7 +316,7 @@ void MediaPlayerPrivateGStreamerBase::mu - #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS) - PassRefPtr MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper) - { -- GMutexLocker lock(m_bufferMutex); -+ WebCore::GMutexLocker lock(m_bufferMutex); - if (!m_buffer) - return nullptr; - -@@ -366,7 +366,7 @@ void MediaPlayerPrivateGStreamerBase::tr - g_return_if_fail(GST_IS_BUFFER(buffer)); - - { -- GMutexLocker lock(m_bufferMutex); -+ WebCore::GMutexLocker lock(m_bufferMutex); - gst_buffer_replace(&m_buffer, buffer); - } - -@@ -398,7 +398,7 @@ void MediaPlayerPrivateGStreamerBase::pa - if (!m_player->visible()) - return; - -- GMutexLocker lock(m_bufferMutex); -+ WebCore::GMutexLocker lock(m_bufferMutex); - if (!m_buffer) - return; - -diff -up webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp.gmutexlocker webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp -diff -up webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.gmutexlocker webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp ---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.gmutexlocker 2015-02-18 15:16:11.995228731 +0100 -+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-02-18 15:45:42.686843477 +0100 -@@ -118,7 +118,7 @@ static gboolean webkitVideoSinkTimeoutCa - WebKitVideoSink* sink = reinterpret_cast(data); - WebKitVideoSinkPrivate* priv = sink->priv; - -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - GstBuffer* buffer = priv->buffer; - priv->buffer = 0; - priv->timeoutId = 0; -@@ -140,7 +140,7 @@ static GstFlowReturn webkitVideoSinkRend - WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink); - WebKitVideoSinkPrivate* priv = sink->priv; - -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - - if (priv->unlocked) - return GST_FLOW_OK; -@@ -279,7 +279,7 @@ static void webkitVideoSinkGetProperty(G - - static void unlockBufferMutex(WebKitVideoSinkPrivate* priv) - { -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - - if (priv->buffer) { - gst_buffer_unref(priv->buffer); -@@ -305,7 +305,7 @@ static gboolean webkitVideoSinkUnlockSto - WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv; - - { -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - priv->unlocked = false; - } - -@@ -330,7 +330,7 @@ static gboolean webkitVideoSinkStart(Gst - { - WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv; - -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - priv->unlocked = false; - return TRUE; - } -diff -up webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.gmutexlocker webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp ---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.gmutexlocker 2015-02-18 15:16:40.954678407 +0100 -+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-02-18 15:45:19.567481225 +0100 -@@ -346,7 +346,7 @@ static void webKitWebSrcSetProperty(GObj - - switch (propID) { - case PROP_IRADIO_MODE: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->iradioMode = g_value_get_boolean(value); - break; - } -@@ -364,7 +364,7 @@ static void webKitWebSrcGetProperty(GObj - WebKitWebSrc* src = WEBKIT_WEB_SRC(object); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (propID) { - case PROP_IRADIO_MODE: - g_value_set_boolean(value, priv->iradioMode); -@@ -417,7 +417,7 @@ static gboolean webKitWebSrcStop(WebKitW - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - bool seeking = priv->seekID; - -@@ -476,7 +476,7 @@ static gboolean webKitWebSrcStart(WebKit - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - priv->startID = 0; - priv->corsAccessCheck = CORSNoCheck; -@@ -573,7 +573,7 @@ static GstStateChangeReturn webKitWebSrc - return ret; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (transition) { - case GST_STATE_CHANGE_READY_TO_PAUSED: - GST_DEBUG_OBJECT(src, "READY->PAUSED"); -@@ -604,7 +604,7 @@ static gboolean webKitWebSrcQueryWithPar - gst_query_parse_duration(query, &format, NULL); - - GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format)); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (format == GST_FORMAT_BYTES && src->priv->size > 0) { - gst_query_set_duration(query, format, src->priv->size); - result = TRUE; -@@ -612,7 +612,7 @@ static gboolean webKitWebSrcQueryWithPar - break; - } - case GST_QUERY_URI: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - gst_query_set_uri(query, src->priv->uri); - result = TRUE; - break; -@@ -653,7 +653,7 @@ static gchar* webKitWebSrcGetUri(GstURIH - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -668,7 +668,7 @@ static gboolean webKitWebSrcSetUri(GstUR - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -704,7 +704,7 @@ static gboolean webKitWebSrcNeedDataMain - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->needDataID) - return FALSE; -@@ -725,7 +725,7 @@ static void webKitWebSrcNeedDataCb(GstAp - - GST_DEBUG_OBJECT(src, "Need more data: %u", length); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->needDataID || !priv->paused) { - return; - } -@@ -739,7 +739,7 @@ static gboolean webKitWebSrcEnoughDataMa - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->enoughDataID) - return FALSE; -@@ -760,7 +760,7 @@ static void webKitWebSrcEnoughDataCb(Gst - - GST_DEBUG_OBJECT(src, "Have enough data"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->enoughDataID || priv->paused) { - return; - } -@@ -774,7 +774,7 @@ static gboolean webKitWebSrcSeekMainCb(W - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->seekID) - return FALSE; -@@ -792,7 +792,7 @@ static gboolean webKitWebSrcSeekDataCb(G - WebKitWebSrcPrivate* priv = src->priv; - - GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (offset == priv->offset && priv->requestedOffset == priv->offset) - return TRUE; - -@@ -811,7 +811,7 @@ static gboolean webKitWebSrcSeekDataCb(G - void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player) - { - ASSERT(player); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - src->priv->player = player; - } - -@@ -841,7 +841,7 @@ char* StreamingClient::createReadBuffer( - - mapGstBuffer(buffer); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->buffer = adoptGRef(buffer); - locker.unlock(); - -@@ -867,7 +867,7 @@ void StreamingClient::handleResponseRece - return; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - priv->corsAccessCheck = corsAccessCheck; - -@@ -966,7 +966,7 @@ void StreamingClient::handleDataReceived - WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast(gst_buffer_get_size(priv->buffer.get())) : length); - -@@ -1035,7 +1035,7 @@ void StreamingClient::handleNotifyFinish - - GST_DEBUG_OBJECT(src, "Have EOS"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (!priv->seekID) { - locker.unlock(); - gst_app_src_end_of_stream(priv->appsrc); -@@ -1194,7 +1194,7 @@ void ResourceHandleStreamingClient::wasB - - GST_ERROR_OBJECT(src, "Request was blocked"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.reset(g_strdup(src->priv->uri)); - locker.unlock(); - -@@ -1208,7 +1208,7 @@ void ResourceHandleStreamingClient::cann - - GST_ERROR_OBJECT(src, "Cannot show URL"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.reset(g_strdup(src->priv->uri)); - locker.unlock(); - -diff -up webkitgtk-2.4.8/Source/WTF/wtf/gobject/GMutexLocker.h.gmutexlocker webkitgtk-2.4.8/Source/WTF/wtf/gobject/GMutexLocker.h diff --git a/webkitgtk-2.4.8-plugin_none.patch b/webkitgtk-2.4.8-plugin_none.patch deleted file mode 100644 index 19ae387..0000000 --- a/webkitgtk-2.4.8-plugin_none.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am.plugin_none webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am ---- webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am.plugin_none 2015-01-08 11:08:03.261853581 +0100 -+++ webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am 2015-01-08 11:08:53.650619552 +0100 -@@ -6254,9 +6254,11 @@ endif # END USE_GLX - endif # END TARGET_X11 - - if TARGET_WAYLAND -+if ENABLE_WEBKIT2 - webcore_sources += \ - Source/WebCore/plugins/PluginPackageNone.cpp \ - Source/WebCore/plugins/PluginViewNone.cpp -+endif # END ENABLE_WEBKIT2 - endif # END TARGET_WAYLAND - - if TARGET_X11_OR_WAYLAND -@@ -6305,9 +6307,11 @@ webcoregtk_sources += \ - endif # END TARGET_WIN32 - - if TARGET_QUARTZ -+if ENABLE_WEBKIT2 - webcore_sources += \ - Source/WebCore/plugins/PluginPackageNone.cpp \ - Source/WebCore/plugins/PluginViewNone.cpp -+endif # END ENABLE_WEBKIT2 - platformgtk_sources += \ - Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \ - Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp diff --git a/webkitgtk-aarch64.patch b/webkitgtk-aarch64.patch index 7272bc1..6a82264 100644 --- a/webkitgtk-aarch64.patch +++ b/webkitgtk-aarch64.patch @@ -1,19 +1,19 @@ -diff -up webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h.aarch64 webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h ---- webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h.aarch64 2014-09-02 11:39:15.782812173 +0200 -+++ webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h 2014-09-02 11:41:23.022637099 +0200 +diff -up webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h.aarch64 webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h +--- webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h.aarch64 2015-05-20 11:03:24.000000000 +0200 ++++ webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h 2015-05-20 13:45:35.629023925 +0200 @@ -49,7 +49,7 @@ defined(__ARMEL__) || \ defined(_MIPS_ARCH_MIPS32R2) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 --#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) -+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(AARCH64) || CPU(HPPA) +-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) ++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || 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 -up webkitgtk-2.4.5/Source/WTF/wtf/Platform.h.aarch64 webkitgtk-2.4.5/Source/WTF/wtf/Platform.h ---- webkitgtk-2.4.5/Source/WTF/wtf/Platform.h.aarch64 2014-08-25 14:50:32.000000000 +0200 -+++ webkitgtk-2.4.5/Source/WTF/wtf/Platform.h 2014-09-02 11:40:40.925033307 +0200 -@@ -331,6 +331,14 @@ +diff -up webkitgtk-2.4.9/Source/WTF/wtf/Platform.h.aarch64 webkitgtk-2.4.9/Source/WTF/wtf/Platform.h +--- webkitgtk-2.4.9/Source/WTF/wtf/Platform.h.aarch64 2015-05-20 11:03:24.000000000 +0200 ++++ webkitgtk-2.4.9/Source/WTF/wtf/Platform.h 2015-05-20 13:47:34.439861401 +0200 +@@ -334,6 +334,14 @@ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 #endif @@ -28,13 +28,12 @@ diff -up webkitgtk-2.4.5/Source/WTF/wtf/Platform.h.aarch64 webkitgtk-2.4.5/Sourc /* ==== OS() - underlying operating system; only to be used for mandated low-level services like virtual memory, not to choose a GUI toolkit ==== */ -@@ -656,7 +664,8 @@ - || CPU(ARM64) \ +@@ -654,7 +662,7 @@ + #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ + || (CPU(IA64) && !CPU(IA64_32)) \ + || CPU(ALPHA) \ +- || CPU(ARM64) \ ++ || CPU(AARCH64) \ || CPU(S390X) \ + || CPU(MIPS64) \ || CPU(PPC64) \ -- || CPU(PPC64LE) -+ || CPU(PPC64LE) \ -+ || CPU(AARCH64) - #define WTF_USE_JSVALUE64 1 - #else - #define WTF_USE_JSVALUE32_64 1 diff --git a/webkitgtk3.spec b/webkitgtk3.spec index d221a88..ec12040 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -9,8 +9,8 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.4.8 -Release: 9%{?dist} +Version: 2.4.9 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -24,16 +24,8 @@ Patch1: webkitgtk-aarch64.patch Patch2: webkitgtk-2.4.1-cloop_fix.patch Patch3: webkitgtk-2.4.5-cloop_fix_32.patch Patch4: webkitgtk-2.4.1-ppc64_align.patch -# https://bugs.webkit.org/show_bug.cgi?id=140241 -Patch5: webkitgtk-2.4.8-plugin_none.patch -# https://bugs.webkit.org/show_bug.cgi?id=126324 -Patch6: webkitgtk-2.4.8-gcc5.patch -# https://bugs.webkit.org/show_bug.cgi?id=141381 -Patch7: webkitgtk-2.4.8-gmutexlocker.patch # https://bugs.webkit.org/show_bug.cgi?id=142074 -Patch8: webkitgtk-2.4.8-user-agent.patch -#https://bugs.webkit.org/show_bug.cgi?id=127474 -Patch9: webkitgtk-2.4.8-g_object_destroyed.patch +Patch5: webkitgtk-2.4.8-user-agent.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -101,11 +93,7 @@ This package contains developer documentation for %{name}. %patch0 -p1 -b .nspluginwrapper %patch1 -p1 -b .aarch64 %patch2 -p1 -b .cloop_fix -%patch5 -p1 -b .plugin_none -%patch6 -p1 -b .gcc5 -%patch7 -p1 -b .gmutex_locker -%patch8 -p1 -b .user_agent -%patch9 -p1 -b .g_object_destroyed +%patch5 -p1 -b .user_agent %ifarch ppc s390 %patch3 -p1 -b .cloop_fix_32 %endif @@ -113,11 +101,6 @@ This package contains developer documentation for %{name}. %patch4 -p1 -b .ppc64_align %endif -# Remove when 2.4.9 will be released -# Needed for https://bugs.webkit.org/show_bug.cgi?id=140241 -# Regenerate configure to pick up the gcc 5.0 changes -autoreconf -v - %build # Use linker flags to reduce memory consumption %global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads @@ -224,6 +207,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Wed May 20 2015 Tomas Popela - 2.4.9-1 +- Update to 2.4.9 + * Sat May 02 2015 Kalev Lember - 2.4.8-9 - Rebuilt for GCC 5 C++11 ABI change From 07ad6fa231faa647cd59070e69fa8c381ad85e8e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:19:25 +0000 Subject: [PATCH 187/211] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index ec12040..54a4ae7 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -207,6 +207,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 2.4.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed May 20 2015 Tomas Popela - 2.4.9-1 - Update to 2.4.9 From 0f1bc27ea78108ba1cede88a85fbbf7ebb35afa6 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 25 Sep 2015 07:53:26 +0200 Subject: [PATCH 188/211] - rhbz#1189303 - [abrt] midori: WebCore::SQLiteStatement::prepare(): midori killed by SIGSEGV Initialize string in SQLiteStatement before using it --- webkitgtk-2.4.9-sql_initialize_string.patch | 12 ++++++++++++ webkitgtk3.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.4.9-sql_initialize_string.patch diff --git a/webkitgtk-2.4.9-sql_initialize_string.patch b/webkitgtk-2.4.9-sql_initialize_string.patch new file mode 100644 index 0000000..a34ef14 --- /dev/null +++ b/webkitgtk-2.4.9-sql_initialize_string.patch @@ -0,0 +1,12 @@ +diff -up webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp +--- webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string 2015-09-14 09:25:43.004200172 +0200 ++++ webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp 2015-09-14 09:25:57.852082368 +0200 +@@ -71,7 +71,7 @@ int SQLiteStatement::prepare() + // this lets SQLite avoid an extra string copy. + size_t lengthIncludingNullCharacter = query.length() + 1; + +- const char* tail; ++ const char* tail = nullptr; + int error = sqlite3_prepare_v2(m_database.sqlite3Handle(), query.data(), lengthIncludingNullCharacter, &m_statement, &tail); + + if (error != SQLITE_OK) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 54a4ae7..2028449 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -26,6 +26,8 @@ Patch3: webkitgtk-2.4.5-cloop_fix_32.patch Patch4: webkitgtk-2.4.1-ppc64_align.patch # https://bugs.webkit.org/show_bug.cgi?id=142074 Patch5: webkitgtk-2.4.8-user-agent.patch +# http://trac.webkit.org/changeset/169665 +Patch6: webkitgtk-2.4.9-sql_initialize_string.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -94,6 +96,7 @@ This package contains developer documentation for %{name}. %patch1 -p1 -b .aarch64 %patch2 -p1 -b .cloop_fix %patch5 -p1 -b .user_agent +%patch6 -p1 -b .sql_initialize_string %ifarch ppc s390 %patch3 -p1 -b .cloop_fix_32 %endif @@ -207,6 +210,10 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Fri Sep 25 2015 Tomas Popela - 2.4.9-3 +- rhbz#1189303 - [abrt] midori: WebCore::SQLiteStatement::prepare(): midori killed by SIGSEGV + Initialize string in SQLiteStatement before using it + * Fri Jun 19 2015 Fedora Release Engineering - 2.4.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From dc09c7cf4fec274979b1f31e1c1a8048ae743848 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 28 Oct 2015 14:09:07 +0100 Subject: [PATCH 189/211] rebuild for ICU 56.1 --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 2028449..524bd09 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -210,6 +210,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Wed Oct 28 2015 David Tardon - 2.4.9-4 +- rebuild for ICU 56.1 + * Fri Sep 25 2015 Tomas Popela - 2.4.9-3 - rhbz#1189303 - [abrt] midori: WebCore::SQLiteStatement::prepare(): midori killed by SIGSEGV Initialize string in SQLiteStatement before using it From 21c2602eaf2779270868d9bce0db86f483c1e177 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 7 Dec 2015 11:48:28 +0100 Subject: [PATCH 190/211] rhbz#1289053 - Retire nspluginwrapper and remove from Fedora 24 --- webkit-1.1.14-nspluginwrapper.patch | 12 ---------- webkitgtk3.spec | 34 ++++++++++++++++------------- 2 files changed, 19 insertions(+), 27 deletions(-) delete mode 100644 webkit-1.1.14-nspluginwrapper.patch diff --git a/webkit-1.1.14-nspluginwrapper.patch b/webkit-1.1.14-nspluginwrapper.patch deleted file mode 100644 index 0d3aa27..0000000 --- a/webkit-1.1.14-nspluginwrapper.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- webkit-1.1.17/Source/WebCore/plugins/PluginDatabase.cpp.old 2009-12-01 15:22:10.000000000 +0000 -+++ webkit-1.1.17/Source/WebCore/plugins/PluginDatabase.cpp 2009-12-01 15:22:21.000000000 +0000 -@@ -357,6 +357,9 @@ Vector PluginDatabase::defaultPl - paths.append("/usr/lib64/mozilla/plugins"); - paths.append("/usr/lib/nsbrowser/plugins"); - paths.append("/usr/lib64/nsbrowser/plugins"); -+ /* And for nspluginwrapper */ -+ paths.append("/usr/lib64/mozilla/plugins-wrapped"); -+ paths.append("/usr/lib/mozilla/plugins-wrapped"); - - String mozHome(getenv("MOZILLA_HOME")); - mozHome.append("/plugins"); diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 524bd09..fdb5217 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -19,15 +19,14 @@ URL: http://www.webkitgtk.org/ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz -Patch0: webkit-1.1.14-nspluginwrapper.patch -Patch1: webkitgtk-aarch64.patch -Patch2: webkitgtk-2.4.1-cloop_fix.patch -Patch3: webkitgtk-2.4.5-cloop_fix_32.patch -Patch4: webkitgtk-2.4.1-ppc64_align.patch +Patch0: webkitgtk-aarch64.patch +Patch1: webkitgtk-2.4.1-cloop_fix.patch +Patch2: webkitgtk-2.4.5-cloop_fix_32.patch +Patch3: webkitgtk-2.4.1-ppc64_align.patch # https://bugs.webkit.org/show_bug.cgi?id=142074 -Patch5: webkitgtk-2.4.8-user-agent.patch +Patch4: webkitgtk-2.4.8-user-agent.patch # http://trac.webkit.org/changeset/169665 -Patch6: webkitgtk-2.4.9-sql_initialize_string.patch +Patch5: webkitgtk-2.4.9-sql_initialize_string.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -92,16 +91,15 @@ This package contains developer documentation for %{name}. %prep %setup -qn "webkitgtk-%{version}" -%patch0 -p1 -b .nspluginwrapper -%patch1 -p1 -b .aarch64 -%patch2 -p1 -b .cloop_fix -%patch5 -p1 -b .user_agent -%patch6 -p1 -b .sql_initialize_string +%patch0 -p1 -b .aarch64 +%patch1 -p1 -b .cloop_fix +%patch4 -p1 -b .user_agent +%patch5 -p1 -b .sql_initialize_string %ifarch ppc s390 -%patch3 -p1 -b .cloop_fix_32 +%patch2 -p1 -b .cloop_fix_32 %endif %ifarch %{power64} aarch64 ppc -%patch4 -p1 -b .ppc64_align +%patch3 -p1 -b .ppc64_align %endif %build @@ -210,6 +208,12 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Mon Dec 07 2015 Tomas Popela - 2.4.9-5 +- rhbz#1289053 - Retire nspluginwrapper and remove from Fedora 24 + +* Wed Oct 28 2015 David Tardon - 2.4.9-4 +- rebuild for ICU 56.1 + * Wed Oct 28 2015 David Tardon - 2.4.9-4 - rebuild for ICU 56.1 From 8a1b0dbf98d44cbe7725b05e287da6545fc599f2 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 7 Dec 2015 11:49:31 +0100 Subject: [PATCH 191/211] Remove Changelog entry duplicate --- webkitgtk3.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index fdb5217..1b4c644 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -214,9 +214,6 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete * Wed Oct 28 2015 David Tardon - 2.4.9-4 - rebuild for ICU 56.1 -* Wed Oct 28 2015 David Tardon - 2.4.9-4 -- rebuild for ICU 56.1 - * Fri Sep 25 2015 Tomas Popela - 2.4.9-3 - rhbz#1189303 - [abrt] midori: WebCore::SQLiteStatement::prepare(): midori killed by SIGSEGV Initialize string in SQLiteStatement before using it From f0daba1da0877784683898a6a49bd3858fc60b80 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Dec 2015 18:56:14 +0100 Subject: [PATCH 192/211] Rebuilt for libwebp soname bump Signed-off-by: Igor Gnatenko --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 1b4c644..b978c72 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -208,6 +208,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Mon Dec 28 2015 Igor Gnatenko - 2.4.9-6 +- Rebuilt for libwebp soname bump + * Mon Dec 07 2015 Tomas Popela - 2.4.9-5 - rhbz#1289053 - Retire nspluginwrapper and remove from Fedora 24 From 5d2bdbb15a8197024809528d468b69bfa87373f9 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 25 Jan 2016 09:47:36 +0100 Subject: [PATCH 193/211] Add support for MIPS --- webkitgtk3.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index b978c72..4743463 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -95,7 +95,7 @@ This package contains developer documentation for %{name}. %patch1 -p1 -b .cloop_fix %patch4 -p1 -b .user_agent %patch5 -p1 -b .sql_initialize_string -%ifarch ppc s390 +%ifarch ppc s390 mips %patch2 -p1 -b .cloop_fix_32 %endif %ifarch %{power64} aarch64 ppc @@ -106,7 +106,7 @@ This package contains developer documentation for %{name}. # Use linker flags to reduce memory consumption %global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads -%ifarch s390 %{arm} +%ifarch s390 %{arm} mips mipsel # Decrease debuginfo verbosity to reduce memory consumption even more %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif @@ -116,7 +116,7 @@ This package contains developer documentation for %{name}. %global optflags %{optflags} -Wl,-relax -latomic %endif -%ifarch s390 s390x ppc %{power64} aarch64 +%ifarch s390 s390x ppc %{power64} aarch64 %{mips} %global optflags %{optflags} -DENABLE_YARR_JIT=0 %endif @@ -127,7 +127,7 @@ This package contains developer documentation for %{name}. %configure \ --with-gtk=3.0 \ --disable-webkit2 \ -%ifarch s390 s390x ppc %{power64} aarch64 +%ifarch s390 s390x ppc %{power64} aarch64 %{mips} --disable-jit \ %else --enable-jit \ @@ -208,6 +208,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Wed Dec 30 2015 Michal Toman - 2.4.9-7 +- Add support for MIPS + * Mon Dec 28 2015 Igor Gnatenko - 2.4.9-6 - Rebuilt for libwebp soname bump From e255be264ccab9b35a8e3aa2b29fc54acaa44930 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:57:23 +0000 Subject: [PATCH 194/211] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 4743463..699ef7d 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -208,6 +208,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 2.4.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Dec 30 2015 Michal Toman - 2.4.9-7 - Add support for MIPS From 5b0f27ebbc3c53a0227c6283b72233297bc2b2c3 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 8 Feb 2016 08:21:18 +0100 Subject: [PATCH 195/211] Fix the build with gcc 6 (use Kevin's patch from the webkitgtk package) --- webkitgtk-2.4.9-abs.patch | 26 ++++++++++++++++++++++++++ webkitgtk3.spec | 7 ++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.4.9-abs.patch diff --git a/webkitgtk-2.4.9-abs.patch b/webkitgtk-2.4.9-abs.patch new file mode 100644 index 0000000..9a1c5f9 --- /dev/null +++ b/webkitgtk-2.4.9-abs.patch @@ -0,0 +1,26 @@ +diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp +--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2015-05-20 03:03:24.000000000 -0600 ++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-02-07 11:30:42.392686308 -0700 +@@ -85,8 +85,8 @@ + guint32 eventTime = getEventTime(event); + + if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) +- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) +- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) ++ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) ++ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) + && (eventTime - m_previousClickTime < static_cast(doubleClickTime)) + && (buttonEvent->button == m_previousClickButton))) + m_currentClickCount++; +diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp +--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-05-20 03:03:24.000000000 -0600 ++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-02-07 11:49:36.384691005 -0700 +@@ -659,7 +659,7 @@ + if (!std::isfinite(time)) + return String::fromUTF8(_("indefinite time")); + +- int seconds = static_cast(abs(time)); ++ int seconds = static_cast(fabs(time)); + int days = seconds / (60 * 60 * 24); + int hours = seconds / (60 * 60); + int minutes = (seconds / 60) % 60; diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 699ef7d..e146005 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -27,6 +27,7 @@ Patch3: webkitgtk-2.4.1-ppc64_align.patch Patch4: webkitgtk-2.4.8-user-agent.patch # http://trac.webkit.org/changeset/169665 Patch5: webkitgtk-2.4.9-sql_initialize_string.patch +Patch6: webkitgtk-2.4.9-abs.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -95,6 +96,7 @@ This package contains developer documentation for %{name}. %patch1 -p1 -b .cloop_fix %patch4 -p1 -b .user_agent %patch5 -p1 -b .sql_initialize_string +%patch6 -p1 -b .abs %ifarch ppc s390 mips %patch2 -p1 -b .cloop_fix_32 %endif @@ -208,6 +210,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Sat Feb 06 2016 Tomas Popela - 2.4.9-9 +- Fix the build with gcc 6 (use Kevin's patch from the webkitgtk package) + * Fri Feb 05 2016 Fedora Release Engineering - 2.4.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From fbb8dbd5183a02c17d4d1a0c388375479e880b14 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 9 Feb 2016 13:35:03 +0000 Subject: [PATCH 196/211] Add ruby deps for build --- webkitgtk3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index e146005..84dea45 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -59,7 +59,7 @@ BuildRequires: pcre-devel BuildRequires: sqlite-devel BuildRequires: gobject-introspection-devel >= 1.32.0 BuildRequires: perl-Switch -BuildRequires: ruby +BuildRequires: ruby rubypick rubygems BuildRequires: mesa-libGL-devel %ifarch ppc BuildRequires: libatomic @@ -210,6 +210,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Feb 9 2016 Peter Robinson 2.4.9-10 +- Add ruby deps for build + * Sat Feb 06 2016 Tomas Popela - 2.4.9-9 - Fix the build with gcc 6 (use Kevin's patch from the webkitgtk package) From b529119ff510f10a9db5bea517ee7d4a74a7c298 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 7 Mar 2016 10:34:48 +0100 Subject: [PATCH 197/211] Clear the patches before the 2.4.10 release --- webkitgtk-2.4.1-cloop_fix.patch | 141 +------------------ webkitgtk-2.4.1-cloop_operations_scope.patch | 99 +++++++++++++ webkitgtk-2.4.1-jsc_proto_call_frame.patch | 45 ++++++ webkitgtk3.spec | 13 +- 4 files changed, 160 insertions(+), 138 deletions(-) create mode 100644 webkitgtk-2.4.1-cloop_operations_scope.patch create mode 100644 webkitgtk-2.4.1-jsc_proto_call_frame.patch diff --git a/webkitgtk-2.4.1-cloop_fix.patch b/webkitgtk-2.4.1-cloop_fix.patch index 2675caf..b647b10 100644 --- a/webkitgtk-2.4.1-cloop_fix.patch +++ b/webkitgtk-2.4.1-cloop_fix.patch @@ -1,57 +1,6 @@ -diff -up webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h ---- webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix 2014-07-23 14:15:45.497658648 +0200 -+++ webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h 2014-07-23 14:16:46.997687779 +0200 -@@ -36,7 +36,7 @@ struct ProtoCallFrame { - Register calleeValue; - Register argCountAndCodeOriginValue; - Register thisArg; -- size_t paddedArgCount; -+ uint32_t paddedArgCount; - JSValue *args; - - void init(CodeBlock*, JSScope*, JSObject*, JSValue, int, JSValue* otherArgs = 0); -@@ -53,7 +53,7 @@ struct ProtoCallFrame { - int argumentCountIncludingThis() const { return argCountAndCodeOriginValue.payload(); } - int argumentCount() const { return argumentCountIncludingThis() - 1; } - void setArgumentCountIncludingThis(int count) { argCountAndCodeOriginValue.payload() = count; } -- void setPaddedArgsCount(size_t argCount) { paddedArgCount = argCount; } -+ void setPaddedArgsCount(uint32_t argCount) { paddedArgCount = argCount; } - - void clearCurrentVPC() { argCountAndCodeOriginValue.tag() = 0; } - -diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp ---- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix 2014-07-23 14:16:02.057667404 +0200 -+++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-07-23 14:16:46.997687779 +0200 -@@ -1354,7 +1354,7 @@ LLINT_SLOW_PATH_DECL(slow_path_get_from_ - CodeBlock* codeBlock = exec->codeBlock(); - ConcurrentJITLocker locker(codeBlock->m_lock); - pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure()); -- pc[6].u.operand = slot.cachedOffset(); -+ pc[6].u.pointer = reinterpret_cast(slot.cachedOffset()); - } - } - -@@ -1381,7 +1381,7 @@ LLINT_SLOW_PATH_DECL(slow_path_put_to_sc - if (slot.isCacheable() && slot.base() == scope && scope->structure()->propertyAccessesAreCacheable()) { - ConcurrentJITLocker locker(codeBlock->m_lock); - pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure()); -- pc[6].u.operand = slot.cachedOffset(); -+ pc[6].u.pointer = reinterpret_cast(slot.cachedOffset()); - } - } - -diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm ---- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix 2014-07-23 14:16:13.047672325 +0200 -+++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-07-23 14:18:27.547721786 +0200 -@@ -282,7 +282,7 @@ macro doCallToJavaScript(makeCall, doRet - storep temp3, CodeBlock+4[cfr, temp1, 8] - btinz temp1, .copyHeaderLoop - -- loadi ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2 -+ loadi PayloadOffset + ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2 - subi 1, temp2 - loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp3 - subi 1, temp3 +diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +--- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix 2015-05-20 11:03:24.000000000 +0200 ++++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-03-07 10:17:14.337760573 +0100 @@ -321,7 +321,7 @@ macro doCallToJavaScript(makeCall, doRet .calleeFramePopped: @@ -106,7 +55,7 @@ diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.as btiz t2, .resolveScopeLoopEnd .resolveScopeLoop: -@@ -2271,13 +2271,13 @@ _llint_op_resolve_scope: +@@ -2271,7 +2271,7 @@ _llint_op_resolve_scope: macro loadWithStructureCheck(operand, slowPath) loadisFromInstruction(operand, t0) @@ -115,85 +64,3 @@ diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.as loadpFromInstruction(5, t1) bpneq JSCell::m_structure[t0], t1, slowPath end - - macro getProperty() -- loadisFromInstruction(6, t3) -+ loadpFromInstruction(6, t3) - loadPropertyAtVariableOffset(t3, t0, t1, t2) - valueProfile(t1, t2, 28, t0) - loadisFromInstruction(1, t0) -@@ -2297,7 +2297,7 @@ end - - macro getClosureVar() - loadp JSVariableObject::m_registers[t0], t0 -- loadisFromInstruction(6, t3) -+ loadpFromInstruction(6, t3) - loadp TagOffset[t0, t3, 8], t1 - loadp PayloadOffset[t0, t3, 8], t2 - valueProfile(t1, t2, 28, t0) -@@ -2356,7 +2356,7 @@ _llint_op_get_from_scope: - macro putProperty() - loadisFromInstruction(3, t1) - loadConstantOrVariable(t1, t2, t3) -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - storePropertyAtVariableOffset(t1, t0, t2, t3) - end - -@@ -2374,7 +2374,7 @@ macro putClosureVar() - loadisFromInstruction(3, t1) - loadConstantOrVariable(t1, t2, t3) - loadp JSVariableObject::m_registers[t0], t0 -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - storei t2, TagOffset[t0, t1, 8] - storei t3, PayloadOffset[t0, t1, 8] - end -diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm ---- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix 2014-07-23 14:16:19.147675074 +0200 -+++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-07-23 14:16:46.997687779 +0200 -@@ -171,7 +171,7 @@ macro doCallToJavaScript(makeCall, doRet - storep temp3, CodeBlock[cfr, temp1, 8] - btinz temp1, .copyHeaderLoop - -- loadi ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2 -+ loadi PayloadOffset + ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2 - subi 1, temp2 - loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp3 - subi 1, temp3 -@@ -2047,7 +2047,7 @@ macro loadWithStructureCheck(operand, sl - end - - macro getProperty() -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - loadPropertyAtVariableOffset(t1, t0, t2) - valueProfile(t2, 7, t0) - loadisFromInstruction(1, t0) -@@ -2064,7 +2064,7 @@ end - - macro getClosureVar() - loadp JSVariableObject::m_registers[t0], t0 -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - loadq [t0, t1, 8], t0 - valueProfile(t0, 7, t1) - loadisFromInstruction(1, t1) -@@ -2121,7 +2121,7 @@ _llint_op_get_from_scope: - macro putProperty() - loadisFromInstruction(3, t1) - loadConstantOrVariable(t1, t2) -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - storePropertyAtVariableOffset(t1, t0, t2) - end - -@@ -2138,7 +2138,7 @@ macro putClosureVar() - loadisFromInstruction(3, t1) - loadConstantOrVariable(t1, t2) - loadp JSVariableObject::m_registers[t0], t0 -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - storeq t2, [t0, t1, 8] - end - diff --git a/webkitgtk-2.4.1-cloop_operations_scope.patch b/webkitgtk-2.4.1-cloop_operations_scope.patch new file mode 100644 index 0000000..e7b6415 --- /dev/null +++ b/webkitgtk-2.4.1-cloop_operations_scope.patch @@ -0,0 +1,99 @@ +diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_operations_scope webkitgtk-2.4.9/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp +--- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_operations_scope 2015-05-20 11:03:24.000000000 +0200 ++++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-03-07 10:15:36.659406501 +0100 +@@ -1354,7 +1354,7 @@ LLINT_SLOW_PATH_DECL(slow_path_get_from_ + CodeBlock* codeBlock = exec->codeBlock(); + ConcurrentJITLocker locker(codeBlock->m_lock); + pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure()); +- pc[6].u.operand = slot.cachedOffset(); ++ pc[6].u.pointer = reinterpret_cast(slot.cachedOffset()); + } + } + +@@ -1381,7 +1381,7 @@ LLINT_SLOW_PATH_DECL(slow_path_put_to_sc + if (slot.isCacheable() && slot.base() == scope && scope->structure()->propertyAccessesAreCacheable()) { + ConcurrentJITLocker locker(codeBlock->m_lock); + pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure()); +- pc[6].u.operand = slot.cachedOffset(); ++ pc[6].u.pointer = reinterpret_cast(slot.cachedOffset()); + } + } + +diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_operations_scope webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +--- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_operations_scope 2016-03-07 10:15:36.657406514 +0100 ++++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-03-07 10:16:01.854239892 +0100 +@@ -2277,7 +2277,7 @@ macro loadWithStructureCheck(operand, sl + end + + macro getProperty() +- loadisFromInstruction(6, t3) ++ loadpFromInstruction(6, t3) + loadPropertyAtVariableOffset(t3, t0, t1, t2) + valueProfile(t1, t2, 28, t0) + loadisFromInstruction(1, t0) +@@ -2297,7 +2297,7 @@ end + + macro getClosureVar() + loadp JSVariableObject::m_registers[t0], t0 +- loadisFromInstruction(6, t3) ++ loadpFromInstruction(6, t3) + loadp TagOffset[t0, t3, 8], t1 + loadp PayloadOffset[t0, t3, 8], t2 + valueProfile(t1, t2, 28, t0) +@@ -2356,7 +2356,7 @@ _llint_op_get_from_scope: + macro putProperty() + loadisFromInstruction(3, t1) + loadConstantOrVariable(t1, t2, t3) +- loadisFromInstruction(6, t1) ++ loadpFromInstruction(6, t1) + storePropertyAtVariableOffset(t1, t0, t2, t3) + end + +@@ -2374,7 +2374,7 @@ macro putClosureVar() + loadisFromInstruction(3, t1) + loadConstantOrVariable(t1, t2, t3) + loadp JSVariableObject::m_registers[t0], t0 +- loadisFromInstruction(6, t1) ++ loadpFromInstruction(6, t1) + storei t2, TagOffset[t0, t1, 8] + storei t3, PayloadOffset[t0, t1, 8] + end +diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_operations_scope webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm +--- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_operations_scope 2016-03-07 10:15:36.658406508 +0100 ++++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-03-07 10:15:36.660406494 +0100 +@@ -2047,7 +2047,7 @@ macro loadWithStructureCheck(operand, sl + end + + macro getProperty() +- loadisFromInstruction(6, t1) ++ loadpFromInstruction(6, t1) + loadPropertyAtVariableOffset(t1, t0, t2) + valueProfile(t2, 7, t0) + loadisFromInstruction(1, t0) +@@ -2064,7 +2064,7 @@ end + + macro getClosureVar() + loadp JSVariableObject::m_registers[t0], t0 +- loadisFromInstruction(6, t1) ++ loadpFromInstruction(6, t1) + loadq [t0, t1, 8], t0 + valueProfile(t0, 7, t1) + loadisFromInstruction(1, t1) +@@ -2121,7 +2121,7 @@ _llint_op_get_from_scope: + macro putProperty() + loadisFromInstruction(3, t1) + loadConstantOrVariable(t1, t2) +- loadisFromInstruction(6, t1) ++ loadpFromInstruction(6, t1) + storePropertyAtVariableOffset(t1, t0, t2) + end + +@@ -2138,7 +2138,7 @@ macro putClosureVar() + loadisFromInstruction(3, t1) + loadConstantOrVariable(t1, t2) + loadp JSVariableObject::m_registers[t0], t0 +- loadisFromInstruction(6, t1) ++ loadpFromInstruction(6, t1) + storeq t2, [t0, t1, 8] + end + diff --git a/webkitgtk-2.4.1-jsc_proto_call_frame.patch b/webkitgtk-2.4.1-jsc_proto_call_frame.patch new file mode 100644 index 0000000..b80751c --- /dev/null +++ b/webkitgtk-2.4.1-jsc_proto_call_frame.patch @@ -0,0 +1,45 @@ +diff -up webkitgtk-2.4.9/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.jsc_proto_call_frame webkitgtk-2.4.9/Source/JavaScriptCore/interpreter/ProtoCallFrame.h +--- webkitgtk-2.4.9/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.jsc_proto_call_frame 2016-03-07 10:04:24.425851848 +0100 ++++ webkitgtk-2.4.9/Source/JavaScriptCore/interpreter/ProtoCallFrame.h 2016-03-07 10:04:53.193661612 +0100 +@@ -36,7 +36,7 @@ struct ProtoCallFrame { + Register calleeValue; + Register argCountAndCodeOriginValue; + Register thisArg; +- size_t paddedArgCount; ++ uint32_t paddedArgCount; + JSValue *args; + + void init(CodeBlock*, JSScope*, JSObject*, JSValue, int, JSValue* otherArgs = 0); +@@ -53,7 +53,7 @@ struct ProtoCallFrame { + int argumentCountIncludingThis() const { return argCountAndCodeOriginValue.payload(); } + int argumentCount() const { return argumentCountIncludingThis() - 1; } + void setArgumentCountIncludingThis(int count) { argCountAndCodeOriginValue.payload() = count; } +- void setPaddedArgsCount(size_t argCount) { paddedArgCount = argCount; } ++ void setPaddedArgsCount(uint32_t argCount) { paddedArgCount = argCount; } + + void clearCurrentVPC() { argCountAndCodeOriginValue.tag() = 0; } + +diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.jsc_proto_call_frame webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +--- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.jsc_proto_call_frame 2016-03-07 10:05:28.754426456 +0100 ++++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-03-07 10:06:02.349204301 +0100 +@@ -266,7 +266,7 @@ macro doCallToJavaScript(makeCall, doRet + storep previousCFR, CallerFrame[cfr] + move cfr, temp1 + +- loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp2 ++ loadi PayloadOffset + ProtoCallFrame::paddedArgCount[protoCallFrame], temp2 + addp CallFrameHeaderSlots, temp2, temp2 + lshiftp 3, temp2 + subp temp2, cfr +diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.jsc_proto_call_frame webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm +--- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.jsc_proto_call_frame 2016-03-07 10:05:34.843386191 +0100 ++++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-03-07 10:06:23.245066120 +0100 +@@ -157,7 +157,7 @@ macro doCallToJavaScript(makeCall, doRet + storep previousCFR, CallerFrame[cfr] + move cfr, temp1 + +- loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp2 ++ loadi PayloadOffset + ProtoCallFrame::paddedArgCount[protoCallFrame], temp2 + addp CallFrameHeaderSlots, temp2, temp2 + lshiftp 3, temp2 + subp temp2, cfr diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 84dea45..82cfcd6 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -19,15 +19,24 @@ URL: http://www.webkitgtk.org/ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz +# https://bugs.webkit.org/show_bug.cgi?id=130506 - 2.4.10 Patch0: webkitgtk-aarch64.patch +# not upstreamed! Patch1: webkitgtk-2.4.1-cloop_fix.patch +# not upstreamed - applied just on 32-bit architectures! Patch2: webkitgtk-2.4.5-cloop_fix_32.patch +# https://bugs.webkit.org/show_bug.cgi?id=130237 - 2.4.10 Patch3: webkitgtk-2.4.1-ppc64_align.patch # https://bugs.webkit.org/show_bug.cgi?id=142074 Patch4: webkitgtk-2.4.8-user-agent.patch -# http://trac.webkit.org/changeset/169665 +# http://trac.webkit.org/changeset/169665 - 2.4.10 Patch5: webkitgtk-2.4.9-sql_initialize_string.patch Patch6: webkitgtk-2.4.9-abs.patch +# https://bugs.webkit.org/show_bug.cgi?id=131449 - 2.4.10 +Patch7: webkitgtk-2.4.1-jsc_proto_call_frame.patch +# https://bugs.webkit.org/show_bug.cgi?id=132333 - never got r+ but used in Fedora for a long time +Patch8: webkitgtk-2.4.1-cloop_operations_scope.patch + BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -94,6 +103,8 @@ This package contains developer documentation for %{name}. %setup -qn "webkitgtk-%{version}" %patch0 -p1 -b .aarch64 %patch1 -p1 -b .cloop_fix +%patch7 -p1 -b .jsc_proto_call_frame +%patch8 -p1 -b .cloop_operations_scope %patch4 -p1 -b .user_agent %patch5 -p1 -b .sql_initialize_string %patch6 -p1 -b .abs From ee0cef90f38f5ca729fd685375f78cdc4513532b Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 9 Mar 2016 11:52:36 +0100 Subject: [PATCH 198/211] Improve the downstream patches situation a little bit --- webkitgtk-2.4.1-cloop_fix.patch | 66 --------------- webkitgtk-2.4.5-cloop_fix_32.patch | 31 ------- webkitgtk-2.4.9-cloop_fix_2_4.patch | 121 ++++++++++++++++++++++++++++ webkitgtk3.spec | 43 +++++----- 4 files changed, 140 insertions(+), 121 deletions(-) delete mode 100644 webkitgtk-2.4.1-cloop_fix.patch delete mode 100644 webkitgtk-2.4.5-cloop_fix_32.patch create mode 100644 webkitgtk-2.4.9-cloop_fix_2_4.patch diff --git a/webkitgtk-2.4.1-cloop_fix.patch b/webkitgtk-2.4.1-cloop_fix.patch deleted file mode 100644 index b647b10..0000000 --- a/webkitgtk-2.4.1-cloop_fix.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm ---- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix 2015-05-20 11:03:24.000000000 +0200 -+++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-03-07 10:17:14.337760573 +0100 -@@ -321,7 +321,7 @@ macro doCallToJavaScript(makeCall, doRet - - .calleeFramePopped: - loadp Callee[cfr], temp3 # VM.topCallFrame -- loadp ScopeChain[cfr], temp4 -+ loadp ScopeChain + PayloadOffset[cfr], temp4 - storep temp4, [temp3] - - doReturn(extraStackSpace) -@@ -598,7 +598,7 @@ end - - - macro branchIfException(label) -- loadp ScopeChain[cfr], t3 -+ loadp ScopeChain + PayloadOffset[cfr], t3 - andp MarkedBlockMask, t3 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 - bieq VM::m_exception + TagOffset[t3], EmptyValueTag, .noException -@@ -2039,7 +2039,7 @@ _llint_op_catch: - # the interpreter's throw trampoline (see _llint_throw_trampoline). - # The throwing code must have known that we were throwing to the interpreter, - # and have set VM::targetInterpreterPCForThrow. -- loadp ScopeChain[cfr], t3 -+ loadp ScopeChain + PayloadOffset[cfr], t3 - andp MarkedBlockMask, t3 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 - loadp VM::callFrameForThrow[t3], cfr -@@ -2159,7 +2159,7 @@ macro nativeCallTrampoline(executableOff - andp MarkedBlockMask, t3 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 - elsif C_LOOP -- loadp ScopeChain[cfr], t3 -+ loadp ScopeChain + PayloadOffset[cfr], t3 - andp MarkedBlockMask, t3 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 - storep cfr, VM::topCallFrame[t3] -@@ -2172,7 +2172,7 @@ macro nativeCallTrampoline(executableOff - move t2, cfr - cloopCallNative executableOffsetToFunction[t1] - restoreReturnAddressBeforeReturn(t3) -- loadp ScopeChain[cfr], t3 -+ loadp ScopeChain + PayloadOffset[cfr], t3 - andp MarkedBlockMask, t3 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 - else -@@ -2212,7 +2212,7 @@ macro resolveScope() - addi 1, t2 - - .resolveScopeAfterActivationCheck: -- loadp ScopeChain[cfr], t0 -+ loadp ScopeChain + PayloadOffset[cfr], t0 - btiz t2, .resolveScopeLoopEnd - - .resolveScopeLoop: -@@ -2271,7 +2271,7 @@ _llint_op_resolve_scope: - - macro loadWithStructureCheck(operand, slowPath) - loadisFromInstruction(operand, t0) -- loadp [cfr, t0, 8], t0 -+ loadp PayloadOffset[cfr, t0, 8], t0 - loadpFromInstruction(5, t1) - bpneq JSCell::m_structure[t0], t1, slowPath - end diff --git a/webkitgtk-2.4.5-cloop_fix_32.patch b/webkitgtk-2.4.5-cloop_fix_32.patch deleted file mode 100644 index 96c53ad..0000000 --- a/webkitgtk-2.4.5-cloop_fix_32.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32 webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm ---- webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32 2013-08-28 21:06:29.000000000 +0200 -+++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-09-12 15:32:34.000000000 +0200 -@@ -1679,7 +1679,7 @@ _llint_op_next_pname: - loadi 20[PC], t2 - loadi PayloadOffset[cfr, t2, 8], t2 - loadp JSPropertyNameIterator::m_jsStrings[t2], t3 -- loadi [t3, t0, 8], t3 -+ loadi PayloadOffset[t3, t0, 8], t3 - addi 1, t0 - storei t0, PayloadOffset[cfr, t1, 8] - loadi 4[PC], t1 -diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm ---- webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 2013-08-28 21:06:29.000000000 +0200 -+++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-09-12 15:32:34.000000000 +0200 -@@ -276,13 +276,13 @@ macro assertNotConstant(index) - end - - macro functionForCallCodeBlockGetter(targetRegister) -- loadp Callee[cfr], targetRegister -+ loadp Callee + PayloadOffset[cfr], targetRegister - loadp JSFunction::m_executable[targetRegister], targetRegister - loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister - end - - macro functionForConstructCodeBlockGetter(targetRegister) -- loadp Callee[cfr], targetRegister -+ loadp Callee + PayloadOffset[cfr], targetRegister - loadp JSFunction::m_executable[targetRegister], targetRegister - loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister - end diff --git a/webkitgtk-2.4.9-cloop_fix_2_4.patch b/webkitgtk-2.4.9-cloop_fix_2_4.patch new file mode 100644 index 0000000..aad575c --- /dev/null +++ b/webkitgtk-2.4.9-cloop_fix_2_4.patch @@ -0,0 +1,121 @@ +diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_2_4 webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +--- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_2_4 2016-03-07 11:32:36.130671900 +0100 ++++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-03-07 13:15:35.451673413 +0100 +@@ -321,7 +321,7 @@ macro doCallToJavaScript(makeCall, doRet + + .calleeFramePopped: + loadp Callee[cfr], temp3 # VM.topCallFrame +- loadp ScopeChain[cfr], temp4 ++ loadp ScopeChain + PayloadOffset[cfr], temp4 + storep temp4, [temp3] + + doReturn(extraStackSpace) +@@ -598,7 +598,7 @@ end + + + macro branchIfException(label) +- loadp ScopeChain[cfr], t3 ++ loadp ScopeChain + PayloadOffset[cfr], t3 + andp MarkedBlockMask, t3 + loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 + bieq VM::m_exception + TagOffset[t3], EmptyValueTag, .noException +@@ -2039,7 +2039,7 @@ _llint_op_catch: + # the interpreter's throw trampoline (see _llint_throw_trampoline). + # The throwing code must have known that we were throwing to the interpreter, + # and have set VM::targetInterpreterPCForThrow. +- loadp ScopeChain[cfr], t3 ++ loadp ScopeChain + PayloadOffset[cfr], t3 + andp MarkedBlockMask, t3 + loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 + loadp VM::callFrameForThrow[t3], cfr +@@ -2122,7 +2122,7 @@ macro nativeCallTrampoline(executableOff + storei CellTag, ScopeChain + TagOffset[cfr] + storei t1, ScopeChain + PayloadOffset[cfr] + if X86 +- loadp ScopeChain[cfr], t3 ++ loadp PayloadOffset + ScopeChain[cfr], t3 + andp MarkedBlockMask, t3 + loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 + storep cfr, VM::topCallFrame[t3] +@@ -2135,11 +2135,11 @@ macro nativeCallTrampoline(executableOff + move t0, cfr + call executableOffsetToFunction[t1] + addp 16 - 4, sp +- loadp ScopeChain[cfr], t3 ++ loadp PayloadOffset + ScopeChain[cfr], t3 + andp MarkedBlockMask, t3 + loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 + elsif ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS or SH4 +- loadp ScopeChain[cfr], t3 ++ loadp PayloadOffset + ScopeChain[cfr], t3 + andp MarkedBlockMask, t3 + loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 + storep cfr, VM::topCallFrame[t3] +@@ -2155,11 +2155,11 @@ macro nativeCallTrampoline(executableOff + end + call executableOffsetToFunction[t1] + restoreReturnAddressBeforeReturn(t3) +- loadp ScopeChain[cfr], t3 ++ loadp PayloadOffset + ScopeChain[cfr], t3 + andp MarkedBlockMask, t3 + loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 + elsif C_LOOP +- loadp ScopeChain[cfr], t3 ++ loadp PayloadOffset + ScopeChain[cfr], t3 + andp MarkedBlockMask, t3 + loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 + storep cfr, VM::topCallFrame[t3] +@@ -2172,7 +2172,7 @@ macro nativeCallTrampoline(executableOff + move t2, cfr + cloopCallNative executableOffsetToFunction[t1] + restoreReturnAddressBeforeReturn(t3) +- loadp ScopeChain[cfr], t3 ++ loadp PayloadOffset + ScopeChain[cfr], t3 + andp MarkedBlockMask, t3 + loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 + else +@@ -2212,7 +2212,7 @@ macro resolveScope() + addi 1, t2 + + .resolveScopeAfterActivationCheck: +- loadp ScopeChain[cfr], t0 ++ loadp ScopeChain + PayloadOffset[cfr], t0 + btiz t2, .resolveScopeLoopEnd + + .resolveScopeLoop: +@@ -2271,7 +2271,7 @@ _llint_op_resolve_scope: + + macro loadWithStructureCheck(operand, slowPath) + loadisFromInstruction(operand, t0) +- loadp [cfr, t0, 8], t0 ++ loadp PayloadOffset[cfr, t0, 8], t0 + loadpFromInstruction(5, t1) + bpneq JSCell::m_structure[t0], t1, slowPath + end +diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_2_4 webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter.asm +--- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_2_4 2015-05-20 11:03:24.000000000 +0200 ++++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-03-07 11:32:36.129671904 +0100 +@@ -299,13 +299,21 @@ macro assertNotConstant(index) + end + + macro functionForCallCodeBlockGetter(targetRegister) +- loadp Callee[cfr], targetRegister ++ if JSVALUE64 ++ loadp Callee[cfr], targetRegister ++ else ++ loadp Callee + PayloadOffset[cfr], targetRegister ++ end + loadp JSFunction::m_executable[targetRegister], targetRegister + loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister + end + + macro functionForConstructCodeBlockGetter(targetRegister) +- loadp Callee[cfr], targetRegister ++ if JSVALUE64 ++ loadp Callee[cfr], targetRegister ++ else ++ loadp Callee + PayloadOffset[cfr], targetRegister ++ end + loadp JSFunction::m_executable[targetRegister], targetRegister + loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister + end diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 82cfcd6..c21ce76 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -21,21 +21,19 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz # https://bugs.webkit.org/show_bug.cgi?id=130506 - 2.4.10 Patch0: webkitgtk-aarch64.patch -# not upstreamed! -Patch1: webkitgtk-2.4.1-cloop_fix.patch -# not upstreamed - applied just on 32-bit architectures! -Patch2: webkitgtk-2.4.5-cloop_fix_32.patch -# https://bugs.webkit.org/show_bug.cgi?id=130237 - 2.4.10 -Patch3: webkitgtk-2.4.1-ppc64_align.patch -# https://bugs.webkit.org/show_bug.cgi?id=142074 -Patch4: webkitgtk-2.4.8-user-agent.patch -# http://trac.webkit.org/changeset/169665 - 2.4.10 -Patch5: webkitgtk-2.4.9-sql_initialize_string.patch -Patch6: webkitgtk-2.4.9-abs.patch -# https://bugs.webkit.org/show_bug.cgi?id=131449 - 2.4.10 -Patch7: webkitgtk-2.4.1-jsc_proto_call_frame.patch +# https://bugs.webkit.org/show_bug.cgi?id=137020 - backported to 2.4 branch +Patch1: webkitgtk-2.4.1-jsc_proto_call_frame.patch # https://bugs.webkit.org/show_bug.cgi?id=132333 - never got r+ but used in Fedora for a long time -Patch8: webkitgtk-2.4.1-cloop_operations_scope.patch +Patch2: webkitgtk-2.4.1-cloop_operations_scope.patch +# https://bugs.webkit.org/show_bug.cgi?id=130237 - 2.4.10 +Patch3: webkitgtk-2.4.9-cloop_fix_2_4.patch +# https://bugs.webkit.org/show_bug.cgi?id=131449 - 2.4.10 +Patch4: webkitgtk-2.4.1-ppc64_align.patch +# https://bugs.webkit.org/show_bug.cgi?id=142074 +Patch5: webkitgtk-2.4.8-user-agent.patch +# http://trac.webkit.org/changeset/169665 - 2.4.10 +Patch6: webkitgtk-2.4.9-sql_initialize_string.patch +Patch7: webkitgtk-2.4.9-abs.patch BuildRequires: at-spi2-core-devel @@ -102,18 +100,15 @@ This package contains developer documentation for %{name}. %prep %setup -qn "webkitgtk-%{version}" %patch0 -p1 -b .aarch64 -%patch1 -p1 -b .cloop_fix -%patch7 -p1 -b .jsc_proto_call_frame -%patch8 -p1 -b .cloop_operations_scope -%patch4 -p1 -b .user_agent -%patch5 -p1 -b .sql_initialize_string -%patch6 -p1 -b .abs -%ifarch ppc s390 mips -%patch2 -p1 -b .cloop_fix_32 -%endif +%patch1 -p1 -b .jsc_proto_call_frame +%patch2 -p1 -b .cloop_operations_scope +%patch3 -p1 -b .cloop_fix_2_4 %ifarch %{power64} aarch64 ppc -%patch3 -p1 -b .ppc64_align +%patch4 -p1 -b .ppc64_align %endif +%patch5 -p1 -b .user_agent +%patch6 -p1 -b .sql_initialize_string +%patch7 -p1 -b .abs %build # Use linker flags to reduce memory consumption From 147aac44d999e8d6d1f2aeff2972d2c93bf19cf1 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 10 Mar 2016 15:51:38 +0100 Subject: [PATCH 199/211] Update the CLoop patches --- webkitgtk-2.4.9-cloop_fix_2_4.patch | 30 ++++++++++++++++++++++++----- webkitgtk3.spec | 4 ++-- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/webkitgtk-2.4.9-cloop_fix_2_4.patch b/webkitgtk-2.4.9-cloop_fix_2_4.patch index aad575c..1a50e56 100644 --- a/webkitgtk-2.4.9-cloop_fix_2_4.patch +++ b/webkitgtk-2.4.9-cloop_fix_2_4.patch @@ -1,11 +1,13 @@ diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_2_4 webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm ---- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_2_4 2016-03-07 11:32:36.130671900 +0100 -+++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-03-07 13:15:35.451673413 +0100 -@@ -321,7 +321,7 @@ macro doCallToJavaScript(makeCall, doRet +--- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_2_4 2016-03-10 15:41:33.812926852 +0100 ++++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-03-10 15:47:56.326522861 +0100 +@@ -320,8 +320,8 @@ macro doCallToJavaScript(makeCall, doRet + loadp CallerFrame[cfr], cfr .calleeFramePopped: - loadp Callee[cfr], temp3 # VM.topCallFrame +- loadp Callee[cfr], temp3 # VM.topCallFrame - loadp ScopeChain[cfr], temp4 ++ loadp Callee + PayloadOffset[cfr], temp3 # VM.topCallFrame + loadp ScopeChain + PayloadOffset[cfr], temp4 storep temp4, [temp3] @@ -19,6 +21,24 @@ diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.as andp MarkedBlockMask, t3 loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 bieq VM::m_exception + TagOffset[t3], EmptyValueTag, .noException +@@ -1574,7 +1574,7 @@ _llint_op_get_by_pname: + loadp JSCell::m_structure[t2], t0 + bpneq t0, JSPropertyNameIterator::m_cachedStructure[t3], .opGetByPnameSlow + loadi 24[PC], t0 +- loadi [cfr, t0, 8], t0 ++ loadi PayloadOffset[cfr, t0, 8], t0 + subi 1, t0 + biaeq t0, JSPropertyNameIterator::m_numCacheableSlots[t3], .opGetByPnameSlow + bilt t0, JSPropertyNameIterator::m_cachedStructureInlineCapacity[t3], .opGetByPnameInlineProperty +@@ -2002,7 +2002,7 @@ _llint_op_next_pname: + loadi 20[PC], t2 + loadi PayloadOffset[cfr, t2, 8], t2 + loadp JSPropertyNameIterator::m_jsStrings[t2], t3 +- loadi [t3, t0, 8], t3 ++ loadi PayloadOffset[t3, t0, 8], t3 + addi 1, t0 + storei t0, PayloadOffset[cfr, t1, 8] + loadi 4[PC], t1 @@ -2039,7 +2039,7 @@ _llint_op_catch: # the interpreter's throw trampoline (see _llint_throw_trampoline). # The throwing code must have known that we were throwing to the interpreter, @@ -94,7 +114,7 @@ diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.as end diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_2_4 webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter.asm --- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_2_4 2015-05-20 11:03:24.000000000 +0200 -+++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-03-07 11:32:36.129671904 +0100 ++++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-03-10 15:41:33.815926841 +0100 @@ -299,13 +299,21 @@ macro assertNotConstant(index) end diff --git a/webkitgtk3.spec b/webkitgtk3.spec index c21ce76..eb32e23 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -21,11 +21,11 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz # https://bugs.webkit.org/show_bug.cgi?id=130506 - 2.4.10 Patch0: webkitgtk-aarch64.patch -# https://bugs.webkit.org/show_bug.cgi?id=137020 - backported to 2.4 branch +# https://bugs.webkit.org/show_bug.cgi?id=130237 - 2.4.10 Patch1: webkitgtk-2.4.1-jsc_proto_call_frame.patch # https://bugs.webkit.org/show_bug.cgi?id=132333 - never got r+ but used in Fedora for a long time Patch2: webkitgtk-2.4.1-cloop_operations_scope.patch -# https://bugs.webkit.org/show_bug.cgi?id=130237 - 2.4.10 +# https://bugs.webkit.org/show_bug.cgi?id=137020 - backported to 2.4 branch Patch3: webkitgtk-2.4.9-cloop_fix_2_4.patch # https://bugs.webkit.org/show_bug.cgi?id=131449 - 2.4.10 Patch4: webkitgtk-2.4.1-ppc64_align.patch From 405f7eac201f14ea9085d9c025ae137cb2ca2942 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 14 Mar 2016 11:33:02 +0100 Subject: [PATCH 200/211] Update to 2.4.10 --- sources | 2 +- webkitgtk-2.4.1-cloop_operations_scope.patch | 99 ------------- webkitgtk-2.4.1-jsc_proto_call_frame.patch | 45 ------ webkitgtk-2.4.1-ppc64_align.patch | 45 ------ webkitgtk-2.4.9-cloop_fix_2_4.patch | 141 ------------------- webkitgtk-2.4.9-sql_initialize_string.patch | 12 -- webkitgtk-aarch64.patch | 39 ----- webkitgtk3.spec | 35 ++--- 8 files changed, 10 insertions(+), 408 deletions(-) delete mode 100644 webkitgtk-2.4.1-cloop_operations_scope.patch delete mode 100644 webkitgtk-2.4.1-jsc_proto_call_frame.patch delete mode 100644 webkitgtk-2.4.1-ppc64_align.patch delete mode 100644 webkitgtk-2.4.9-cloop_fix_2_4.patch delete mode 100644 webkitgtk-2.4.9-sql_initialize_string.patch delete mode 100644 webkitgtk-aarch64.patch diff --git a/sources b/sources index 1f8355d..65e6d9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -312fd29eb7f5970660c6a64b8bf8420e webkitgtk-2.4.9.tar.xz +1b3f18d4087dfc648e8060c14e16e202 webkitgtk-2.4.10.tar.xz diff --git a/webkitgtk-2.4.1-cloop_operations_scope.patch b/webkitgtk-2.4.1-cloop_operations_scope.patch deleted file mode 100644 index e7b6415..0000000 --- a/webkitgtk-2.4.1-cloop_operations_scope.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_operations_scope webkitgtk-2.4.9/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp ---- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_operations_scope 2015-05-20 11:03:24.000000000 +0200 -+++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-03-07 10:15:36.659406501 +0100 -@@ -1354,7 +1354,7 @@ LLINT_SLOW_PATH_DECL(slow_path_get_from_ - CodeBlock* codeBlock = exec->codeBlock(); - ConcurrentJITLocker locker(codeBlock->m_lock); - pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure()); -- pc[6].u.operand = slot.cachedOffset(); -+ pc[6].u.pointer = reinterpret_cast(slot.cachedOffset()); - } - } - -@@ -1381,7 +1381,7 @@ LLINT_SLOW_PATH_DECL(slow_path_put_to_sc - if (slot.isCacheable() && slot.base() == scope && scope->structure()->propertyAccessesAreCacheable()) { - ConcurrentJITLocker locker(codeBlock->m_lock); - pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure()); -- pc[6].u.operand = slot.cachedOffset(); -+ pc[6].u.pointer = reinterpret_cast(slot.cachedOffset()); - } - } - -diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_operations_scope webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm ---- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_operations_scope 2016-03-07 10:15:36.657406514 +0100 -+++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-03-07 10:16:01.854239892 +0100 -@@ -2277,7 +2277,7 @@ macro loadWithStructureCheck(operand, sl - end - - macro getProperty() -- loadisFromInstruction(6, t3) -+ loadpFromInstruction(6, t3) - loadPropertyAtVariableOffset(t3, t0, t1, t2) - valueProfile(t1, t2, 28, t0) - loadisFromInstruction(1, t0) -@@ -2297,7 +2297,7 @@ end - - macro getClosureVar() - loadp JSVariableObject::m_registers[t0], t0 -- loadisFromInstruction(6, t3) -+ loadpFromInstruction(6, t3) - loadp TagOffset[t0, t3, 8], t1 - loadp PayloadOffset[t0, t3, 8], t2 - valueProfile(t1, t2, 28, t0) -@@ -2356,7 +2356,7 @@ _llint_op_get_from_scope: - macro putProperty() - loadisFromInstruction(3, t1) - loadConstantOrVariable(t1, t2, t3) -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - storePropertyAtVariableOffset(t1, t0, t2, t3) - end - -@@ -2374,7 +2374,7 @@ macro putClosureVar() - loadisFromInstruction(3, t1) - loadConstantOrVariable(t1, t2, t3) - loadp JSVariableObject::m_registers[t0], t0 -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - storei t2, TagOffset[t0, t1, 8] - storei t3, PayloadOffset[t0, t1, 8] - end -diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_operations_scope webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm ---- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_operations_scope 2016-03-07 10:15:36.658406508 +0100 -+++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-03-07 10:15:36.660406494 +0100 -@@ -2047,7 +2047,7 @@ macro loadWithStructureCheck(operand, sl - end - - macro getProperty() -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - loadPropertyAtVariableOffset(t1, t0, t2) - valueProfile(t2, 7, t0) - loadisFromInstruction(1, t0) -@@ -2064,7 +2064,7 @@ end - - macro getClosureVar() - loadp JSVariableObject::m_registers[t0], t0 -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - loadq [t0, t1, 8], t0 - valueProfile(t0, 7, t1) - loadisFromInstruction(1, t1) -@@ -2121,7 +2121,7 @@ _llint_op_get_from_scope: - macro putProperty() - loadisFromInstruction(3, t1) - loadConstantOrVariable(t1, t2) -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - storePropertyAtVariableOffset(t1, t0, t2) - end - -@@ -2138,7 +2138,7 @@ macro putClosureVar() - loadisFromInstruction(3, t1) - loadConstantOrVariable(t1, t2) - loadp JSVariableObject::m_registers[t0], t0 -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - storeq t2, [t0, t1, 8] - end - diff --git a/webkitgtk-2.4.1-jsc_proto_call_frame.patch b/webkitgtk-2.4.1-jsc_proto_call_frame.patch deleted file mode 100644 index b80751c..0000000 --- a/webkitgtk-2.4.1-jsc_proto_call_frame.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up webkitgtk-2.4.9/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.jsc_proto_call_frame webkitgtk-2.4.9/Source/JavaScriptCore/interpreter/ProtoCallFrame.h ---- webkitgtk-2.4.9/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.jsc_proto_call_frame 2016-03-07 10:04:24.425851848 +0100 -+++ webkitgtk-2.4.9/Source/JavaScriptCore/interpreter/ProtoCallFrame.h 2016-03-07 10:04:53.193661612 +0100 -@@ -36,7 +36,7 @@ struct ProtoCallFrame { - Register calleeValue; - Register argCountAndCodeOriginValue; - Register thisArg; -- size_t paddedArgCount; -+ uint32_t paddedArgCount; - JSValue *args; - - void init(CodeBlock*, JSScope*, JSObject*, JSValue, int, JSValue* otherArgs = 0); -@@ -53,7 +53,7 @@ struct ProtoCallFrame { - int argumentCountIncludingThis() const { return argCountAndCodeOriginValue.payload(); } - int argumentCount() const { return argumentCountIncludingThis() - 1; } - void setArgumentCountIncludingThis(int count) { argCountAndCodeOriginValue.payload() = count; } -- void setPaddedArgsCount(size_t argCount) { paddedArgCount = argCount; } -+ void setPaddedArgsCount(uint32_t argCount) { paddedArgCount = argCount; } - - void clearCurrentVPC() { argCountAndCodeOriginValue.tag() = 0; } - -diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.jsc_proto_call_frame webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm ---- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.jsc_proto_call_frame 2016-03-07 10:05:28.754426456 +0100 -+++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-03-07 10:06:02.349204301 +0100 -@@ -266,7 +266,7 @@ macro doCallToJavaScript(makeCall, doRet - storep previousCFR, CallerFrame[cfr] - move cfr, temp1 - -- loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp2 -+ loadi PayloadOffset + ProtoCallFrame::paddedArgCount[protoCallFrame], temp2 - addp CallFrameHeaderSlots, temp2, temp2 - lshiftp 3, temp2 - subp temp2, cfr -diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.jsc_proto_call_frame webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm ---- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.jsc_proto_call_frame 2016-03-07 10:05:34.843386191 +0100 -+++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-03-07 10:06:23.245066120 +0100 -@@ -157,7 +157,7 @@ macro doCallToJavaScript(makeCall, doRet - storep previousCFR, CallerFrame[cfr] - move cfr, temp1 - -- loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp2 -+ loadi PayloadOffset + ProtoCallFrame::paddedArgCount[protoCallFrame], temp2 - addp CallFrameHeaderSlots, temp2, temp2 - lshiftp 3, temp2 - subp temp2, cfr diff --git a/webkitgtk-2.4.1-ppc64_align.patch b/webkitgtk-2.4.1-ppc64_align.patch deleted file mode 100644 index 5186d60..0000000 --- a/webkitgtk-2.4.1-ppc64_align.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h ---- webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align 2014-05-12 08:03:53.000000000 +0200 -+++ webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h 2014-05-14 15:16:36.946318596 +0200 -@@ -81,7 +81,7 @@ public: - size_t size(); - size_t capacity(); - -- static const size_t blockSize = 32 * KB; -+ static const size_t blockSize = 64 * KB; - - bool hasWorkList(); - CopyWorkList& workList(); -diff -up webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp ---- webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align 2014-05-12 08:03:53.000000000 +0200 -+++ webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp 2014-05-14 15:17:35.617171141 +0200 -@@ -49,7 +49,8 @@ JSStack::JSStack(VM& vm, size_t capacity - { - ASSERT(capacity && isPageAligned(capacity)); - -- m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitSize), OSAllocator::JSVMStackPages); -+ size_t commitsize = pageSize(); -+ m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitsize), OSAllocator::JSVMStackPages); - updateStackLimit(highAddress()); - m_commitEnd = highAddress(); - -@@ -78,7 +79,8 @@ bool JSStack::growSlowCase(Register* new - // Compute the chunk size of additional memory to commit, and see if we - // have it is still within our budget. If not, we'll fail to grow and - // return false. -- long delta = roundUpAllocationSize(reinterpret_cast(m_commitEnd) - reinterpret_cast(newEnd), commitSize); -+ size_t commitsize = pageSize(); -+ long delta = roundUpAllocationSize(reinterpret_cast(m_commitEnd) - reinterpret_cast(newEnd), commitsize); - if (reinterpret_cast(m_commitEnd) - delta <= reinterpret_cast(m_useableEnd)) - return false; - -@@ -134,7 +136,8 @@ void JSStack::enableErrorStackReserve() - - void JSStack::disableErrorStackReserve() - { -- char* useableEnd = reinterpret_cast(reservationEnd()) + commitSize; -+ size_t commitsize = pageSize(); -+ char* useableEnd = reinterpret_cast(reservationEnd()) + commitsize; - m_useableEnd = reinterpret_cast_ptr(useableEnd); - - // By the time we get here, we are guaranteed to be destructing the last diff --git a/webkitgtk-2.4.9-cloop_fix_2_4.patch b/webkitgtk-2.4.9-cloop_fix_2_4.patch deleted file mode 100644 index 1a50e56..0000000 --- a/webkitgtk-2.4.9-cloop_fix_2_4.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_2_4 webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm ---- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_2_4 2016-03-10 15:41:33.812926852 +0100 -+++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-03-10 15:47:56.326522861 +0100 -@@ -320,8 +320,8 @@ macro doCallToJavaScript(makeCall, doRet - loadp CallerFrame[cfr], cfr - - .calleeFramePopped: -- loadp Callee[cfr], temp3 # VM.topCallFrame -- loadp ScopeChain[cfr], temp4 -+ loadp Callee + PayloadOffset[cfr], temp3 # VM.topCallFrame -+ loadp ScopeChain + PayloadOffset[cfr], temp4 - storep temp4, [temp3] - - doReturn(extraStackSpace) -@@ -598,7 +598,7 @@ end - - - macro branchIfException(label) -- loadp ScopeChain[cfr], t3 -+ loadp ScopeChain + PayloadOffset[cfr], t3 - andp MarkedBlockMask, t3 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 - bieq VM::m_exception + TagOffset[t3], EmptyValueTag, .noException -@@ -1574,7 +1574,7 @@ _llint_op_get_by_pname: - loadp JSCell::m_structure[t2], t0 - bpneq t0, JSPropertyNameIterator::m_cachedStructure[t3], .opGetByPnameSlow - loadi 24[PC], t0 -- loadi [cfr, t0, 8], t0 -+ loadi PayloadOffset[cfr, t0, 8], t0 - subi 1, t0 - biaeq t0, JSPropertyNameIterator::m_numCacheableSlots[t3], .opGetByPnameSlow - bilt t0, JSPropertyNameIterator::m_cachedStructureInlineCapacity[t3], .opGetByPnameInlineProperty -@@ -2002,7 +2002,7 @@ _llint_op_next_pname: - loadi 20[PC], t2 - loadi PayloadOffset[cfr, t2, 8], t2 - loadp JSPropertyNameIterator::m_jsStrings[t2], t3 -- loadi [t3, t0, 8], t3 -+ loadi PayloadOffset[t3, t0, 8], t3 - addi 1, t0 - storei t0, PayloadOffset[cfr, t1, 8] - loadi 4[PC], t1 -@@ -2039,7 +2039,7 @@ _llint_op_catch: - # the interpreter's throw trampoline (see _llint_throw_trampoline). - # The throwing code must have known that we were throwing to the interpreter, - # and have set VM::targetInterpreterPCForThrow. -- loadp ScopeChain[cfr], t3 -+ loadp ScopeChain + PayloadOffset[cfr], t3 - andp MarkedBlockMask, t3 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 - loadp VM::callFrameForThrow[t3], cfr -@@ -2122,7 +2122,7 @@ macro nativeCallTrampoline(executableOff - storei CellTag, ScopeChain + TagOffset[cfr] - storei t1, ScopeChain + PayloadOffset[cfr] - if X86 -- loadp ScopeChain[cfr], t3 -+ loadp PayloadOffset + ScopeChain[cfr], t3 - andp MarkedBlockMask, t3 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 - storep cfr, VM::topCallFrame[t3] -@@ -2135,11 +2135,11 @@ macro nativeCallTrampoline(executableOff - move t0, cfr - call executableOffsetToFunction[t1] - addp 16 - 4, sp -- loadp ScopeChain[cfr], t3 -+ loadp PayloadOffset + ScopeChain[cfr], t3 - andp MarkedBlockMask, t3 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 - elsif ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS or SH4 -- loadp ScopeChain[cfr], t3 -+ loadp PayloadOffset + ScopeChain[cfr], t3 - andp MarkedBlockMask, t3 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 - storep cfr, VM::topCallFrame[t3] -@@ -2155,11 +2155,11 @@ macro nativeCallTrampoline(executableOff - end - call executableOffsetToFunction[t1] - restoreReturnAddressBeforeReturn(t3) -- loadp ScopeChain[cfr], t3 -+ loadp PayloadOffset + ScopeChain[cfr], t3 - andp MarkedBlockMask, t3 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 - elsif C_LOOP -- loadp ScopeChain[cfr], t3 -+ loadp PayloadOffset + ScopeChain[cfr], t3 - andp MarkedBlockMask, t3 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 - storep cfr, VM::topCallFrame[t3] -@@ -2172,7 +2172,7 @@ macro nativeCallTrampoline(executableOff - move t2, cfr - cloopCallNative executableOffsetToFunction[t1] - restoreReturnAddressBeforeReturn(t3) -- loadp ScopeChain[cfr], t3 -+ loadp PayloadOffset + ScopeChain[cfr], t3 - andp MarkedBlockMask, t3 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 - else -@@ -2212,7 +2212,7 @@ macro resolveScope() - addi 1, t2 - - .resolveScopeAfterActivationCheck: -- loadp ScopeChain[cfr], t0 -+ loadp ScopeChain + PayloadOffset[cfr], t0 - btiz t2, .resolveScopeLoopEnd - - .resolveScopeLoop: -@@ -2271,7 +2271,7 @@ _llint_op_resolve_scope: - - macro loadWithStructureCheck(operand, slowPath) - loadisFromInstruction(operand, t0) -- loadp [cfr, t0, 8], t0 -+ loadp PayloadOffset[cfr, t0, 8], t0 - loadpFromInstruction(5, t1) - bpneq JSCell::m_structure[t0], t1, slowPath - end -diff -up webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_2_4 webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter.asm ---- webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_2_4 2015-05-20 11:03:24.000000000 +0200 -+++ webkitgtk-2.4.9/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-03-10 15:41:33.815926841 +0100 -@@ -299,13 +299,21 @@ macro assertNotConstant(index) - end - - macro functionForCallCodeBlockGetter(targetRegister) -- loadp Callee[cfr], targetRegister -+ if JSVALUE64 -+ loadp Callee[cfr], targetRegister -+ else -+ loadp Callee + PayloadOffset[cfr], targetRegister -+ end - loadp JSFunction::m_executable[targetRegister], targetRegister - loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister - end - - macro functionForConstructCodeBlockGetter(targetRegister) -- loadp Callee[cfr], targetRegister -+ if JSVALUE64 -+ loadp Callee[cfr], targetRegister -+ else -+ loadp Callee + PayloadOffset[cfr], targetRegister -+ end - loadp JSFunction::m_executable[targetRegister], targetRegister - loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister - end diff --git a/webkitgtk-2.4.9-sql_initialize_string.patch b/webkitgtk-2.4.9-sql_initialize_string.patch deleted file mode 100644 index a34ef14..0000000 --- a/webkitgtk-2.4.9-sql_initialize_string.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp ---- webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string 2015-09-14 09:25:43.004200172 +0200 -+++ webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp 2015-09-14 09:25:57.852082368 +0200 -@@ -71,7 +71,7 @@ int SQLiteStatement::prepare() - // this lets SQLite avoid an extra string copy. - size_t lengthIncludingNullCharacter = query.length() + 1; - -- const char* tail; -+ const char* tail = nullptr; - int error = sqlite3_prepare_v2(m_database.sqlite3Handle(), query.data(), lengthIncludingNullCharacter, &m_statement, &tail); - - if (error != SQLITE_OK) diff --git a/webkitgtk-aarch64.patch b/webkitgtk-aarch64.patch deleted file mode 100644 index 6a82264..0000000 --- a/webkitgtk-aarch64.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h.aarch64 webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h ---- webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h.aarch64 2015-05-20 11:03:24.000000000 +0200 -+++ webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h 2015-05-20 13:45:35.629023925 +0200 -@@ -49,7 +49,7 @@ - defined(__ARMEL__) || \ - defined(_MIPS_ARCH_MIPS32R2) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 --#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) -+#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || 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 -up webkitgtk-2.4.9/Source/WTF/wtf/Platform.h.aarch64 webkitgtk-2.4.9/Source/WTF/wtf/Platform.h ---- webkitgtk-2.4.9/Source/WTF/wtf/Platform.h.aarch64 2015-05-20 11:03:24.000000000 +0200 -+++ webkitgtk-2.4.9/Source/WTF/wtf/Platform.h 2015-05-20 13:47:34.439861401 +0200 -@@ -334,6 +334,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 ==== */ - -@@ -654,7 +662,7 @@ - #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ - || (CPU(IA64) && !CPU(IA64_32)) \ - || CPU(ALPHA) \ -- || CPU(ARM64) \ -+ || CPU(AARCH64) \ - || CPU(S390X) \ - || CPU(MIPS64) \ - || CPU(PPC64) \ diff --git a/webkitgtk3.spec b/webkitgtk3.spec index eb32e23..9cfdae2 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -9,8 +9,8 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.4.9 -Release: 10%{?dist} +Version: 2.4.10 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -19,21 +19,9 @@ URL: http://www.webkitgtk.org/ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz -# https://bugs.webkit.org/show_bug.cgi?id=130506 - 2.4.10 -Patch0: webkitgtk-aarch64.patch -# https://bugs.webkit.org/show_bug.cgi?id=130237 - 2.4.10 -Patch1: webkitgtk-2.4.1-jsc_proto_call_frame.patch -# https://bugs.webkit.org/show_bug.cgi?id=132333 - never got r+ but used in Fedora for a long time -Patch2: webkitgtk-2.4.1-cloop_operations_scope.patch -# https://bugs.webkit.org/show_bug.cgi?id=137020 - backported to 2.4 branch -Patch3: webkitgtk-2.4.9-cloop_fix_2_4.patch -# https://bugs.webkit.org/show_bug.cgi?id=131449 - 2.4.10 -Patch4: webkitgtk-2.4.1-ppc64_align.patch # https://bugs.webkit.org/show_bug.cgi?id=142074 -Patch5: webkitgtk-2.4.8-user-agent.patch -# http://trac.webkit.org/changeset/169665 - 2.4.10 -Patch6: webkitgtk-2.4.9-sql_initialize_string.patch -Patch7: webkitgtk-2.4.9-abs.patch +Patch0: webkitgtk-2.4.8-user-agent.patch +Patch1: webkitgtk-2.4.9-abs.patch BuildRequires: at-spi2-core-devel @@ -99,16 +87,8 @@ This package contains developer documentation for %{name}. %prep %setup -qn "webkitgtk-%{version}" -%patch0 -p1 -b .aarch64 -%patch1 -p1 -b .jsc_proto_call_frame -%patch2 -p1 -b .cloop_operations_scope -%patch3 -p1 -b .cloop_fix_2_4 -%ifarch %{power64} aarch64 ppc -%patch4 -p1 -b .ppc64_align -%endif -%patch5 -p1 -b .user_agent -%patch6 -p1 -b .sql_initialize_string -%patch7 -p1 -b .abs +%patch0 -p1 -b .user_agent +%patch1 -p1 -b .abs %build # Use linker flags to reduce memory consumption @@ -216,6 +196,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Mon Mar 14 2016 Tomas Popela - 2.4.10-1 +- Update to 2.4.10 + * Tue Feb 9 2016 Peter Robinson 2.4.9-10 - Add ruby deps for build From d95fe126002a6fca2e1fc943760afcc3b8e8d79a Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 24 Mar 2016 10:46:33 +0100 Subject: [PATCH 201/211] Add a workaround for rhbz#1320240 --- webkitgtk3.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 9cfdae2..ad3b781 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -108,6 +108,11 @@ This package contains developer documentation for %{name}. %global optflags %{optflags} -DENABLE_YARR_JIT=0 %endif +# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1320240 +%ifarch s390 s390x ppc %{power64} aarch64 %{mips} +%global optflags %{optflags} -fno-delete-null-pointer-checks +%endif + %if 0%{?fedora} %global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"Fedora\\"\' %endif @@ -196,6 +201,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Thu Mar 24 2016 Tomas Popela - 2.4.10-2 +- Add a workaround for rhbz#1320240 + * Mon Mar 14 2016 Tomas Popela - 2.4.10-1 - Update to 2.4.10 From 465c7452185d59bb186c41ccc88c823f1daa0682 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 5 Apr 2016 10:00:09 +0200 Subject: [PATCH 202/211] rhbz#1321722 - [abrt] evolution: WTF::StringImpl::startsWith(): SIGSEGV with webkitgtk3-2.4.10 --- webkitgtk3.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index ad3b781..16255db 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -22,7 +22,8 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz # https://bugs.webkit.org/show_bug.cgi?id=142074 Patch0: webkitgtk-2.4.8-user-agent.patch Patch1: webkitgtk-2.4.9-abs.patch - +# http://trac.webkit.org/changeset/165044 +Patch2: webkitgtk-2.4.10-qualified-name.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -89,6 +90,7 @@ This package contains developer documentation for %{name}. %setup -qn "webkitgtk-%{version}" %patch0 -p1 -b .user_agent %patch1 -p1 -b .abs +%patch2 -p1 -b .qualified-name %build # Use linker flags to reduce memory consumption @@ -201,6 +203,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Apr 05 2016 Tomas Popela - 2.4.10-3 +- rhbz#1321722 - [abrt] evolution: WTF::StringImpl::startsWith(): SIGSEGV with webkitgtk3-2.4.10 + * Thu Mar 24 2016 Tomas Popela - 2.4.10-2 - Add a workaround for rhbz#1320240 From 8b3d6b636715019e6800513688d653974246ecde Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 5 Apr 2016 10:01:24 +0200 Subject: [PATCH 203/211] Add the missing patch --- webkitgtk-2.4.10-qualified-name.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 webkitgtk-2.4.10-qualified-name.patch diff --git a/webkitgtk-2.4.10-qualified-name.patch b/webkitgtk-2.4.10-qualified-name.patch new file mode 100644 index 0000000..6bd2dd3 --- /dev/null +++ b/webkitgtk-2.4.10-qualified-name.patch @@ -0,0 +1,12 @@ +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); From 08249ae1be0bc4e7f4f83001ff414b4d54ffd457 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 6 Apr 2016 07:48:54 +0200 Subject: [PATCH 204/211] Fix the compilation on aarch64 --- webkitgtk-2.4.10-arm64-asm.patch | 108 +++++++++++++++++++++++++++++++ webkitgtk-2.4.10-arm64-gcc.patch | 45 +++++++++++++ webkitgtk3.spec | 11 +++- 3 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.4.10-arm64-asm.patch create mode 100644 webkitgtk-2.4.10-arm64-gcc.patch diff --git a/webkitgtk-2.4.10-arm64-asm.patch b/webkitgtk-2.4.10-arm64-asm.patch new file mode 100644 index 0000000..c5d8695 --- /dev/null +++ b/webkitgtk-2.4.10-arm64-asm.patch @@ -0,0 +1,108 @@ +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 new file mode 100644 index 0000000..bad1e64 --- /dev/null +++ b/webkitgtk-2.4.10-arm64-gcc.patch @@ -0,0 +1,45 @@ +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/webkitgtk3.spec b/webkitgtk3.spec index 16255db..18901a3 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -24,6 +24,10 @@ Patch0: webkitgtk-2.4.8-user-agent.patch Patch1: webkitgtk-2.4.9-abs.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: at-spi2-core-devel BuildRequires: bison @@ -91,6 +95,8 @@ This package contains developer documentation for %{name}. %patch0 -p1 -b .user_agent %patch1 -p1 -b .abs %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 @@ -203,6 +209,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Tue Apr 05 2016 Tomas Popela - 2.4.10-4 +- Fix the compilation on aarch64 + * Tue Apr 05 2016 Tomas Popela - 2.4.10-3 - rhbz#1321722 - [abrt] evolution: WTF::StringImpl::startsWith(): SIGSEGV with webkitgtk3-2.4.10 From 6b1eb0d89d8099c85a20b9e0463c21a6e1ba8f71 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 11 Apr 2016 08:45:56 +0200 Subject: [PATCH 205/211] 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 --- webkitgtk3.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/webkitgtk3.spec b/webkitgtk3.spec index 18901a3..dd6c8a4 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -9,8 +9,8 @@ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk3 -Version: 2.4.10 -Release: 4%{?dist} +Version: 2.4.11 +Release: 1%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -22,12 +22,6 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz # https://bugs.webkit.org/show_bug.cgi?id=142074 Patch0: webkitgtk-2.4.8-user-agent.patch Patch1: webkitgtk-2.4.9-abs.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: at-spi2-core-devel BuildRequires: bison @@ -94,9 +88,6 @@ This package contains developer documentation for %{name}. %setup -qn "webkitgtk-%{version}" %patch0 -p1 -b .user_agent %patch1 -p1 -b .abs -%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 @@ -109,7 +100,7 @@ This package contains developer documentation for %{name}. %ifarch ppc # Use linker flag -relax to get WebKit2 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 %{mips} @@ -209,6 +200,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %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-4 - Fix the compilation on aarch64 From 1f87ce468b9713abec87f7a3667f830922c6bb11 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 15 Apr 2016 20:17:10 +0200 Subject: [PATCH 206/211] rebuild for ICU 57.1 --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index dd6c8a4..88adc31 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -200,6 +200,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Fri Apr 15 2016 David Tardon - 2.4.11-2 +- rebuild for ICU 57.1 + * Mon Apr 11 2016 Tomas Popela - 2.4.11-1 - Update to 2.4.11 From c64521c782468bfc7390d4b292c11311629e24c4 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 27 Jun 2016 07:30:50 +0200 Subject: [PATCH 207/211] Workaround crashes with gcc 6.1 rhbz#1349856 - Programs using webkitgtk3 compiled with gcc 6.1 crash on start. F.e: midori, xombrero, etc. --- webkitgtk3.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 88adc31..db1a0e1 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -107,10 +107,8 @@ This package contains developer documentation for %{name}. %global optflags %{optflags} -DENABLE_YARR_JIT=0 %endif -# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1320240 -%ifarch s390 s390x ppc %{power64} aarch64 %{mips} +# Workaround crashes with gcc 6.1 %global optflags %{optflags} -fno-delete-null-pointer-checks -%endif %if 0%{?fedora} %global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"Fedora\\"\' @@ -200,6 +198,10 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Fri Jun 24 2016 Tomas Popela - 2.4.11-3 +- Workaround crashes with gcc 6.1 +- rhbz#1349856 - Programs using webkitgtk3 compiled with gcc 6.1 crash on start. F.e: midori, xombrero, etc. + * Fri Apr 15 2016 David Tardon - 2.4.11-2 - rebuild for ICU 57.1 From 9d9718b9328d06fe9c99c1bdff876a06ac63d414 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 26 Sep 2016 09:40:01 +0200 Subject: [PATCH 208/211] Update the package description so it reflects the current state of package. --- webkitgtk3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index db1a0e1..a66b861 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -64,7 +64,7 @@ Requires: geoclue2 WebKitGTK+ is the port of the portable web rendering engine WebKit to the GTK+ platform. -This package contains WebKitGTK+ for GTK+ 3. +This package contains an insecure and deprecated version of WebKitGTK+ for GTK+ 3. Use WebKit2 instead. %package devel Summary: Development files for %{name} From de68f368caedb41ad1b6261908af0d934ccc1cc7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 1 Feb 2017 19:33:11 +0100 Subject: [PATCH 209/211] Rebuild (libwebp) --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index a66b861..5831e25 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -198,6 +198,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Wed Feb 01 2017 Sandro Mani - 2.4.11-4 +- Rebuild (libwebp) + * Fri Jun 24 2016 Tomas Popela - 2.4.11-3 - Workaround crashes with gcc 6.1 - rhbz#1349856 - Programs using webkitgtk3 compiled with gcc 6.1 crash on start. F.e: midori, xombrero, etc. From 38d662017b426adc20215f7f37e190b1f5437d1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:18:55 +0000 Subject: [PATCH 210/211] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- webkitgtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk3.spec b/webkitgtk3.spec index 5831e25..f24275b 100644 --- a/webkitgtk3.spec +++ b/webkitgtk3.spec @@ -10,7 +10,7 @@ Name: webkitgtk3 Version: 2.4.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GTK+ Web content engine library Group: Development/Libraries @@ -198,6 +198,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete %{_datadir}/gtk-doc/html/webkitdomgtk %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.4.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 01 2017 Sandro Mani - 2.4.11-4 - Rebuild (libwebp) From 6f85a399bfceed052fcb929e93c121d6cadfc7e3 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 14 Mar 2017 10:33:22 -0500 Subject: [PATCH 211/211] https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/AKVB363GFCHHJ5MTHGVYHYT6NLLTF5VM/ --- .gitignore | 1 - dead.package | 1 + sources | 1 - webkitgtk-2.4.8-user-agent.patch | 27 -- webkitgtk-2.4.9-abs.patch | 26 -- webkitgtk3.spec | 742 ------------------------------- 6 files changed, 1 insertion(+), 797 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 webkitgtk-2.4.8-user-agent.patch delete mode 100644 webkitgtk-2.4.9-abs.patch delete mode 100644 webkitgtk3.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 90f2733..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/webkitgtk-2.*.tar.xz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a60d10e --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/AKVB363GFCHHJ5MTHGVYHYT6NLLTF5VM/ diff --git a/sources b/sources deleted file mode 100644 index b11eb4f..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -24a25ccc30a7914ae50922aedf24b7bc webkitgtk-2.4.11.tar.xz diff --git a/webkitgtk-2.4.8-user-agent.patch b/webkitgtk-2.4.8-user-agent.patch deleted file mode 100644 index 84b5117..0000000 --- a/webkitgtk-2.4.8-user-agent.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 050232bc122d6785fea01d39121c2f93e8dd16f1 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Thu, 26 Feb 2015 16:06:36 -0600 -Subject: [PATCH] Allow branding the user agent - ---- - Source/WebCore/platform/gtk/UserAgentGtk.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Source/WebCore/platform/gtk/UserAgentGtk.cpp b/Source/WebCore/platform/gtk/UserAgentGtk.cpp -index 91641dc..727fbaf 100644 ---- a/Source/WebCore/platform/gtk/UserAgentGtk.cpp -+++ b/Source/WebCore/platform/gtk/UserAgentGtk.cpp -@@ -84,7 +84,9 @@ static const char* cpuDescriptionForUAString() - - static const char* platformForUAString() - { --#if PLATFORM(X11) -+#if defined USER_AGENT_GTK_DISTRIBUTOR_NAME -+ return USER_AGENT_GTK_DISTRIBUTOR_NAME; -+#elif PLATFORM(X11) - return "X11"; - #elif OS(WINDOWS) - return ""; --- -2.1.0 - diff --git a/webkitgtk-2.4.9-abs.patch b/webkitgtk-2.4.9-abs.patch deleted file mode 100644 index 9a1c5f9..0000000 --- a/webkitgtk-2.4.9-abs.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp ---- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2015-05-20 03:03:24.000000000 -0600 -+++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-02-07 11:30:42.392686308 -0700 -@@ -85,8 +85,8 @@ - guint32 eventTime = getEventTime(event); - - if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) -- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) -- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) -+ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) -+ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) - && (eventTime - m_previousClickTime < static_cast(doubleClickTime)) - && (buttonEvent->button == m_previousClickButton))) - m_currentClickCount++; -diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp ---- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-05-20 03:03:24.000000000 -0600 -+++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-02-07 11:49:36.384691005 -0700 -@@ -659,7 +659,7 @@ - if (!std::isfinite(time)) - return String::fromUTF8(_("indefinite time")); - -- int seconds = static_cast(abs(time)); -+ int seconds = static_cast(fabs(time)); - int days = seconds / (60 * 60 * 24); - int hours = seconds / (60 * 60); - int minutes = (seconds / 60) % 60; diff --git a/webkitgtk3.spec b/webkitgtk3.spec deleted file mode 100644 index f24275b..0000000 --- a/webkitgtk3.spec +++ /dev/null @@ -1,742 +0,0 @@ -# Fix rebuild on non-Fedora -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} - -## NOTE: Lots of files in various subdirectories have the same name (such as -## "LICENSE") so this short macro allows us to distinguish them by using their -## directory names (from the source tree) as prefixes for the files. -%global add_to_doc_files() \ - mkdir -p %{buildroot}%{_pkgdocdir} ||: ; \ - cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') - -Name: webkitgtk3 -Version: 2.4.11 -Release: 5%{?dist} -Summary: GTK+ Web content engine library - -Group: Development/Libraries -License: LGPLv2+ and BSD -URL: http://www.webkitgtk.org/ - -Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz - -# https://bugs.webkit.org/show_bug.cgi?id=142074 -Patch0: webkitgtk-2.4.8-user-agent.patch -Patch1: webkitgtk-2.4.9-abs.patch - -BuildRequires: at-spi2-core-devel -BuildRequires: bison -BuildRequires: cairo-devel -BuildRequires: chrpath -BuildRequires: enchant-devel -BuildRequires: flex -BuildRequires: fontconfig-devel >= 2.5 -BuildRequires: freetype-devel -BuildRequires: geoclue2-devel -BuildRequires: gettext -BuildRequires: gperf -BuildRequires: gstreamer1-devel -BuildRequires: gstreamer1-plugins-base-devel -BuildRequires: gtk2-devel -BuildRequires: gtk3-devel >= 3.6 -BuildRequires: gtk-doc -BuildRequires: glib2-devel >= 2.36.0 -BuildRequires: harfbuzz-devel -BuildRequires: libsoup-devel >= 2.42.0 -BuildRequires: libicu-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: libsecret-devel -BuildRequires: libwebp-devel -BuildRequires: libxslt-devel -BuildRequires: libXt-devel -BuildRequires: pcre-devel -BuildRequires: sqlite-devel -BuildRequires: gobject-introspection-devel >= 1.32.0 -BuildRequires: perl-Switch -BuildRequires: ruby rubypick rubygems -BuildRequires: mesa-libGL-devel -%ifarch ppc -BuildRequires: libatomic -%endif -Requires: geoclue2 - -%description -WebKitGTK+ is the port of the portable web rendering engine WebKit to the -GTK+ platform. - -This package contains an insecure and deprecated version of WebKitGTK+ for GTK+ 3. Use WebKit2 instead. - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -The %{name}-devel package contains libraries, build data, and header -files for developing applications that use %{name}. - -%package doc -Summary: Documentation files for %{name} -Group: Documentation -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description doc -This package contains developer documentation for %{name}. - -%prep -%setup -qn "webkitgtk-%{version}" -%patch0 -p1 -b .user_agent -%patch1 -p1 -b .abs - -%build -# Use linker flags to reduce memory consumption -%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads - -%ifarch s390 %{arm} mips mipsel -# 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 -%endif - -%ifarch s390 s390x ppc %{power64} aarch64 %{mips} -%global optflags %{optflags} -DENABLE_YARR_JIT=0 -%endif - -# Workaround crashes with gcc 6.1 -%global optflags %{optflags} -fno-delete-null-pointer-checks - -%if 0%{?fedora} -%global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"Fedora\\"\' -%endif - -%configure \ - --with-gtk=3.0 \ - --disable-webkit2 \ -%ifarch s390 s390x ppc %{power64} aarch64 %{mips} - --disable-jit \ -%else - --enable-jit \ -%endif - --enable-introspection - -mkdir -p DerivedSources/webkit -mkdir -p DerivedSources/WebCore -mkdir -p DerivedSources/ANGLE -mkdir -p DerivedSources/WebKit2 -mkdir -p DerivedSources/webkitdom/ -mkdir -p DerivedSources/InjectedBundle -mkdir -p DerivedSources/Platform - -# Disable the parallel compilation as it fails to compile in brew. -# https://bugs.webkit.org/show_bug.cgi?id=34846 -# make %{_smp_mflags} V=1 -make -j1 V=1 - -%install -make install DESTDIR=%{buildroot} - -install -d -m 755 %{buildroot}%{_libexecdir}/%{name} -install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name} - -# Remove lib64 rpaths -chrpath --delete %{buildroot}%{_bindir}/jsc-3 -chrpath --delete %{buildroot}%{_libdir}/libwebkitgtk-3.0.so -chrpath --delete %{buildroot}%{_libexecdir}/%{name}/GtkLauncher - -# Remove .la files -find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete - -%find_lang WebKitGTK-3.0 - -## Finally, copy over and rename the various files for %%doc inclusion. -%add_to_doc_files Source/WebKit/LICENSE -%add_to_doc_files Source/WebKit/gtk/NEWS -%add_to_doc_files Source/WebCore/icu/LICENSE -%add_to_doc_files Source/WebCore/LICENSE-APPLE -%add_to_doc_files Source/WebCore/LICENSE-LGPL-2 -%add_to_doc_files Source/WebCore/LICENSE-LGPL-2.1 -%add_to_doc_files Source/JavaScriptCore/COPYING.LIB -%add_to_doc_files Source/JavaScriptCore/THANKS -%add_to_doc_files Source/JavaScriptCore/AUTHORS -%add_to_doc_files Source/JavaScriptCore/icu/README -%add_to_doc_files Source/JavaScriptCore/icu/LICENSE - - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - - -%files -f WebKitGTK-3.0.lang -%doc %{_pkgdocdir}/ -%{_libdir}/libwebkitgtk-3.0.so.* -%{_libdir}/libjavascriptcoregtk-3.0.so.* -%{_libdir}/girepository-1.0/WebKit-3.0.typelib -%{_libdir}/girepository-1.0/JavaScriptCore-3.0.typelib -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/GtkLauncher -%{_datadir}/webkitgtk-3.0 - -%files devel -%{_bindir}/jsc-3 -%{_includedir}/webkitgtk-3.0 -%{_libdir}/libwebkitgtk-3.0.so -%{_libdir}/libjavascriptcoregtk-3.0.so -%{_libdir}/pkgconfig/webkitgtk-3.0.pc -%{_libdir}/pkgconfig/javascriptcoregtk-3.0.pc -%{_datadir}/gir-1.0/WebKit-3.0.gir -%{_datadir}/gir-1.0/JavaScriptCore-3.0.gir - -%files doc -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/webkitgtk -%{_datadir}/gtk-doc/html/webkitdomgtk - -%changelog -* Sat Feb 11 2017 Fedora Release Engineering - 2.4.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 01 2017 Sandro Mani - 2.4.11-4 -- Rebuild (libwebp) - -* Fri Jun 24 2016 Tomas Popela - 2.4.11-3 -- Workaround crashes with gcc 6.1 -- rhbz#1349856 - Programs using webkitgtk3 compiled with gcc 6.1 crash on start. F.e: midori, xombrero, etc. - -* Fri Apr 15 2016 David Tardon - 2.4.11-2 -- rebuild for ICU 57.1 - -* Mon Apr 11 2016 Tomas Popela - 2.4.11-1 -- Update to 2.4.11 - -* Tue Apr 05 2016 Tomas Popela - 2.4.10-4 -- Fix the compilation on aarch64 - -* Tue Apr 05 2016 Tomas Popela - 2.4.10-3 -- rhbz#1321722 - [abrt] evolution: WTF::StringImpl::startsWith(): SIGSEGV with webkitgtk3-2.4.10 - -* Thu Mar 24 2016 Tomas Popela - 2.4.10-2 -- Add a workaround for rhbz#1320240 - -* Mon Mar 14 2016 Tomas Popela - 2.4.10-1 -- Update to 2.4.10 - -* Tue Feb 9 2016 Peter Robinson 2.4.9-10 -- Add ruby deps for build - -* Sat Feb 06 2016 Tomas Popela - 2.4.9-9 -- Fix the build with gcc 6 (use Kevin's patch from the webkitgtk package) - -* Fri Feb 05 2016 Fedora Release Engineering - 2.4.9-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Dec 30 2015 Michal Toman - 2.4.9-7 -- Add support for MIPS - -* Mon Dec 28 2015 Igor Gnatenko - 2.4.9-6 -- Rebuilt for libwebp soname bump - -* Mon Dec 07 2015 Tomas Popela - 2.4.9-5 -- rhbz#1289053 - Retire nspluginwrapper and remove from Fedora 24 - -* Wed Oct 28 2015 David Tardon - 2.4.9-4 -- rebuild for ICU 56.1 - -* Fri Sep 25 2015 Tomas Popela - 2.4.9-3 -- rhbz#1189303 - [abrt] midori: WebCore::SQLiteStatement::prepare(): midori killed by SIGSEGV - Initialize string in SQLiteStatement before using it - -* Fri Jun 19 2015 Fedora Release Engineering - 2.4.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed May 20 2015 Tomas Popela - 2.4.9-1 -- Update to 2.4.9 - -* Sat May 02 2015 Kalev Lember - 2.4.8-9 -- Rebuilt for GCC 5 C++11 ABI change - -* Tue Mar 17 2015 Michael Catanzaro - 2.4.8-7 -- Remove the fix for late certificate validation because we use --disable-webkit2 - -* Tue Mar 17 2015 Michael Catanzaro - 2.4.8-7 -- Backport fix for late certificate validation - -* Tue Mar 10 2015 Tomas Popela - 2.4.8-6 -- Backport fix for use-after-free when destroying frame - -* Fri Feb 27 2015 Michael Catanzaro - 2.4.8-5 -- Add Fedora branding to the user agent - -* Sat Feb 21 2015 Till Maas - 2.4.8-4 -- Rebuilt for Fedora 23 Change - https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code - -* Wed Feb 18 2015 Tomas Popela - 2.4.8-3 -- Add support for gcc 5.0 -- Let the package compile with latest glib - -* Mon Jan 26 2015 David Tardon - 2.4.8-2 -- rebuild for ICU 54.1 - -* Wed Jan 07 2015 Tomas Popela - 2.4.8-1 -- Update to 2.4.8 - -* Wed Oct 22 2014 Tomas Popela - 2.4.7-1 -- Update to 2.4.7 - -* Tue Oct 21 2014 Tomas Popela - 2.4.6-2 -- Disable the SSLv3 to address the POODLE vulnerability - -* Mon Sep 29 2014 Tomas Popela - 2.4.6-1 -- Update to 2.4.6 -- Run make with -j1 to let it successfully compile in brew - -* Tue Sep 02 2014 Tomas Popela - 2.4.5-4 -- Rebase the aarch64 patch - -* Tue Aug 26 2014 Kalev Lember - 2.4.5-3 -- Disable support for webkit2 API which is now provided by the webkitgtk4 - package - -* Tue Aug 26 2014 David Tardon - 2.4.5-2 -- rebuild for ICU 53.1 - -* Tue Aug 26 2014 Tomas Popela - 2.4.5-1 -- Update to 2.4.5 - -* Mon Aug 18 2014 Fedora Release Engineering - 2.4.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Jul 23 2014 Tomas Popela - 2.4.4-4 -- Remove geoclue-devel from BR - -* Wed Jul 23 2014 Tomas Popela - 2.4.4-3 -- Fix CLoop on ppc32 and s390 -- Add geoclue-devel as BR as WK1 needs it - -* Tue Jul 22 2014 Kalev Lember - 2.4.4-2 -- Rebuilt for gobject-introspection 1.41.4 - -* Tue Jul 08 2014 Kalev Lember - 2.4.4-1 -- Update to 2.4.4 - -* Fri Jul 4 2014 Yaakov Selkowitz - 2.4.3-4 -- Fix for 64k pages on aarch64 (#1074093, #1113345) - -* Fri Jul 04 2014 Tomas Popela 2.4.3-3 -- rhbz#1088480 - [abrt] libwebkit2gtk: TSymbolTableLevel::~TSymbolTableLevel(): WebKitWebProcess killed by SIGSEGV - -* Sun Jun 08 2014 Fedora Release Engineering - 2.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue May 27 2014 Tomas Popela 2.4.3-1 -- Update to 2.4.3 - -* Sun May 18 2014 Peter Robinson 2.4.2-4 -- Fix aarch64 build - -* Wed May 14 2014 Tomas Popela 2.4.2-3 -- Add support for ppc64le -- Fix for CLoop on ppc64, ppc64le and s390x - -* Tue May 13 2014 Karsten Hopp 2.4.2-2 -- PPC (32bit) needs libatomic in the buildroot - -* Mon May 12 2014 Kalev Lember - 2.4.2-1 -- Update to 2.4.2 - -* Wed May 07 2014 Kalev Lember - 2.4.1-2 -- Make sure -devel pulls in libwebkit2gtk - -* Mon Apr 14 2014 Kalev Lember - 2.4.1-1 -- Update to 2.4.1 - -* Tue Mar 25 2014 Kalev Lember - 2.4.0-1 -- Update to 2.4.0 - -* Wed Mar 19 2014 Kalev Lember - 2.3.92-2 -- Switch over to geoclue2 - -* Tue Mar 18 2014 Tomas Popela - 2.3.92-1 -- Update to 2.3.92 - -* Tue Mar 4 2014 Tomas Popela - 2.3.91-1 -- Update to 2.3.91 - -* Thu Feb 27 2014 Karsten Hopp 2.3.90-3 -- disable libatomic patch on ppc. webkitgtk3 now uses std::atomic - -* Tue Feb 18 2014 Peter Robinson 2.3.90-2 -- Disable JIT on aarch64 - -* Tue Feb 18 2014 Tomas Popela - 2.3.90-1 -- Update to 2.3.90 -- Enable full debuginfo on s390x - -* Thu Feb 13 2014 Paul Howarth - 2.3.5-3 -- Rebuild against new libicu - -* Fri Feb 7 2014 Peter Robinson 2.3.5-2 -- Add support for aarch64 - -* Thu Feb 6 2014 Tomas Popela - 2.3.5-1 -- Update to 2.3.5 - -* Mon Jan 13 2014 Tomas Popela - 2.3.4-1 -- Update to 2.3.4 -- Add patch that fixes compilation on i686 - -* Thu Jan 02 2014 Orion Poplawski - 2.3.3-2 -- Rebuild for libwebp soname bump - -* Thu Dec 19 2013 Tomas Popela - 2.3.3-1 -- Update to 2.3.3 - -* Thu Dec 5 2013 Tomas Popela - 2.3.2-1 -- Update to 2.3.2 -- Add libatomic as BR on ppc - -* Wed Dec 4 2013 Tomas Popela - 2.2.3-1 -- Update to 2.2.3 - -* Thu Nov 28 2013 Tomas Popela - 2.2.2-2 -- Fix for RH bug #1035764 - Crashes with certain Google Drive documents - -* Mon Nov 11 2013 Tomas Popela - 2.2.2-1 -- Update to 2.2.2 - -* Fri Oct 18 2013 Tomas Popela - 2.2.1-1 -- Update to 2.2.1 - -* Fri Sep 27 2013 Kalev Lember - 2.2.0-1 -- Update to 2.2.0 - -* Wed Sep 18 2013 Kalev Lember - 2.1.92-1 -- Update to 2.1.92 - -* Thu Sep 12 2013 Dan Horák - 2.1.91-2 -- rediff the ppc32 patch, it failed to apply on s390 - -* Wed Sep 11 2013 Kalev Lember - 2.1.91-1 -- Update to 2.1.91 - -* Fri Aug 30 2013 Karsten Hopp 2.1.90.1-2 -- modify ppc32 patch, the macro interpretResolveWithBase got removed - -* Fri Aug 30 2013 Kalev Lember - 2.1.90.1-1 -- Update to 2.1.90.1 - -* Wed Aug 28 2013 Kalev Lember - 2.1.90-1 -- Update to 2.1.90 -- Add missing at-spi2-core-devel build dep - -* Mon Aug 12 2013 Kalev Lember - 2.1.4-1 -- Update to 2.1.4 - -* Sat Aug 10 2013 Kalev Lember - 2.1.3-3 -- Switch to unversioned docdirs (#993890) - -* Sun Aug 04 2013 Fedora Release Engineering - 2.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 9 2013 Tomas Popela - 2.1.3-1 -- Update to 2.1.3 - -* Wed Jun 19 2013 Tomas Popela - 2.1.2-1 -- Update to 2.1.2 - -* Fri Jun 07 2013 Kalev Lember - 2.1.1-3 -- Link with harfbuzz-icu (split into separate library in harfbuzz 0.9.18) - -* Mon Jun 03 2013 Kalev Lember - 2.1.1-2 -- Remove glib-compile-schemas scriptlets: the schemas are no longer installed -- Add ldconfig calls to the libwebkit2gtk subpackage -- Remove rpath from MiniBrowser -- Re-enable full debuginfo (#861452) - -* Mon Jun 3 2013 Tomas Popela - 2.1.1-1 -- Update to 2.1.1 -- Drop unused patches - -* Mon May 13 2013 Tomas Popela - 2.0.2-1 -- Update to 2.0.2 - -* Mon May 6 2013 Matthias Clasen - 2.0.1-2 -- Split libwebkit2gtk off into a subpackage to avoid - pulling this 35M behemoth of a library onto the livecd - needlessly - -* Tue Apr 16 2013 Tomas Popela - 2.0.1-1 -- Update to 2.0.1 - -* Thu Apr 11 2013 Tomas Popela - 2.0.0-3 -- Add fix for broken GObject casting - -* Wed Apr 3 2013 Tomas Popela - 2.0.0-2 -- Apply double2intsPPC32.patch also on s390 - -* Wed Mar 27 2013 Tomas Popela - 2.0.0-1 -- Update to 2.0.0 -- Update BR versions -- Drop unused patches - -* Wed Mar 20 2013 Kalev Lember - 1.11.92-1 -- Update to 1.11.92 - -* Fri Mar 08 2013 Tomas Popela 1.11.91-1 -- Update to 1.11.91 -- Fix for RH bug #915990 - Seed segfaults in JSC::LLInt::CLoop::execute() - -* Mon Feb 25 2013 Tomas Popela 1.11.90-3 -- Fix for not building on ppc32 with JIT disabled - -* Sat Feb 23 2013 Kevin Fenzi 1.11.90-2 -- Add webkit2 MiniBrowser - -* Fri Feb 22 2013 Kalev Lember - 1.11.90-1 -- Update to 1.11.90 - -* Fri Feb 22 2013 Tomas Popela 1.11.5-5 -- Fix for not building on ppc32 with JIT disabled -- BR libatomic (needs gcc >= 4.8.0) for ppc32 - -* Mon Feb 18 2013 Tomas Popela 1.11.5-4 -- Backported fixes for not building with disabled JIT - -* Sat Feb 16 2013 Peter Robinson 1.11.5-3 -- Re-enable JIT on ARM (hopefully the gmail crash is fixed) - -* Thu Feb 14 2013 Tomas Popela 1.11.5-2 -- Add upstream patch for RH bug #908143 - AccessibilityTableRow::parentTable crash - -* Wed Feb 06 2013 Kalev Lember - 1.11.5-1 -- Update to 1.11.5 -- Drop upstreamed patches - -* Wed Jan 30 2013 Mamoru TASAKA - 1.11.4-5 -- Rebuild against new icu again - -* Sat Jan 26 2013 Kalev Lember - 1.11.4-4 -- Rebuilt for icu 50 - -* Fri Jan 25 2013 Kalev Lember - 1.11.4-3 -- Backport a fix for a crash in AccessibilityTableCell::parentTable() - -* Mon Jan 21 2013 Adam Tkac - 1.11.4-2 -- rebuild due to "jpeg8-ABI" feature drop - -* Wed Jan 16 2013 Kalev Lember - 1.11.4-1 -- Update to 1.11.4 -- Remove conditional pango deps; the build now uses harfbuzz directly -- BR libwebp-devel -- Drop upstreamed librt linking patch - -* Tue Dec 18 2012 Dan Horák - 1.11.2-3 -- fix 32-bit non-JIT arches - -* Tue Dec 18 2012 Dan Horák - 1.11.2-2 -- fix build for non-JIT arches - -* Sat Nov 24 2012 Kalev Lember - 1.11.2-1 -- Update to 1.11.2 -- Add a patch to explicitly link with librt - -* Wed Oct 17 2012 Kalev Lember - 1.10.1-1 -- Update to 1.10.1 -- Enable the parallel build -- Drop the upstreamed Geode-compatibility patch - -* Fri Oct 5 2012 Daniel Drake - 1.10.0-2 -- Restore compatibility with AMD Geode processors - -* Mon Sep 24 2012 Kalev Lember - 1.10.0-1 -- Update to 1.10.0 -- Adjust for webkit -> webkitgtk upstream tarball rename - -* Wed Sep 19 2012 Kalev Lember - 1.9.92-2 -- Build with gstreamer1 - -* Wed Sep 19 2012 Kalev Lember - 1.9.92-1 -- Update to 1.9.92 - -* Wed Sep 05 2012 Kalev Lember - 1.9.91-1 -- Update to 1.9.91 - -* Sun Sep 2 2012 Matthias Clasen - 1.9.90-2 -- Rebuild - -* Wed Aug 29 2012 Daniel Drake - 1.9.90-1 -- Update to latest release (#850520) - -* Thu Aug 9 2012 Daniel Drake - 1.9.5-2 -- Add upstream patch to fix build without JIT (#843428) -- Add upstream patch to fix build with latest gcc/bison - -* Wed Jul 18 2012 Kalev Lember - 1.9.5-1 -- Update to 1.9.5 -- Build with -g1 to avoid running into 4 GB ar format limit - -* Wed Jul 11 2012 Ville Skyttä - 1.9.4-3 -- Fix %%post scriptlet dependencies. - -* Wed Jul 04 2012 Dan Horák - 1.9.4-2 -- apply workaround for s390x until #835957 is resolved (static library archive > 4 GB) - -* Thu Jun 28 2012 Kalev Lember - 1.9.4-1 -- Update to 1.9.4 - -* Thu Jun 07 2012 Kalev Lember - 1.9.3-1 -- Update to 1.9.3 -- Build webkit2gtk and BR gtk2-devel for its plugin process - -* Tue May 15 2012 Karsten Hopp 1.8.1-3 -- disable JIT on PPC(64) as the autodetection enables it even if not supported - -* Mon May 14 2012 Peter Robinson - 1.8.1-2 -- Explicitly disable JIT on ARM as it's not currently stable with JS heavy pages - -* Tue Apr 24 2012 Kalev Lember - 1.8.1-1 -- Update to 1.8.1 -- Dropped the backported patches -- Remove lib64 rpaths with chrpath -- Update gsettings rpm scriptlets - -* Wed Apr 18 2012 Peter Robinson - 1.8.0-3 -- Add upstream patch to fix crash when SSE2 isn't present -- Add upstream patch to flickering when some widgets are drawn - -* Mon Apr 09 2012 Kalev Lember - 1.8.0-2 -- Finish splitting out a -doc subpackage (#808917) - -* Wed Mar 28 2012 Richard Hughes - 1.8.0-1 -- Update to 1.8.0. - -* Sat Mar 24 2012 Dan Horák - 1.7.92-2 -- add ppc to low mem arches -- decrease debuginfo verbosity on s390 to save memory - -* Wed Mar 21 2012 Kalev Lember - 1.7.92-1 -- Update to 1.7.92 -- Don't pass --enable-geolocation to configure; it's now enabled by default - -* Thu Mar 15 2012 Karsten Hopp 1.7.91-2 -- disable jit on ppc(64) - -* Thu Mar 8 2012 Matthias Clasen - 1.7.91-1 -- Update to 1.7.91 - -* Tue Feb 28 2012 Peter Robinson - 1.7.5-3 -- Add ARM to and optimise compile flags for low mem arches - -* Mon Feb 20 2012 Dan Horák - 1.7.5-2 -- don't enable jit on s390(x) - -* Tue Feb 7 2012 Matthias Clasen - 1.7.5-1 -- Update to 1.7.5 - -* Tue Jan 17 2012 Matthias Clasen - 1.7.4-1 -- Update to 1.7.4 - -* Sat Jan 14 2012 Fedora Release Engineering - 1.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 20 2011 Matthias Clasen - 1.7.3-1 -- Update to 1.7.3 - -* Thu Nov 24 2011 Tomas Bzatek - 1.7.2-1 -- Update to 1.7.2 - -* Mon Nov 7 2011 Matthias Clasen 1.7.1-2 -- Rebuild against new libpng - -* Wed Nov 2 2011 Matthias Clasen 1.7.1-1 -- Update to 1.7.1 - -* Wed Oct 12 2011 Dan Horák 1.6.1-2 -- fix build on s390(x) - -* Wed Sep 28 2011 Ray Strode 1.6.1-1 -- Update to 1.6.1 - -* Fri Sep 09 2011 Caolán McNamara - 1.5.1-2 -- rebuild for icu 4.8.1 - -* Thu Jun 16 2011 Tomas Bzatek - 1.5.1-1 -- Update to 1.5.1 - -* Tue Jun 14 2011 Bastien Nocera 1.4.0-3 -- Rebuild against newer GTK+ - -* Wed May 11 2011 Cosimo Cecchi 1.4.0-2 -- Add a doc package for gtk-doc documentation - -* Tue Apr 26 2011 Matthias Clasen 1.4.0-1 -- Update to 1.4.0 - -* Tue Mar 22 2011 Matthias Clasen 1.3.13-1 -- Update to 1.3.13 - -* Thu Feb 10 2011 Matthias Clasen 1.3.10-3 -- Rebuild against newer gtk - -* Mon Feb 07 2011 Fedora Release Engineering - 1.3.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Feb 2 2011 Matthias Clasen 1.3.11-1 -- 1.3.11 - -* Wed Feb 2 2011 Matthias Clasen 1.3.10-2 -- Rebuild against newer gtk - -* Mon Jan 10 2011 Matthias Clasen 1.3.10-1 -- Update to 1.3.10 - -* Sun Jan 9 2011 Matthias Clasen 1.3.9-1 -- Update to 1.3.9 - -* Fri Dec 3 2010 Matthias Clasen 1.3.7-2 -- Rebuild against new gtk - -* Wed Dec 1 2010 Matthias Clasen 1.3.7-1 -- Update to 1.3.7 - -* Thu Nov 11 2010 Matthias Clasen 1.3.6-1 -- Update to 1.3.6 -- Disable the s390 patch again :-( Upstream it, maybe ? - -* Thu Nov 11 2010 Dan Horák - 1.3.5-2 -- Updated and re-enabled the s390 patch - -* Mon Nov 1 2010 Matthias Clasen 1.3.5-1 -- Update to 1.3.5 - -* Wed Sep 29 2010 jkeating - 1.3.4-3 -- Rebuilt for gcc bug 634757 - -* Fri Sep 24 2010 Matthias Clasen 1.3.4-2 -- Enable JIT/patch for execmem -- Move inspector to the main package - -* Thu Sep 23 2010 Matthias Clasen 1.3.4-1 -- Update to 1.3.4 - -* Wed Aug 25 2010 Dan Horák - 1.3.3-4 -- Do not generate debug information to prevent linker memory exhaustion on s390 with its 2 GB address space - -* Wed Jul 21 2010 Dan Horák - 1.3.3-3 -- Fix build on s390(x) - -* Thu Jul 15 2010 Colin Walters - 1.3.3-2 -- Rebuild with new gobject-introspection - -* Fri Jul 9 2010 Matthias Clasen 1.3.2-2 -- Fix conflicting gettext domain with webkitgtk -- Drop the -doc subpackage - -* Thu Jul 1 2010 Matthias Clasen 1.3.2-1 -- Initial packaging