Mailinglist Archive: opensuse-commit (1469 mails)
| < Previous | Next > |
commit libwebkit for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 01 Mar 2012 07:49:37 +0100
- Message-id: <20120301064937.669DC20364@hilbert.suse.de>
Hello community,
here is the log from the commit of package libwebkit for openSUSE:Factory
checked in at 2012-03-01 07:49:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libwebkit (Old)
and /work/SRC/openSUSE:Factory/.libwebkit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libwebkit", Maintainer is "DMZhang@xxxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libwebkit/libwebkit.changes 2012-01-09
15:19:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libwebkit.new/libwebkit.changes 2012-03-01
07:49:34.000000000 +0100
@@ -1,0 +2,120 @@
+Thu Feb 23 08:10:15 UTC 2012 - vuntz@xxxxxxxxxxxx
+
+- Update to version 1.7.90:
+ + Geolocation support is built by default now.
+ + requestAnimationFrame support is built by default now.
+ + Remove defunct WebInspector GSettings mapping.
+ + Lots of build fixes for Windows, GNU Hurd, A64, SPARC and
+ Alpha.
+ + WebKit will try to use the default libsoup proxy resolver
+ automatically.
+ + Now interpret plugin metadata as UTF-8.
+ + Web content (except plugins) should no longer steal focus from
+ other GTK+ widgets.
+- Drop libwebkit-ia64.patch: fixed upstream.
+- Rebase webkit-ld-optimization.patch.
+- Add pkgconfig(zlib) BuildRequires: new dependency.
+- Add explicit pkgconfig(glib-2.0) BuildRequires so we can version
+ it.
+- Add explicit perl, python BuildRequires: those are explicitly
+ checked for in configure now.
+- Add gtk-doc BuildRequires: the gtk-doc tools are needed at
+ install time, for the webkit-specific tools generating the docs.
+- Add libwebkit-fix-gtk2.patch: fix build of the GTK+ 2.x version.
+- Stop using %glib2_gsettings_schema_* macros for
+ libwebkitgtk-1_0-0 and libwebkitgtk-3_0-0: there's no GSettings
+ schema anymore.
+- Do not use parallel build as it seems to be causing several
+ issues.
+
+-------------------------------------------------------------------
+Mon Feb 20 12:22:34 UTC 2012 - vuntz@xxxxxxxxxxxx
+
+- Move to pkgconfig() BuildRequires:
+ + Old ones: enchant-devel, gstreamer-0_10-plugins-base-devel,
+ gtk2-devel/gtk3-devel, libgeoclue-devel, libsoup-devel,
+ libxslt-devel, sqlite3-devel.
+ + New ones: enchant, gtk+-2.0/gtk+-3.0, geoclue, gstreamer-0.10,
+ gstreamer-plugins-base-0.10, libsoup-2.4, libxslt, sqlite3.
+- Add missing explicit BuildRequires (some are needed to fix the
+ build after the xorg-x11 massive packaging change): cairo,
+ cairo-ft, fontconfig, freetype2, freetype2, gail/gail-3.0,
+ libpng, libxml-2.0, pango, pangoft2, xrender, xt.
+
+-------------------------------------------------------------------
+Thu Feb 16 09:16:51 UTC 2012 - vuntz@xxxxxxxxxxxx
+
+- Add webkit-ld-optimization.patch: pass options to ld (namely
+ -Wl,--reduce-memory-overheads -Wl,--no-keep-memory) to use less
+ memory when linking. This should help building on OBS. Thanks to
+ the openSUSE-ARM team!
+
+-------------------------------------------------------------------
+Wed Feb 8 14:24:22 UTC 2012 - vuntz@xxxxxxxxxxxx
+
+- Update to version 1.7.5:
+ + Add new signals to track resources loading.
+ + Add --no-timeout command line option to DumpRenderTree.
+ + Expose accessibility hierarchy in WebKit2 to ATK/AT-SPI based
+ ATs.
+ + Allow to build using extra jhbuild modulesets.
+ + Fix emission of ATK text-caret-moved and text-selection-changed
+ events.
+ + Update primary clipboard with the current selection in X11
+ platforms in WebKit2.
+ + Implement the policy client in WebKit2 GTK+ API.
+ + Add basic printing support to WebKit2.
+ + Do not add unnecessary blanks at the end of a line of text to
+ fix the line returned by atk_text_get_text_at_offset().
+ + Make sure input text field is repainted when value is changed.
+ + Add print-backgrounds setting to WebKit2 GTK+ API.
+ + Respect the has-backward-stepper and has-forward-stepper
+ properties when drawing scrollbars.
+ + WebKit-3.0.gir now includes information about C includes or
+ exported packages.
+ + WebKit1 API documentation was not generated when building with
+ gtk-2.0.
+ + Make WebKitWebView work inside a GtkOffscreenWindow.
+ + Implement DownloadClient and add downloads API to WebKit2 GTK+
+ API.
+- Remove xz BuildRequires now that it comes for free in the build
+ system.
+- Add pkgconfig(atspi-2) BuildRequires: new dependency upstream.
+- Add pkgconfig(gtk+-unix-print-3.0) BuildRequires for gtk3 build:
+ new dependency upstream.
+
+-------------------------------------------------------------------
+Thu Feb 02 23:30:15 UTC 2012 - ro@xxxxxxx
+
+- Add libwebkit-ia64.patch: fix build on ia64.
+
+-------------------------------------------------------------------
+Tue Jan 17 16:09:56 UTC 2012 - vuntz@xxxxxxxxxxxx
+
+- Update to version 1.7.4:
+ + Fix a11y regression: text-inserted events lack text inserted
+ and current line.
+ + Fix scrollbars in WebKit2 that were drawn behind the window
+ resize grip.
+ + Fix a memory leak in WebKitWebSourceGStreamer.
+ + Slider thumb is not centered on the track with the unico theme.
+ + Fix context menu in WebKit2 to not dissapear right after it's
+ shown.
+ + Use GtkOrientable style class in GTK+ 3 theming code.
+ + Change default WebSocket protocol to the latest one (hybi-17).
+ + Fix scrollbars size with GTK+ 3.x to follow the current theme.
+ + Use gdk_screen_get_monitor_workarea() when available for
+ screenAvailableRect().
+ + Rename webkit_web_view_load_alternate_html as
+ webkit_web_view_replace_content in WebKit2 GTK+.
+ + Fix emission of ATK text-caret-moved and text-selection-changed
+ events.
+ + Add methods to get/set the WebView zoom level to WebKit2 GTK+
+ API.
+ + Make WebProcess and PluginProcess use the same locale as the UI
+ process.
+ + Simplify WebKit2 loader client API.
+- Create DerivedSources/webkit in %setup to fix build, as a
+ temporary workaround.
+
+-------------------------------------------------------------------
libwebkit3.changes: same change
Old:
----
webkit-1.7.3.tar.xz
New:
----
libwebkit-fix-gtk2.patch
webkit-1.7.90.tar.xz
webkit-ld-optimization.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libwebkit.spec ++++++
--- /var/tmp/diff_new_pack.KxNNos/_old 2012-03-01 07:49:37.000000000 +0100
+++ /var/tmp/diff_new_pack.KxNNos/_new 2012-03-01 07:49:37.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libwebkit
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -43,37 +43,60 @@
Summary: Library for rendering web content, GTK+ Port
License: LGPL-2.0 ; LGPL-2.0+
Group: Development/Libraries/C and C++
-Version: 1.7.3
+Version: 1.7.90
Release: 0
-# FIXME: after 1.7.3, remove workaround in %%setup that is needed to fix the
build
+# FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and
gtk3 versions
+# FIXME: after 1.7.90, remove workaround in %%setup that is needed to fix the
build
Url: http://webkit.org/
Source: http://www.webkitgtk.org/webkit-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM webkit-gir-fixup.patch dimstar@xxxxxxxxxxxx -- Fix
JSCore.gir to reference a real library.
Patch0: webkit-gir-fixup.patch
+# PATCH-FIX-OPENSUSE webkit-ld-optimization.patch vuntz@xxxxxxxxxxxx -- Add ld
options to use less memory when linking, should help building on OBS, but this
will be slower
+Patch2: webkit-ld-optimization.patch
+# PATCH-FIX-UPSTREAM libwebkit-fix-gtk2.patch vuntz@xxxxxxxxxxxx -- Fix build
of the gtk+ 2 version, sent upstream by irc
+Patch3: libwebkit-fix-gtk2.patch
BuildRequires: Mesa-devel
BuildRequires: bison
-BuildRequires: enchant-devel
BuildRequires: flex
BuildRequires: gcc-c++
-BuildRequires: gobject-introspection-devel
+BuildRequires: gobject-introspection-devel >= 0.9.5
BuildRequires: gperf
-BuildRequires: gstreamer-0_10-plugins-base-devel >= 0.10.30
-%if %{build_for_gtk3}
-BuildRequires: gtk3-devel >= 3.0
-%else
-BuildRequires: gtk2-devel >= 2.10
-%endif
-BuildRequires: libgeoclue-devel
+BuildRequires: gtk-doc
BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
-BuildRequires: libsoup-devel >= 2.37.2.1
-BuildRequires: libxslt-devel
-BuildRequires: sqlite3-devel
-# Only needed because we don't (and won't) support building xz tarballs by
default... See bnc#697467
-BuildRequires: xz
+BuildRequires: perl
+BuildRequires: python
# Needed by make-hash-tools.pl, after move to perl 5.14
BuildRequires: perl(Switch)
+BuildRequires: pkgconfig(atspi-2) >= 2.2.1
+BuildRequires: pkgconfig(cairo) >= 1.10
+BuildRequires: pkgconfig(cairo-ft)
+BuildRequires: pkgconfig(enchant) >= 0.22
+BuildRequires: pkgconfig(fontconfig) >= 2.4
+BuildRequires: pkgconfig(freetype2) >= 9.0
+%if %{build_for_gtk3}
+BuildRequires: pkgconfig(gail-3.0) >= 3.0
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.0
+BuildRequires: pkgconfig(gtk+-unix-print-3.0)
+%else
+BuildRequires: pkgconfig(gail) >= 1.8
+BuildRequires: pkgconfig(gtk+-2.0) >= 2.10
+%endif
+BuildRequires: pkgconfig(geoclue)
+BuildRequires: pkgconfig(glib-2.0) >= 2.31.2
+BuildRequires: pkgconfig(gstreamer-0.10) >= 0.10
+BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) >= 0.10.30
+BuildRequires: pkgconfig(libpng)
+BuildRequires: pkgconfig(libsoup-2.4) >= 2.37.2.1
+BuildRequires: pkgconfig(libxml-2.0) >= 2.6
+BuildRequires: pkgconfig(libxslt) >= 1.1.7
+BuildRequires: pkgconfig(pango) >= 1.21.0
+BuildRequires: pkgconfig(pangoft2)
+BuildRequires: pkgconfig(sqlite3) >= 3.0
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(xt)
+BuildRequires: pkgconfig(zlib)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -96,7 +119,6 @@
# We provide %{_pkgname_no_slpp}: that's the GTK+ version being used.
Provides: %{_pkgname_no_slpp} = %{version}
Recommends: %{_pkgname_no_slpp}-lang = %{version}
-%glib2_gsettings_schema_requires
%description -n libwebkitgtk%{_sover}
WebKit is a web content engine, derived from KHTML and KJS from KDE,
@@ -200,8 +222,12 @@
%prep
%setup -q -n webkit-%{version}
%patch0 -p1
-# FIXME: workaround needed in 1.7.3 to fix build
+%patch2
+%patch3 -p1
+# FIXME: workaround needed in > 1.7.90 to fix build
mkdir DerivedSources/ANGLE
+mkdir DerivedSources/InjectedBundle
+mkdir DerivedSources/WebKit2
%build
%ifarch ppc64
@@ -213,20 +239,17 @@
--with-gtk=%{_gtkver} \
--enable-geolocation \
--enable-introspection
-make %{?jobs:-j %jobs}
+make
+#make %{?jobs:-j %jobs}
%install
%makeinstall
%find_lang webkit-%{_gtkver}
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
-%post -n libwebkitgtk%{_sover}
-/sbin/ldconfig
-%glib2_gsettings_schema_post
-
-%postun -n libwebkitgtk%{_sover}
-/sbin/ldconfig
-%glib2_gsettings_schema_postun
+%post -n libwebkitgtk%{_sover} -p /sbin/ldconfig
+
+%postun -n libwebkitgtk%{_sover} -p /sbin/ldconfig
%post -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig
@@ -239,7 +262,6 @@
%defattr(-,root,root)
%doc Source/WebCore/LICENSE-APPLE Source/WebCore/LICENSE-LGPL-2
Source/WebCore/LICENSE-LGPL-2.1 Source/WebKit/LICENSE Source/WebKit/gtk/NEWS
%{_libdir}/libwebkitgtk-%{_sonamever}.so.*
-%{_datadir}/glib-2.0/schemas/org.webkitgtk-%{_sonamever}.gschema.xml
%{_datadir}/webkitgtk-%{_sonamever}/
%files -n libjavascriptcoregtk%{_sover}
@@ -257,6 +279,8 @@
%files -n libwebkitgtk%{?_develnamever}-devel
%defattr(-,root,root)
+# FIXME: this is wrong: libwebkitgtk-devel and libwebkitgtk3-devel will
conflict on the gtk-doc files
+%doc %{_datadir}/gtk-doc/html/webkitgtk/
%{_libdir}/libjavascriptcoregtk-%{_sonamever}.so
%{_libdir}/libwebkitgtk-%{_sonamever}.so
%{_libdir}/pkgconfig/javascriptcoregtk-%{_sonamever}.pc
++++++ libwebkit3.spec ++++++
--- /var/tmp/diff_new_pack.KxNNos/_old 2012-03-01 07:49:37.000000000 +0100
+++ /var/tmp/diff_new_pack.KxNNos/_new 2012-03-01 07:49:37.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libwebkit3
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -43,37 +43,60 @@
Summary: Library for rendering web content, GTK+ Port
License: LGPL-2.0 ; LGPL-2.0+
Group: Development/Libraries/C and C++
-Version: 1.7.3
+Version: 1.7.90
Release: 0
-# FIXME: after 1.7.3, remove workaround in %%setup that is needed to fix the
build
+# FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and
gtk3 versions
+# FIXME: after 1.7.90, remove workaround in %%setup that is needed to fix the
build
Url: http://webkit.org/
Source: http://www.webkitgtk.org/webkit-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM webkit-gir-fixup.patch dimstar@xxxxxxxxxxxx -- Fix
JSCore.gir to reference a real library.
Patch0: webkit-gir-fixup.patch
+# PATCH-FIX-OPENSUSE webkit-ld-optimization.patch vuntz@xxxxxxxxxxxx -- Add ld
options to use less memory when linking, should help building on OBS, but this
will be slower
+Patch2: webkit-ld-optimization.patch
+# PATCH-FIX-UPSTREAM libwebkit-fix-gtk2.patch vuntz@xxxxxxxxxxxx -- Fix build
of the gtk+ 2 version, sent upstream by irc
+Patch3: libwebkit-fix-gtk2.patch
BuildRequires: Mesa-devel
BuildRequires: bison
-BuildRequires: enchant-devel
BuildRequires: flex
BuildRequires: gcc-c++
-BuildRequires: gobject-introspection-devel
+BuildRequires: gobject-introspection-devel >= 0.9.5
BuildRequires: gperf
-BuildRequires: gstreamer-0_10-plugins-base-devel >= 0.10.30
-%if %{build_for_gtk3}
-BuildRequires: gtk3-devel >= 3.0
-%else
-BuildRequires: gtk2-devel >= 2.10
-%endif
-BuildRequires: libgeoclue-devel
+BuildRequires: gtk-doc
BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
-BuildRequires: libsoup-devel >= 2.37.2.1
-BuildRequires: libxslt-devel
-BuildRequires: sqlite3-devel
-# Only needed because we don't (and won't) support building xz tarballs by
default... See bnc#697467
-BuildRequires: xz
+BuildRequires: perl
+BuildRequires: python
# Needed by make-hash-tools.pl, after move to perl 5.14
BuildRequires: perl(Switch)
+BuildRequires: pkgconfig(atspi-2) >= 2.2.1
+BuildRequires: pkgconfig(cairo) >= 1.10
+BuildRequires: pkgconfig(cairo-ft)
+BuildRequires: pkgconfig(enchant) >= 0.22
+BuildRequires: pkgconfig(fontconfig) >= 2.4
+BuildRequires: pkgconfig(freetype2) >= 9.0
+%if %{build_for_gtk3}
+BuildRequires: pkgconfig(gail-3.0) >= 3.0
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.0
+BuildRequires: pkgconfig(gtk+-unix-print-3.0)
+%else
+BuildRequires: pkgconfig(gail) >= 1.8
+BuildRequires: pkgconfig(gtk+-2.0) >= 2.10
+%endif
+BuildRequires: pkgconfig(geoclue)
+BuildRequires: pkgconfig(glib-2.0) >= 2.31.2
+BuildRequires: pkgconfig(gstreamer-0.10) >= 0.10
+BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) >= 0.10.30
+BuildRequires: pkgconfig(libpng)
+BuildRequires: pkgconfig(libsoup-2.4) >= 2.37.2.1
+BuildRequires: pkgconfig(libxml-2.0) >= 2.6
+BuildRequires: pkgconfig(libxslt) >= 1.1.7
+BuildRequires: pkgconfig(pango) >= 1.21.0
+BuildRequires: pkgconfig(pangoft2)
+BuildRequires: pkgconfig(sqlite3) >= 3.0
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(xt)
+BuildRequires: pkgconfig(zlib)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -96,7 +119,6 @@
# We provide %{_pkgname_no_slpp}: that's the GTK+ version being used.
Provides: %{_pkgname_no_slpp} = %{version}
Recommends: %{_pkgname_no_slpp}-lang = %{version}
-%glib2_gsettings_schema_requires
%description -n libwebkitgtk%{_sover}
WebKit is a web content engine, derived from KHTML and KJS from KDE,
@@ -200,8 +222,12 @@
%prep
%setup -q -n webkit-%{version}
%patch0 -p1
-# FIXME: workaround needed in 1.7.3 to fix build
+%patch2
+%patch3 -p1
+# FIXME: workaround needed in > 1.7.90 to fix build
mkdir DerivedSources/ANGLE
+mkdir DerivedSources/InjectedBundle
+mkdir DerivedSources/WebKit2
%build
%ifarch ppc64
@@ -213,20 +239,17 @@
--with-gtk=%{_gtkver} \
--enable-geolocation \
--enable-introspection
-make %{?jobs:-j %jobs}
+make
+#make %{?jobs:-j %jobs}
%install
%makeinstall
%find_lang webkit-%{_gtkver}
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
-%post -n libwebkitgtk%{_sover}
-/sbin/ldconfig
-%glib2_gsettings_schema_post
-
-%postun -n libwebkitgtk%{_sover}
-/sbin/ldconfig
-%glib2_gsettings_schema_postun
+%post -n libwebkitgtk%{_sover} -p /sbin/ldconfig
+
+%postun -n libwebkitgtk%{_sover} -p /sbin/ldconfig
%post -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig
@@ -239,7 +262,6 @@
%defattr(-,root,root)
%doc Source/WebCore/LICENSE-APPLE Source/WebCore/LICENSE-LGPL-2
Source/WebCore/LICENSE-LGPL-2.1 Source/WebKit/LICENSE Source/WebKit/gtk/NEWS
%{_libdir}/libwebkitgtk-%{_sonamever}.so.*
-%{_datadir}/glib-2.0/schemas/org.webkitgtk-%{_sonamever}.gschema.xml
%{_datadir}/webkitgtk-%{_sonamever}/
%files -n libjavascriptcoregtk%{_sover}
@@ -257,6 +279,8 @@
%files -n libwebkitgtk%{?_develnamever}-devel
%defattr(-,root,root)
+# FIXME: this is wrong: libwebkitgtk-devel and libwebkitgtk3-devel will
conflict on the gtk-doc files
+%doc %{_datadir}/gtk-doc/html/webkitgtk/
%{_libdir}/libjavascriptcoregtk-%{_sonamever}.so
%{_libdir}/libwebkitgtk-%{_sonamever}.so
%{_libdir}/pkgconfig/javascriptcoregtk-%{_sonamever}.pc
++++++ libwebkit-fix-gtk2.patch ++++++
Index: webkit-1.7.90/Source/WebKit/gtk/tests/testwebview.c
===================================================================
--- webkit-1.7.90.orig/Source/WebKit/gtk/tests/testwebview.c
+++ webkit-1.7.90/Source/WebKit/gtk/tests/testwebview.c
@@ -389,7 +389,11 @@ static void test_webkit_web_view_does_no
GtkWidget *window = gtk_offscreen_window_new();
GtkWidget *webView = webkit_web_view_new();
GtkWidget *entry = gtk_entry_new();
+#ifdef GTK_API_VERSION_2
+ GtkWidget *box = gtk_hbox_new(FALSE, 0);
+#else
GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#endif
gtk_container_add(GTK_CONTAINER(box), webView);
gtk_container_add(GTK_CONTAINER(box), entry);
++++++ webkit-ld-optimization.patch ++++++
Index: Source/WebKit/gtk/GNUmakefile.am
===================================================================
--- Source/WebKit/gtk/GNUmakefile.am.orig
+++ Source/WebKit/gtk/GNUmakefile.am
@@ -78,7 +78,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSIO
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS
= \
-version-info @LIBWEBKITGTK_VERSION@ \
- $(version_script) \
+ $(version_script) -Wl,--reduce-memory-overheads -Wl,--no-keep-memory \
$(no_undefined)
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD
= \
Index: Source/WebKit2/GNUmakefile.am
===================================================================
--- Source/WebKit2/GNUmakefile.am.orig
+++ Source/WebKit2/GNUmakefile.am
@@ -1059,7 +1059,7 @@ endif
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS
= \
-version-info @LIBWEBKITGTK_VERSION@ \
- $(version_script) \
+ $(version_script) -Wl,--reduce-memory-overheads -Wl,--no-keep-memory \
$(no_undefined)
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD
= \
Index: GNUmakefile.in
===================================================================
--- GNUmakefile.in.orig
+++ GNUmakefile.in
@@ -19150,7 +19150,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSIO
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS
= \
-version-info @LIBWEBKITGTK_VERSION@ \
- $(version_script) \
+ $(version_script) -Wl,--reduce-memory-overheads -Wl,--no-keep-memory \
$(no_undefined)
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD
= \
@@ -20509,7 +20509,7 @@ Programs_ImageDiff_LDFLAGS = \
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS
= \
-version-info @LIBWEBKITGTK_VERSION@ \
- $(version_script) \
+ $(version_script) -Wl,--reduce-memory-overheads -Wl,--no-keep-memory \
$(no_undefined)
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD
= \
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
here is the log from the commit of package libwebkit for openSUSE:Factory
checked in at 2012-03-01 07:49:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libwebkit (Old)
and /work/SRC/openSUSE:Factory/.libwebkit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libwebkit", Maintainer is "DMZhang@xxxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libwebkit/libwebkit.changes 2012-01-09
15:19:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libwebkit.new/libwebkit.changes 2012-03-01
07:49:34.000000000 +0100
@@ -1,0 +2,120 @@
+Thu Feb 23 08:10:15 UTC 2012 - vuntz@xxxxxxxxxxxx
+
+- Update to version 1.7.90:
+ + Geolocation support is built by default now.
+ + requestAnimationFrame support is built by default now.
+ + Remove defunct WebInspector GSettings mapping.
+ + Lots of build fixes for Windows, GNU Hurd, A64, SPARC and
+ Alpha.
+ + WebKit will try to use the default libsoup proxy resolver
+ automatically.
+ + Now interpret plugin metadata as UTF-8.
+ + Web content (except plugins) should no longer steal focus from
+ other GTK+ widgets.
+- Drop libwebkit-ia64.patch: fixed upstream.
+- Rebase webkit-ld-optimization.patch.
+- Add pkgconfig(zlib) BuildRequires: new dependency.
+- Add explicit pkgconfig(glib-2.0) BuildRequires so we can version
+ it.
+- Add explicit perl, python BuildRequires: those are explicitly
+ checked for in configure now.
+- Add gtk-doc BuildRequires: the gtk-doc tools are needed at
+ install time, for the webkit-specific tools generating the docs.
+- Add libwebkit-fix-gtk2.patch: fix build of the GTK+ 2.x version.
+- Stop using %glib2_gsettings_schema_* macros for
+ libwebkitgtk-1_0-0 and libwebkitgtk-3_0-0: there's no GSettings
+ schema anymore.
+- Do not use parallel build as it seems to be causing several
+ issues.
+
+-------------------------------------------------------------------
+Mon Feb 20 12:22:34 UTC 2012 - vuntz@xxxxxxxxxxxx
+
+- Move to pkgconfig() BuildRequires:
+ + Old ones: enchant-devel, gstreamer-0_10-plugins-base-devel,
+ gtk2-devel/gtk3-devel, libgeoclue-devel, libsoup-devel,
+ libxslt-devel, sqlite3-devel.
+ + New ones: enchant, gtk+-2.0/gtk+-3.0, geoclue, gstreamer-0.10,
+ gstreamer-plugins-base-0.10, libsoup-2.4, libxslt, sqlite3.
+- Add missing explicit BuildRequires (some are needed to fix the
+ build after the xorg-x11 massive packaging change): cairo,
+ cairo-ft, fontconfig, freetype2, freetype2, gail/gail-3.0,
+ libpng, libxml-2.0, pango, pangoft2, xrender, xt.
+
+-------------------------------------------------------------------
+Thu Feb 16 09:16:51 UTC 2012 - vuntz@xxxxxxxxxxxx
+
+- Add webkit-ld-optimization.patch: pass options to ld (namely
+ -Wl,--reduce-memory-overheads -Wl,--no-keep-memory) to use less
+ memory when linking. This should help building on OBS. Thanks to
+ the openSUSE-ARM team!
+
+-------------------------------------------------------------------
+Wed Feb 8 14:24:22 UTC 2012 - vuntz@xxxxxxxxxxxx
+
+- Update to version 1.7.5:
+ + Add new signals to track resources loading.
+ + Add --no-timeout command line option to DumpRenderTree.
+ + Expose accessibility hierarchy in WebKit2 to ATK/AT-SPI based
+ ATs.
+ + Allow to build using extra jhbuild modulesets.
+ + Fix emission of ATK text-caret-moved and text-selection-changed
+ events.
+ + Update primary clipboard with the current selection in X11
+ platforms in WebKit2.
+ + Implement the policy client in WebKit2 GTK+ API.
+ + Add basic printing support to WebKit2.
+ + Do not add unnecessary blanks at the end of a line of text to
+ fix the line returned by atk_text_get_text_at_offset().
+ + Make sure input text field is repainted when value is changed.
+ + Add print-backgrounds setting to WebKit2 GTK+ API.
+ + Respect the has-backward-stepper and has-forward-stepper
+ properties when drawing scrollbars.
+ + WebKit-3.0.gir now includes information about C includes or
+ exported packages.
+ + WebKit1 API documentation was not generated when building with
+ gtk-2.0.
+ + Make WebKitWebView work inside a GtkOffscreenWindow.
+ + Implement DownloadClient and add downloads API to WebKit2 GTK+
+ API.
+- Remove xz BuildRequires now that it comes for free in the build
+ system.
+- Add pkgconfig(atspi-2) BuildRequires: new dependency upstream.
+- Add pkgconfig(gtk+-unix-print-3.0) BuildRequires for gtk3 build:
+ new dependency upstream.
+
+-------------------------------------------------------------------
+Thu Feb 02 23:30:15 UTC 2012 - ro@xxxxxxx
+
+- Add libwebkit-ia64.patch: fix build on ia64.
+
+-------------------------------------------------------------------
+Tue Jan 17 16:09:56 UTC 2012 - vuntz@xxxxxxxxxxxx
+
+- Update to version 1.7.4:
+ + Fix a11y regression: text-inserted events lack text inserted
+ and current line.
+ + Fix scrollbars in WebKit2 that were drawn behind the window
+ resize grip.
+ + Fix a memory leak in WebKitWebSourceGStreamer.
+ + Slider thumb is not centered on the track with the unico theme.
+ + Fix context menu in WebKit2 to not dissapear right after it's
+ shown.
+ + Use GtkOrientable style class in GTK+ 3 theming code.
+ + Change default WebSocket protocol to the latest one (hybi-17).
+ + Fix scrollbars size with GTK+ 3.x to follow the current theme.
+ + Use gdk_screen_get_monitor_workarea() when available for
+ screenAvailableRect().
+ + Rename webkit_web_view_load_alternate_html as
+ webkit_web_view_replace_content in WebKit2 GTK+.
+ + Fix emission of ATK text-caret-moved and text-selection-changed
+ events.
+ + Add methods to get/set the WebView zoom level to WebKit2 GTK+
+ API.
+ + Make WebProcess and PluginProcess use the same locale as the UI
+ process.
+ + Simplify WebKit2 loader client API.
+- Create DerivedSources/webkit in %setup to fix build, as a
+ temporary workaround.
+
+-------------------------------------------------------------------
libwebkit3.changes: same change
Old:
----
webkit-1.7.3.tar.xz
New:
----
libwebkit-fix-gtk2.patch
webkit-1.7.90.tar.xz
webkit-ld-optimization.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libwebkit.spec ++++++
--- /var/tmp/diff_new_pack.KxNNos/_old 2012-03-01 07:49:37.000000000 +0100
+++ /var/tmp/diff_new_pack.KxNNos/_new 2012-03-01 07:49:37.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libwebkit
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -43,37 +43,60 @@
Summary: Library for rendering web content, GTK+ Port
License: LGPL-2.0 ; LGPL-2.0+
Group: Development/Libraries/C and C++
-Version: 1.7.3
+Version: 1.7.90
Release: 0
-# FIXME: after 1.7.3, remove workaround in %%setup that is needed to fix the
build
+# FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and
gtk3 versions
+# FIXME: after 1.7.90, remove workaround in %%setup that is needed to fix the
build
Url: http://webkit.org/
Source: http://www.webkitgtk.org/webkit-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM webkit-gir-fixup.patch dimstar@xxxxxxxxxxxx -- Fix
JSCore.gir to reference a real library.
Patch0: webkit-gir-fixup.patch
+# PATCH-FIX-OPENSUSE webkit-ld-optimization.patch vuntz@xxxxxxxxxxxx -- Add ld
options to use less memory when linking, should help building on OBS, but this
will be slower
+Patch2: webkit-ld-optimization.patch
+# PATCH-FIX-UPSTREAM libwebkit-fix-gtk2.patch vuntz@xxxxxxxxxxxx -- Fix build
of the gtk+ 2 version, sent upstream by irc
+Patch3: libwebkit-fix-gtk2.patch
BuildRequires: Mesa-devel
BuildRequires: bison
-BuildRequires: enchant-devel
BuildRequires: flex
BuildRequires: gcc-c++
-BuildRequires: gobject-introspection-devel
+BuildRequires: gobject-introspection-devel >= 0.9.5
BuildRequires: gperf
-BuildRequires: gstreamer-0_10-plugins-base-devel >= 0.10.30
-%if %{build_for_gtk3}
-BuildRequires: gtk3-devel >= 3.0
-%else
-BuildRequires: gtk2-devel >= 2.10
-%endif
-BuildRequires: libgeoclue-devel
+BuildRequires: gtk-doc
BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
-BuildRequires: libsoup-devel >= 2.37.2.1
-BuildRequires: libxslt-devel
-BuildRequires: sqlite3-devel
-# Only needed because we don't (and won't) support building xz tarballs by
default... See bnc#697467
-BuildRequires: xz
+BuildRequires: perl
+BuildRequires: python
# Needed by make-hash-tools.pl, after move to perl 5.14
BuildRequires: perl(Switch)
+BuildRequires: pkgconfig(atspi-2) >= 2.2.1
+BuildRequires: pkgconfig(cairo) >= 1.10
+BuildRequires: pkgconfig(cairo-ft)
+BuildRequires: pkgconfig(enchant) >= 0.22
+BuildRequires: pkgconfig(fontconfig) >= 2.4
+BuildRequires: pkgconfig(freetype2) >= 9.0
+%if %{build_for_gtk3}
+BuildRequires: pkgconfig(gail-3.0) >= 3.0
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.0
+BuildRequires: pkgconfig(gtk+-unix-print-3.0)
+%else
+BuildRequires: pkgconfig(gail) >= 1.8
+BuildRequires: pkgconfig(gtk+-2.0) >= 2.10
+%endif
+BuildRequires: pkgconfig(geoclue)
+BuildRequires: pkgconfig(glib-2.0) >= 2.31.2
+BuildRequires: pkgconfig(gstreamer-0.10) >= 0.10
+BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) >= 0.10.30
+BuildRequires: pkgconfig(libpng)
+BuildRequires: pkgconfig(libsoup-2.4) >= 2.37.2.1
+BuildRequires: pkgconfig(libxml-2.0) >= 2.6
+BuildRequires: pkgconfig(libxslt) >= 1.1.7
+BuildRequires: pkgconfig(pango) >= 1.21.0
+BuildRequires: pkgconfig(pangoft2)
+BuildRequires: pkgconfig(sqlite3) >= 3.0
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(xt)
+BuildRequires: pkgconfig(zlib)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -96,7 +119,6 @@
# We provide %{_pkgname_no_slpp}: that's the GTK+ version being used.
Provides: %{_pkgname_no_slpp} = %{version}
Recommends: %{_pkgname_no_slpp}-lang = %{version}
-%glib2_gsettings_schema_requires
%description -n libwebkitgtk%{_sover}
WebKit is a web content engine, derived from KHTML and KJS from KDE,
@@ -200,8 +222,12 @@
%prep
%setup -q -n webkit-%{version}
%patch0 -p1
-# FIXME: workaround needed in 1.7.3 to fix build
+%patch2
+%patch3 -p1
+# FIXME: workaround needed in > 1.7.90 to fix build
mkdir DerivedSources/ANGLE
+mkdir DerivedSources/InjectedBundle
+mkdir DerivedSources/WebKit2
%build
%ifarch ppc64
@@ -213,20 +239,17 @@
--with-gtk=%{_gtkver} \
--enable-geolocation \
--enable-introspection
-make %{?jobs:-j %jobs}
+make
+#make %{?jobs:-j %jobs}
%install
%makeinstall
%find_lang webkit-%{_gtkver}
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
-%post -n libwebkitgtk%{_sover}
-/sbin/ldconfig
-%glib2_gsettings_schema_post
-
-%postun -n libwebkitgtk%{_sover}
-/sbin/ldconfig
-%glib2_gsettings_schema_postun
+%post -n libwebkitgtk%{_sover} -p /sbin/ldconfig
+
+%postun -n libwebkitgtk%{_sover} -p /sbin/ldconfig
%post -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig
@@ -239,7 +262,6 @@
%defattr(-,root,root)
%doc Source/WebCore/LICENSE-APPLE Source/WebCore/LICENSE-LGPL-2
Source/WebCore/LICENSE-LGPL-2.1 Source/WebKit/LICENSE Source/WebKit/gtk/NEWS
%{_libdir}/libwebkitgtk-%{_sonamever}.so.*
-%{_datadir}/glib-2.0/schemas/org.webkitgtk-%{_sonamever}.gschema.xml
%{_datadir}/webkitgtk-%{_sonamever}/
%files -n libjavascriptcoregtk%{_sover}
@@ -257,6 +279,8 @@
%files -n libwebkitgtk%{?_develnamever}-devel
%defattr(-,root,root)
+# FIXME: this is wrong: libwebkitgtk-devel and libwebkitgtk3-devel will
conflict on the gtk-doc files
+%doc %{_datadir}/gtk-doc/html/webkitgtk/
%{_libdir}/libjavascriptcoregtk-%{_sonamever}.so
%{_libdir}/libwebkitgtk-%{_sonamever}.so
%{_libdir}/pkgconfig/javascriptcoregtk-%{_sonamever}.pc
++++++ libwebkit3.spec ++++++
--- /var/tmp/diff_new_pack.KxNNos/_old 2012-03-01 07:49:37.000000000 +0100
+++ /var/tmp/diff_new_pack.KxNNos/_new 2012-03-01 07:49:37.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libwebkit3
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -43,37 +43,60 @@
Summary: Library for rendering web content, GTK+ Port
License: LGPL-2.0 ; LGPL-2.0+
Group: Development/Libraries/C and C++
-Version: 1.7.3
+Version: 1.7.90
Release: 0
-# FIXME: after 1.7.3, remove workaround in %%setup that is needed to fix the
build
+# FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and
gtk3 versions
+# FIXME: after 1.7.90, remove workaround in %%setup that is needed to fix the
build
Url: http://webkit.org/
Source: http://www.webkitgtk.org/webkit-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM webkit-gir-fixup.patch dimstar@xxxxxxxxxxxx -- Fix
JSCore.gir to reference a real library.
Patch0: webkit-gir-fixup.patch
+# PATCH-FIX-OPENSUSE webkit-ld-optimization.patch vuntz@xxxxxxxxxxxx -- Add ld
options to use less memory when linking, should help building on OBS, but this
will be slower
+Patch2: webkit-ld-optimization.patch
+# PATCH-FIX-UPSTREAM libwebkit-fix-gtk2.patch vuntz@xxxxxxxxxxxx -- Fix build
of the gtk+ 2 version, sent upstream by irc
+Patch3: libwebkit-fix-gtk2.patch
BuildRequires: Mesa-devel
BuildRequires: bison
-BuildRequires: enchant-devel
BuildRequires: flex
BuildRequires: gcc-c++
-BuildRequires: gobject-introspection-devel
+BuildRequires: gobject-introspection-devel >= 0.9.5
BuildRequires: gperf
-BuildRequires: gstreamer-0_10-plugins-base-devel >= 0.10.30
-%if %{build_for_gtk3}
-BuildRequires: gtk3-devel >= 3.0
-%else
-BuildRequires: gtk2-devel >= 2.10
-%endif
-BuildRequires: libgeoclue-devel
+BuildRequires: gtk-doc
BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
-BuildRequires: libsoup-devel >= 2.37.2.1
-BuildRequires: libxslt-devel
-BuildRequires: sqlite3-devel
-# Only needed because we don't (and won't) support building xz tarballs by
default... See bnc#697467
-BuildRequires: xz
+BuildRequires: perl
+BuildRequires: python
# Needed by make-hash-tools.pl, after move to perl 5.14
BuildRequires: perl(Switch)
+BuildRequires: pkgconfig(atspi-2) >= 2.2.1
+BuildRequires: pkgconfig(cairo) >= 1.10
+BuildRequires: pkgconfig(cairo-ft)
+BuildRequires: pkgconfig(enchant) >= 0.22
+BuildRequires: pkgconfig(fontconfig) >= 2.4
+BuildRequires: pkgconfig(freetype2) >= 9.0
+%if %{build_for_gtk3}
+BuildRequires: pkgconfig(gail-3.0) >= 3.0
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.0
+BuildRequires: pkgconfig(gtk+-unix-print-3.0)
+%else
+BuildRequires: pkgconfig(gail) >= 1.8
+BuildRequires: pkgconfig(gtk+-2.0) >= 2.10
+%endif
+BuildRequires: pkgconfig(geoclue)
+BuildRequires: pkgconfig(glib-2.0) >= 2.31.2
+BuildRequires: pkgconfig(gstreamer-0.10) >= 0.10
+BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) >= 0.10.30
+BuildRequires: pkgconfig(libpng)
+BuildRequires: pkgconfig(libsoup-2.4) >= 2.37.2.1
+BuildRequires: pkgconfig(libxml-2.0) >= 2.6
+BuildRequires: pkgconfig(libxslt) >= 1.1.7
+BuildRequires: pkgconfig(pango) >= 1.21.0
+BuildRequires: pkgconfig(pangoft2)
+BuildRequires: pkgconfig(sqlite3) >= 3.0
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(xt)
+BuildRequires: pkgconfig(zlib)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -96,7 +119,6 @@
# We provide %{_pkgname_no_slpp}: that's the GTK+ version being used.
Provides: %{_pkgname_no_slpp} = %{version}
Recommends: %{_pkgname_no_slpp}-lang = %{version}
-%glib2_gsettings_schema_requires
%description -n libwebkitgtk%{_sover}
WebKit is a web content engine, derived from KHTML and KJS from KDE,
@@ -200,8 +222,12 @@
%prep
%setup -q -n webkit-%{version}
%patch0 -p1
-# FIXME: workaround needed in 1.7.3 to fix build
+%patch2
+%patch3 -p1
+# FIXME: workaround needed in > 1.7.90 to fix build
mkdir DerivedSources/ANGLE
+mkdir DerivedSources/InjectedBundle
+mkdir DerivedSources/WebKit2
%build
%ifarch ppc64
@@ -213,20 +239,17 @@
--with-gtk=%{_gtkver} \
--enable-geolocation \
--enable-introspection
-make %{?jobs:-j %jobs}
+make
+#make %{?jobs:-j %jobs}
%install
%makeinstall
%find_lang webkit-%{_gtkver}
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
-%post -n libwebkitgtk%{_sover}
-/sbin/ldconfig
-%glib2_gsettings_schema_post
-
-%postun -n libwebkitgtk%{_sover}
-/sbin/ldconfig
-%glib2_gsettings_schema_postun
+%post -n libwebkitgtk%{_sover} -p /sbin/ldconfig
+
+%postun -n libwebkitgtk%{_sover} -p /sbin/ldconfig
%post -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig
@@ -239,7 +262,6 @@
%defattr(-,root,root)
%doc Source/WebCore/LICENSE-APPLE Source/WebCore/LICENSE-LGPL-2
Source/WebCore/LICENSE-LGPL-2.1 Source/WebKit/LICENSE Source/WebKit/gtk/NEWS
%{_libdir}/libwebkitgtk-%{_sonamever}.so.*
-%{_datadir}/glib-2.0/schemas/org.webkitgtk-%{_sonamever}.gschema.xml
%{_datadir}/webkitgtk-%{_sonamever}/
%files -n libjavascriptcoregtk%{_sover}
@@ -257,6 +279,8 @@
%files -n libwebkitgtk%{?_develnamever}-devel
%defattr(-,root,root)
+# FIXME: this is wrong: libwebkitgtk-devel and libwebkitgtk3-devel will
conflict on the gtk-doc files
+%doc %{_datadir}/gtk-doc/html/webkitgtk/
%{_libdir}/libjavascriptcoregtk-%{_sonamever}.so
%{_libdir}/libwebkitgtk-%{_sonamever}.so
%{_libdir}/pkgconfig/javascriptcoregtk-%{_sonamever}.pc
++++++ libwebkit-fix-gtk2.patch ++++++
Index: webkit-1.7.90/Source/WebKit/gtk/tests/testwebview.c
===================================================================
--- webkit-1.7.90.orig/Source/WebKit/gtk/tests/testwebview.c
+++ webkit-1.7.90/Source/WebKit/gtk/tests/testwebview.c
@@ -389,7 +389,11 @@ static void test_webkit_web_view_does_no
GtkWidget *window = gtk_offscreen_window_new();
GtkWidget *webView = webkit_web_view_new();
GtkWidget *entry = gtk_entry_new();
+#ifdef GTK_API_VERSION_2
+ GtkWidget *box = gtk_hbox_new(FALSE, 0);
+#else
GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#endif
gtk_container_add(GTK_CONTAINER(box), webView);
gtk_container_add(GTK_CONTAINER(box), entry);
++++++ webkit-ld-optimization.patch ++++++
Index: Source/WebKit/gtk/GNUmakefile.am
===================================================================
--- Source/WebKit/gtk/GNUmakefile.am.orig
+++ Source/WebKit/gtk/GNUmakefile.am
@@ -78,7 +78,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSIO
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS
= \
-version-info @LIBWEBKITGTK_VERSION@ \
- $(version_script) \
+ $(version_script) -Wl,--reduce-memory-overheads -Wl,--no-keep-memory \
$(no_undefined)
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD
= \
Index: Source/WebKit2/GNUmakefile.am
===================================================================
--- Source/WebKit2/GNUmakefile.am.orig
+++ Source/WebKit2/GNUmakefile.am
@@ -1059,7 +1059,7 @@ endif
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS
= \
-version-info @LIBWEBKITGTK_VERSION@ \
- $(version_script) \
+ $(version_script) -Wl,--reduce-memory-overheads -Wl,--no-keep-memory \
$(no_undefined)
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD
= \
Index: GNUmakefile.in
===================================================================
--- GNUmakefile.in.orig
+++ GNUmakefile.in
@@ -19150,7 +19150,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSIO
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS
= \
-version-info @LIBWEBKITGTK_VERSION@ \
- $(version_script) \
+ $(version_script) -Wl,--reduce-memory-overheads -Wl,--no-keep-memory \
$(no_undefined)
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD
= \
@@ -20509,7 +20509,7 @@ Programs_ImageDiff_LDFLAGS = \
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS
= \
-version-info @LIBWEBKITGTK_VERSION@ \
- $(version_script) \
+ $(version_script) -Wl,--reduce-memory-overheads -Wl,--no-keep-memory \
$(no_undefined)
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD
= \
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |