Update to 1.8.3

... and drop the svg clipping patch, which is now included in the new upstream release. https://bugzilla.redhat.com/show_bug.cgi?id=852136
Revert accidental push
2012-08-30 16:38:08 +02:00 · 2012-08-14 09:10:36 -06:00 · 2012-08-09 08:59:47 -06:00 · 2012-06-13 21:48:37 -06:00 · 2012-06-08 09:01:30 +02:00 · 2012-05-15 00:25:30 +01:00
6 changed files with 384 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,22 @@
+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.8.3.tar.xz
--- a/dead.package
+++ b/dead.package
@ -1 +0,0 @@
-https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/AKVB363GFCHHJ5MTHGVYHYT6NLLTF5VM/
--- a/1
+++ b/1
@ -0,0 +1 @@
+dcbf9d5e2e6391f857c29a57528b32a6  webkit-1.8.3.tar.xz
--- a/webkit-1.1.14-nspluginwrapper.patch
+++ b/webkit-1.1.14-nspluginwrapper.patch
@ -0,0 +1,12 @@
+--- 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<String> 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");
--- a/webkit-1.3.4-no-execmem.patch
+++ b/webkit-1.3.4-no-execmem.patch
@ -0,0 +1,12 @@
+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
+
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@ -0,0 +1,337 @@
+## 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}%{_docdir}/%{name}-%{version} ||: ; \
+        cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')
+
+Name:           webkitgtk3
+Version:        1.8.3
+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
+
+Patch1:         webkit-1.3.4-no-execmem.patch
+Patch2:         webkit-1.1.14-nspluginwrapper.patch
+
+BuildRequires:  bison
+BuildRequires:  chrpath
+BuildRequires:  enchant-devel
+BuildRequires:  flex
+BuildRequires:  geoclue-devel
+BuildRequires:  gettext
+BuildRequires:  gperf
+BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  gtk3-devel >= 3.0
+BuildRequires:  gtk-doc
+BuildRequires:  libsoup-devel >= 2.37.2.1
+BuildRequires:  libicu-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  libXt-devel
+BuildRequires:  pcre-devel
+BuildRequires:  sqlite-devel
+BuildRequires:  gobject-introspection-devel
+BuildRequires:  perl-Switch
+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.
+
+This package contains WebKitGTK+ for GTK+ 3.
+
+%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
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+
+%description    doc
+This package contains developer documentation for %{name}.
+
+%prep
+%setup -qn "webkit-%{version}"
+# tbzatek - doesn't apply, is this fixed?
+# %patch1 -p1 -b .no-execmem
+%patch2 -p1 -b .nspluginwrapper
+
+%build
+%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
+
+# 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
+
+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
+
+%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
+
+# for some reason translations don't get installed in 1.3.7
+%find_lang webkit-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/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
+%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
+/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 || :
+
+
+%files -f webkit-3.0.lang
+%defattr(-,root,root,-)
+%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}/webkitgtk-3.0
+
+%files  devel
+%defattr(-,root,root,-)
+%{_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/JSCore-3.0.gir
+
+%files doc
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/webkitgtk
+
+
+%changelog
+* Thu Aug 30 2012 Kalev Lember <kalevlember@gmail.com> - 1.8.3-1
+- Update to 1.8.3 (#852136)
+- Drop the svg clipping patch, included in the new upstream release
+
+* Fri Jun 08 2012 Peter Hatina <phatina@redhat.com> - 1.8.1-3
+- Fix svg clipping
+
+* Mon May 14 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 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 <kalevlember@gmail.com> - 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 <pbrobinson@fedoraproject.org> - 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 <kalevlember@gmail.com> - 1.8.0-2
+- Finish splitting out a -doc subpackage (#808917)
+
+* Wed Mar 28 2012 Richard Hughes <rhughes@redhat.com> - 1.8.0-1
+- Update to 1.8.0.
+
+* Sat Mar 24 2012 Dan Horák <dan[at]danny.cz> - 1.7.92-2
+- add ppc to low mem arches
+- decrease debuginfo verbosity on s390 to save memory
+
+* Wed Mar 21 2012 Kalev Lember <kalevlember@gmail.com> - 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 <karsten@redhat.com> 1.7.91-2
+- disable jit on ppc(64)
+
+* Thu Mar  8 2012 Matthias Clasen <mclasen@redhat.com> - 1.7.91-1
+- Update to 1.7.91
+
+* Tue Feb 28 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.7.5-3
+- Add ARM to and optimise compile flags for low mem arches
+
+* Mon Feb 20 2012 Dan Horák <dan[at]danny.cz> - 1.7.5-2
+- don't enable jit on s390(x)
+
+* Tue Feb  7 2012 Matthias Clasen <mclasen@redhat.com> - 1.7.5-1
+- Update to 1.7.5
+
+* Tue Jan 17 2012 Matthias Clasen <mclasen@redhat.com> - 1.7.4-1
+- Update to 1.7.4
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Dec 20 2011 Matthias Clasen <mclasen@redhat.com> - 1.7.3-1
+- Update to 1.7.3
+
+* Thu Nov 24 2011 Tomas Bzatek <tbzatek@redhat.com> - 1.7.2-1
+- Update to 1.7.2
+
+* Mon Nov 7 2011 Matthias Clasen <mclasen@redhat.com> 1.7.1-2
+- Rebuild against new libpng
+
+* Wed Nov  2 2011 Matthias Clasen <mclasen@redhat.com> 1.7.1-1
+- Update to 1.7.1
+
+* Wed Oct 12 2011 Dan Horák <dan[at]danny.cz> 1.6.1-2
+- fix build on s390(x)
+
+* Wed Sep 28 2011 Ray Strode <rstrode@redhat.com> 1.6.1-1
+- Update to 1.6.1
+
+* Fri Sep 09 2011 Caolán McNamara <caolanm@redhat.com> - 1.5.1-2
+- rebuild for icu 4.8.1
+
+* Thu Jun 16 2011 Tomas Bzatek <tbzatek@redhat.com> - 1.5.1-1
+- Update to 1.5.1
+
+* Tue Jun 14 2011 Bastien Nocera <bnocera@redhat.com> 1.4.0-3
+- Rebuild against newer GTK+
+
+* Wed May 11 2011 Cosimo Cecchi <cosimoc@redhat.com> 1.4.0-2
+- Add a doc package for gtk-doc documentation
+
+* Tue Apr 26 2011 Matthias Clasen <mclasen@redhat.com> 1.4.0-1
+- Update to 1.4.0
+
+* Tue Mar 22 2011 Matthias Clasen <mclasen@redhat.com> 1.3.13-1
+- Update to 1.3.13
+
+* Thu Feb 10 2011 Matthias Clasen <mclasen@redhat.com> 1.3.10-3
+- Rebuild against newer gtk
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Feb  2 2011 Matthias Clasen <mclasen@redhat.com> 1.3.11-1
+- 1.3.11
+
+* Wed Feb  2 2011 Matthias Clasen <mclasen@redhat.com> 1.3.10-2
+- Rebuild against newer gtk
+
+* Mon Jan 10 2011 Matthias Clasen <mclasen@redhat.com> 1.3.10-1
+- Update to 1.3.10
+
+* Sun Jan  9 2011 Matthias Clasen <mclasen@redhat.com> 1.3.9-1
+- Update to 1.3.9
+
+* Fri Dec  3 2010 Matthias Clasen <mclasen@redhat.com> 1.3.7-2
+- Rebuild against new gtk
+
+* Wed Dec  1 2010 Matthias Clasen <mclasen@redhat.com> 1.3.7-1
+- Update to 1.3.7
+
+* Wed Nov 11 2010 Matthias Clasen <mclasen@redhat.com> 1.3.6-1
+- Update to 1.3.6
+- Disable the s390 patch again :-( Upstream it, maybe ?
+
+* Thu Nov 11 2010 Dan Horák <dan[at]danny.cz> - 1.3.5-2
+- Updated and re-enabled the s390 patch
+
+* Mon Nov  1 2010 Matthias Clasen <mclasen@redhat.com> 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 <mclasen@redhat.com> 1.3.4-2
+- Enable JIT/patch for execmem
+- Move inspector to the main package
+
+* Thu Sep 23 2010 Matthias Clasen <mclasen@redhat.com> 1.3.4-1
+- Update to 1.3.4
+
+* Wed Aug 25 2010 Dan Horák <dan[at]danny.cz> - 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 <dan[at]danny.cz> - 1.3.3-3
+- Fix build on s390(x)
+
+* Thu Jul 15 2010 Colin Walters <walters@verbum.org> - 1.3.3-2
+- Rebuild with new gobject-introspection
+
+* Fri Jul  9 2010 Matthias Clasen <mclasen@redhat.com> 1.3.2-2
+- Fix conflicting gettext domain with webkitgtk
+- Drop the -doc subpackage
+
+* Thu Jul  1 2010 Matthias Clasen <mclasen@redhat.com> 1.3.2-1
+- Initial packaging
Author	SHA1	Message	Date
Kalev Lember	dc0d584b8b	Update to 1.8.3 ... and drop the svg clipping patch, which is now included in the new upstream release. https://bugzilla.redhat.com/show_bug.cgi?id=852136	2012-08-30 16:38:08 +02:00
Daniel Drake	40f77e3e1b	Revert accidental push Sorry for the mess, accidently pushed 2 commits to this branch that were for local testing only. Revert them.	2012-08-14 09:10:36 -06:00
Daniel Drake	22b34b8cf4	dsd	2012-08-09 08:59:47 -06:00
Daniel Drake	e97fbff983	OLPC1	2012-06-13 21:48:37 -06:00
Peter Hatina	9708b4770c	Fix SVG clipping	2012-06-08 09:01:30 +02:00
Peter Robinson	89476d78d9	Explicitly disable JIT on ARM as it's not currently stable with JS heavy pages	2012-05-15 00:25:30 +01:00
				`@ -1 +0,0 @@`
				`https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/AKVB363GFCHHJ5MTHGVYHYT6NLLTF5VM/`
				`@ -0,0 +1 @@`
				`dcbf9d5e2e6391f857c29a57528b32a6 webkit-1.8.3.tar.xz`