diff --git a/.gitignore b/.gitignore index ffdaa0d..76c328f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ 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.5.2.tar.gz +/webkit-1.5.90.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/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 aa62ec0..2116e5d 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: 1%{?dist} +Version: 1.6.1 +Release: 3%{?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 @@ -78,6 +80,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 @@ -162,6 +165,24 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Wed Oct 12 2011 Dan HorĂ¡k 1.6.1-3 +- fix build on s390(x) + +* Thu Oct 06 2011 Ray Strode 1.6.1-2 +- rebuild + +* Wed Oct 06 2011 Ray Strode 1.6.1-1 +- Update to 1.6.1 + +* Mon Oct 03 2011 Rex Dieter - 1.5.90-1.1 +- rebuild (java), rel-eng#4932 + +* Thu Sep 22 2011 Matthias Clasen - 1.5.90-1 +- Update to 1.5.90 + +* Tue Aug 16 2011 Matthias Clasen - 1.5.2-1 +- Update to 1.5.2 + * Thu Jun 16 2011 Tomas Bzatek - 1.5.1-1 - Update to 1.5.1