Hello community, here is the log from the commit of package libwebkit for openSUSE:Factory checked in at 2012-10-03 10:32:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwebkit (Old) and /work/SRC/openSUSE:Factory/.libwebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libwebkit", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libwebkit/libwebkit.changes 2012-08-23 16:05:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libwebkit.new/libwebkit.changes 2012-10-03 10:32:04.000000000 +0200 @@ -1,0 +2,246 @@ +Sat Sep 22 11:40:10 UTC 2012 - [email protected] + +- Update to version 1.9.92: + + Properly expose <legend> elements to ATs. + + The new accessibility CanvasRole is now mapped to + ATK_ROLE_CANVAS. + + Fix the build in Windows platform. + + Fix an infinite loop in accessibility code. + + Fix the build with GStreamer 0.11. + + Fix a crash in network backend with non-UTF8 HTTP header names. + + Properly close audio device after playing sound. + + Sanitize the suggested filename when building the download + destination URI in WebKit2. + + Fix a crash in WebKit2 when navigating between pages in the + history cache. + + Purge unused favicons from IconDatabase after 30 days. + + Fix a crash in + AccessibilityObject::accessibilityPlatformIncludesObject(). + + Fix a crash in WebCore::HTMLSelectElement::selectedIndex(). + + Fix caret-moved events not emitted for certain content. + + Fix incorrect/unexpected characters in the text of certain + accessibles. + + Implement AccessibilityUIElement::titleUIElement() and + AccessibilityUIElement::stringValue(). + + Fix LLint build with -g -02. + +------------------------------------------------------------------- +Fri Sep 14 07:06:06 UTC 2012 - [email protected] + +- Update to version 1.9.91: + + Fix more API breaks in DOM bindings introduced in previous + versions. + + Properly process GDK_SMOOTH_SCROLL events. + +------------------------------------------------------------------- +Sat Sep 8 06:52:11 UTC 2012 - [email protected] + +- Add pkgconfig(gudev-1.0) BuildRequires: this is needed for the + gamepad support. It's disabled right now, but this build + dependency doesn't harm us, so add it to have it automatically + enabled when it becomes ready. + +------------------------------------------------------------------- +Thu Aug 30 19:17:21 UTC 2012 - [email protected] + +- Switch to GStreamer 1.0: + + Pass --with-gstreamer=1.0 to configure + + Replace pkgconfig(gstreamer*-0.10) BuildRequires with + pkgconfig(gstramer*-1.0). + +------------------------------------------------------------------- +Thu Aug 23 20:19:35 UTC 2012 - [email protected] + +- Update to version 1.9.90: + + WebKit2 GTK+ improvements: + - change spellchecker languages API a bit + - add destroy notify parameter to + webkit_web_context_register_uri_scheme() + - replace webkit_web_view_replace_content() with + webkit_web_view_load_alternate_html() + - rename WebKitWebView "print-requested" signal to "print" + - API to set preferred languages + - add webkit_uri_response_get_suggested_filename() + - add API to save a web page in MHTML format + - implement smart separators for context menu + + Make WebKitWebView work again inside a GtkOverlay by not using + a native window for Accelerated Compositing implementation. + + Fix several API breaks in DOM bindings introduced in 1.9.6. + + Fix invalid UTF-8 data passed to the spellchecker. + + Fix caret-moved events not emitted for certain content. + + Expose ROLE_TOGGLE_BUTTON instead of ROLE_PUSH_BUTTON when + aria-pressed is present. + + Fix several memory leaks. +- Add pkgconfig(xcomposite) BuildRequires: new dependency for + accelerated output. +- Introduce _withwk2 defines in order to easy toggle webkit2 on and + off. +- Introduce wk2sover defines: webkitgtk and webkit2gtk do not + share the same sover. +- Drop webkit-fixbuild.patch: fixed upstream. + +------------------------------------------------------------------- +Thu Aug 16 23:59:59 UTC 2012 - [email protected] + +- Update to version 1.9.6: + + WebKit2 GTK+ improvements: + - add spell checker API + - add WebKitWebView::submit-form signal + - paste primary selection when middle clicking in X11 + + Add API to get the suggested filename from a + WebKitNetworkResponse. + + Add webkit_web_view_get_snapshot() to WebKit1 API + + Make sure WebKitWebView always has a main resource and it has + already been set when the load has been committed, even for + pages loaded from the history cache in WebKit2 + + Fix a run time critical warning when gdk_window_get_cursor() is + called before WebKitWebView has been realized in WebKit2 + + Fix continuous insertion of newlines in Etherpad + + Fix several memory leaks +- Always build with -g0, and not just on ARM: otherwise, the build + just always fails because we're running out of memory. + +------------------------------------------------------------------- +Thu Aug 16 20:56:33 UTC 2012 - [email protected] + +- Update to version 1.9.5: + + WebKit2 GTK+ improvements: + - API to get HTTPS status + - API to clear the cache + - add webkit_cookie_manager_set_persistent_storage() + - improve performance of searching + - implement disk cache + - add site specific quirks setting + - add setting to enable/disable page cache + - add WebKitWebView::context-menu-dismissed signal + - fix inspector detach when inspector was attached by the + client + - don't show accel labels in context menu items + + Add webkit_web_frame_get_dom_document() to WebKit GTK+ API. + + Use soup_cookie_jar_is_persistent() to set whether cookie is a + session one or not. + + Fix recognition of contractions (apostrophes) in spell checker. + + Fix a crash when showing the context menu in the Web Inspector. + + WebKitWebView::mouse-target-changed is not emitted when moved + to/from editable content. + + Cache the video dimensions to not query the video-sink sink-pad + caps every time. + + Fix several memory leaks. + +------------------------------------------------------------------- +Thu Aug 16 20:55:33 UTC 2012 - [email protected] + +- Update to version 1.9.4: + + WebKit2 GTK+ improvements: + - add accelerated compositing implementation + - API to register custom URI schemes + - add support for window.showModalDialog + - add webkit_download_get_received_data_length() + - add ContextMenu API + - add Geolocation permission requests API + - API to get the library version + + Add WebKitWebView::run-file-chooser signal to WebKit1 API. + + Port the video sink to GStreamer 0.11 API. + + Add TextureMapper ImageBuffer support as a fallback from the + hardware accelerated path + + Add input methods submenu item to the default context menu for + editable content. + + Unmark highlighted text matches when find operation finishes. + + Honor the device scale factor property when drawing. + + Prevent setting or editing httpOnly cookies from JavaScript. + + Fix several memory leaks. +- Add webkit-fixbuild.patch: Fix build. + +------------------------------------------------------------------- +Thu Aug 16 20:50:33 UTC 2012 - [email protected] + +- Update to version 1.9.3: + + WebKit2 GTK+ improvements: + - add webkit_download_get_request() + - API to get the list of plugins + - add webkit_web_view_can_show_mime_type() + - add GCancellable parameter to all methods using gio async + pattern + - add settings to enable and disable composited layer + indicators + - add generic permission requests API + - add initial inspector API + - allow to attach/detach the inspector + + Add media-playback-requires-user-gesture and + media-playback-allows-inline settings. + + Use defers loading instead of pausing the soup message in + WebKitDownload. + + Properly set the input method context window location. + + Fix a crash in the WebProcess when a download is started from + an existing ResourceHandle. + + Fix cursor used for ne-resize. + + Fix contractions recognition by the spell checker. + + Fix a crash rendering scrollbars on GTK wxWebkit. + + Fix KURL::fileSystemPath() implementation to strip the query + part of the uri. + + Check for GTK2/GTK3 symbol mismatch earlier to fix plugins run + with nspluginwrapper. + + Fix thin archives support while building GTK+ port. + + Fix several memory leaks. + + Fix several compilation warnings. +- Rebase webkit-ld-optimization.patch +- Build WebKit2 library: + + this only works on the gtk3 build, so pass + --enable-webkit2/--disable-webkit2 accordingly. + + Add pkgconfig(gail) and pkgconfig(gtk+-2.0) BuildRequires: the + plugin process used in WebKit2 needs gtk2. + + Create a new libwebkit2gtk subpackage. + + Add libwebkit2gtk Requires to devel subpackage. +- Add ruby BuildRequires: new dependency for the build. + +------------------------------------------------------------------- +Thu Aug 16 20:43:33 UTC 2012 - [email protected] ++++ 49 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libwebkit/libwebkit.changes ++++ and /work/SRC/openSUSE:Factory/.libwebkit.new/libwebkit.changes libwebkit3.changes: same change Old: ---- webkit-1.8.2.tar.xz New: ---- webkit-1.9.92.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwebkit.spec ++++++ --- /var/tmp/diff_new_pack.y0bkfZ/_old 2012-10-03 10:32:07.000000000 +0200 +++ /var/tmp/diff_new_pack.y0bkfZ/_new 2012-10-03 10:32:07.000000000 +0200 @@ -21,17 +21,20 @@ %if %{build_for_gtk3} %define _pkgname_no_slpp libwebkitgtk3 %define _sover -3_0-0 +%define _wk2sover -3_0-18 %define _sonamever 3.0 %define _sonameverpkg 3_0 %define _develnamever 3 %define _gtkver 3.0 %define _jscver 3 %define _pkgconfig_suffix gtk-3.0 +%define _withwk2 1 %else %define _pkgname_no_slpp libwebkitgtk2 %define _sover -1_0-0 %define _sonamever 1.0 %define _sonameverpkg 1_0 +%define _withwk2 0 # empty: #%%define _develnamever %define _gtkver 2.0 @@ -43,11 +46,12 @@ Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0 ; LGPL-2.0+ Group: Development/Libraries/C and C++ -Version: 1.8.2 +Version: 1.9.92 Release: 0 +# FIXME: at some point, figure out a way to remove the hack where we use -g0 to have successful builds # 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/ +Url: http://webkitgtk.org/ Source: http://www.webkitgtk.org/releases/webkit-%{version}.tar.xz Source1: baselibs.conf # PATCH-FIX-UPSTREAM webkit-gir-fixup.patch [email protected] -- Fix JSCore.gir to reference a real library. @@ -65,6 +69,7 @@ BuildRequires: libjpeg-devel BuildRequires: perl BuildRequires: python +BuildRequires: ruby # Needed by make-hash-tools.pl, after move to perl 5.14 BuildRequires: perl(Switch) BuildRequires: pkgconfig(atspi-2) >= 2.2.1 @@ -74,7 +79,10 @@ BuildRequires: pkgconfig(fontconfig) >= 2.4 BuildRequires: pkgconfig(freetype2) >= 9.0 %if %{build_for_gtk3} +# yes, needed for the plugin process even though we're targetting gtk3 +BuildRequires: pkgconfig(gail) >= 1.8 BuildRequires: pkgconfig(gail-3.0) >= 3.0 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.10 BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0 BuildRequires: pkgconfig(gtk+-unix-print-3.0) %else @@ -83,15 +91,17 @@ %endif BuildRequires: pkgconfig(geoclue) BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 -BuildRequires: pkgconfig(gstreamer-0.10) >= 0.10 -BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) >= 0.10.30 +BuildRequires: pkgconfig(gstreamer-1.0) >= 0.11.90 +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 0.11.90 +BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libsoup-2.4) >= 2.37.92 +BuildRequires: pkgconfig(libsoup-2.4) >= 2.39.2 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(xcomposite) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(zlib) @@ -127,6 +137,24 @@ also supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and more. +%if %{_withwk2} +%package -n libwebkit2gtk%{_wk2sover} +Summary: Library for rendering web content, GTK+ Port +Group: System/Libraries +# this will install the non-webkit2 library too; at some point, we should move +# the Provides for %%{_pkgname_no_slpp} here +Recommends: %{_pkgname_no_slpp}-lang = %{version} + +%description -n libwebkit2gtk%{_wk2sover} +WebKit is a web content engine, derived from KHTML and KJS from KDE, +and used primarily in Apple's Safari browser. It is made to be +embedded in other applications, such as mail readers, or web browsers. + +It is able to display content such as HTML, SVG, XML, and others. It +also supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and +more. +%endif + %package -n libjavascriptcoregtk%{_sover} Summary: JavaScript Core Engine, GTK+ Port @@ -174,10 +202,12 @@ port of the JavaScript Core engine. %package -n libwebkitgtk%{?_develnamever}-devel - Summary: Library for rendering web content, GTK+ Port Group: Development/Libraries/C and C++ Requires: libjavascriptcoregtk%{_sover} = %{version} +%if %{_withwk2} +Requires: libwebkit2gtk%{_wk2sover} = %{version} +%endif Requires: libwebkitgtk%{_sover} = %{version} Requires: typelib-1_0-JSCore-%{_sonameverpkg} Requires: typelib-1_0-WebKit-%{_sonameverpkg} @@ -198,7 +228,6 @@ more. %package -n webkit-jsc-%{_jscver} - Summary: Library for rendering web content, GTK+ Port Group: Development/Libraries/C and C++ Requires: libwebkitgtk%{_sover} = %{version} @@ -224,13 +253,15 @@ # FIXME: workaround needed in > 1.7.90 to fix build mkdir DerivedSources/ANGLE mkdir DerivedSources/InjectedBundle -mkdir DerivedSources/WebKit2 +mkdir -p DerivedSources/WebKit2/webkit2gtk/webkit2 +mkdir DerivedSources/webkit %build %ifarch ppc64 RPM_OPT_FLAGS+="-mminimal-toc" %endif %ifarch %arm +# we'll always want to remove the debug from the build on arm RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-g/}" %endif %ifarch ppc ppc64 %arm @@ -238,18 +269,24 @@ RPM_OPT_FLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif -export CFLAGS=" $RPM_OPT_FLAGS" -export CXXFLAGS=" $RPM_OPT_FLAGS" +# No debug builds.... We run out of about everything with -O2 -g (the .ar becomes > 4.3GB) +export CFLAGS=" $RPM_OPT_FLAGS -g0" +export CXXFLAGS=" $RPM_OPT_FLAGS -g0" %configure \ --with-gtk=%{_gtkver} \ --enable-geolocation \ --enable-introspection \ --enable-javascript-debugger \ - %{extraconfigure} \ + %{?extraconfigure} \ --disable-static \ - --enable-shared -#make VERBOSE=1 %{?jobs:-j %jobs} -make VERBOSE=1 + --enable-shared \ + --with-gstreamer=1.0 \ +%if %{_withwk2} + --enable-webkit2 +%else + --disable-webkit2 +%endif +make V=1 %install %makeinstall @@ -260,6 +297,12 @@ %postun -n libwebkitgtk%{_sover} -p /sbin/ldconfig +%if %{_withwk2} +%post -n libwebkit2gtk%{_wk2sover} -p /sbin/ldconfig + +%postun -n libwebkit2gtk%{_wk2sover} -p /sbin/ldconfig +%endif + %post -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig %postun -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig @@ -273,6 +316,14 @@ %{_libdir}/libwebkitgtk-%{_sonamever}.so.* %{_datadir}/webkitgtk-%{_sonamever}/ +%if %{_withwk2} +%files -n libwebkit2gtk%{_wk2sover} +%defattr(-,root,root) +%{_libdir}/libwebkit2gtk-%{_sonamever}.so.* +%{_libexecdir}/WebKitPluginProcess +%{_libexecdir}/WebKitWebProcess +%endif + %files -n libjavascriptcoregtk%{_sover} %defattr(-, root, root) %doc Source/JavaScriptCore/COPYING.LIB Source/WebKit/gtk/NEWS @@ -296,6 +347,11 @@ %{_libdir}/pkgconfig/webkit%{_pkgconfig_suffix}.pc %{_includedir}/webkitgtk-%{_sonamever}/ %{_datadir}/gir-1.0/*.gir +%if %{_withwk2} +%doc %{_datadir}/gtk-doc/html/webkit2gtk/ +%{_libdir}/libwebkit2gtk-%{_sonamever}.so +%{_libdir}/pkgconfig/webkit2%{_pkgconfig_suffix}.pc +%endif %files -n webkit-jsc-%{_jscver} %defattr(-,root,root) ++++++ libwebkit3.spec ++++++ --- /var/tmp/diff_new_pack.y0bkfZ/_old 2012-10-03 10:32:07.000000000 +0200 +++ /var/tmp/diff_new_pack.y0bkfZ/_new 2012-10-03 10:32:07.000000000 +0200 @@ -21,17 +21,20 @@ %if %{build_for_gtk3} %define _pkgname_no_slpp libwebkitgtk3 %define _sover -3_0-0 +%define _wk2sover -3_0-18 %define _sonamever 3.0 %define _sonameverpkg 3_0 %define _develnamever 3 %define _gtkver 3.0 %define _jscver 3 %define _pkgconfig_suffix gtk-3.0 +%define _withwk2 1 %else %define _pkgname_no_slpp libwebkitgtk2 %define _sover -1_0-0 %define _sonamever 1.0 %define _sonameverpkg 1_0 +%define _withwk2 0 # empty: #%%define _develnamever %define _gtkver 2.0 @@ -43,11 +46,12 @@ Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0 ; LGPL-2.0+ Group: Development/Libraries/C and C++ -Version: 1.8.2 +Version: 1.9.92 Release: 0 +# FIXME: at some point, figure out a way to remove the hack where we use -g0 to have successful builds # 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/ +Url: http://webkitgtk.org/ Source: http://www.webkitgtk.org/releases/webkit-%{version}.tar.xz Source1: baselibs.conf # PATCH-FIX-UPSTREAM webkit-gir-fixup.patch [email protected] -- Fix JSCore.gir to reference a real library. @@ -65,6 +69,7 @@ BuildRequires: libjpeg-devel BuildRequires: perl BuildRequires: python +BuildRequires: ruby # Needed by make-hash-tools.pl, after move to perl 5.14 BuildRequires: perl(Switch) BuildRequires: pkgconfig(atspi-2) >= 2.2.1 @@ -74,7 +79,10 @@ BuildRequires: pkgconfig(fontconfig) >= 2.4 BuildRequires: pkgconfig(freetype2) >= 9.0 %if %{build_for_gtk3} +# yes, needed for the plugin process even though we're targetting gtk3 +BuildRequires: pkgconfig(gail) >= 1.8 BuildRequires: pkgconfig(gail-3.0) >= 3.0 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.10 BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0 BuildRequires: pkgconfig(gtk+-unix-print-3.0) %else @@ -83,15 +91,17 @@ %endif BuildRequires: pkgconfig(geoclue) BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 -BuildRequires: pkgconfig(gstreamer-0.10) >= 0.10 -BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) >= 0.10.30 +BuildRequires: pkgconfig(gstreamer-1.0) >= 0.11.90 +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 0.11.90 +BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libsoup-2.4) >= 2.37.92 +BuildRequires: pkgconfig(libsoup-2.4) >= 2.39.2 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(xcomposite) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(zlib) @@ -127,6 +137,24 @@ also supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and more. +%if %{_withwk2} +%package -n libwebkit2gtk%{_wk2sover} +Summary: Library for rendering web content, GTK+ Port +Group: System/Libraries +# this will install the non-webkit2 library too; at some point, we should move +# the Provides for %%{_pkgname_no_slpp} here +Recommends: %{_pkgname_no_slpp}-lang = %{version} + +%description -n libwebkit2gtk%{_wk2sover} +WebKit is a web content engine, derived from KHTML and KJS from KDE, +and used primarily in Apple's Safari browser. It is made to be +embedded in other applications, such as mail readers, or web browsers. + +It is able to display content such as HTML, SVG, XML, and others. It +also supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and +more. +%endif + %package -n libjavascriptcoregtk%{_sover} Summary: JavaScript Core Engine, GTK+ Port @@ -174,10 +202,12 @@ port of the JavaScript Core engine. %package -n libwebkitgtk%{?_develnamever}-devel - Summary: Library for rendering web content, GTK+ Port Group: Development/Libraries/C and C++ Requires: libjavascriptcoregtk%{_sover} = %{version} +%if %{_withwk2} +Requires: libwebkit2gtk%{_wk2sover} = %{version} +%endif Requires: libwebkitgtk%{_sover} = %{version} Requires: typelib-1_0-JSCore-%{_sonameverpkg} Requires: typelib-1_0-WebKit-%{_sonameverpkg} @@ -198,7 +228,6 @@ more. %package -n webkit-jsc-%{_jscver} - Summary: Library for rendering web content, GTK+ Port Group: Development/Libraries/C and C++ Requires: libwebkitgtk%{_sover} = %{version} @@ -224,13 +253,15 @@ # FIXME: workaround needed in > 1.7.90 to fix build mkdir DerivedSources/ANGLE mkdir DerivedSources/InjectedBundle -mkdir DerivedSources/WebKit2 +mkdir -p DerivedSources/WebKit2/webkit2gtk/webkit2 +mkdir DerivedSources/webkit %build %ifarch ppc64 RPM_OPT_FLAGS+="-mminimal-toc" %endif %ifarch %arm +# we'll always want to remove the debug from the build on arm RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-g/}" %endif %ifarch ppc ppc64 %arm @@ -238,18 +269,24 @@ RPM_OPT_FLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif -export CFLAGS=" $RPM_OPT_FLAGS" -export CXXFLAGS=" $RPM_OPT_FLAGS" +# No debug builds.... We run out of about everything with -O2 -g (the .ar becomes > 4.3GB) +export CFLAGS=" $RPM_OPT_FLAGS -g0" +export CXXFLAGS=" $RPM_OPT_FLAGS -g0" %configure \ --with-gtk=%{_gtkver} \ --enable-geolocation \ --enable-introspection \ --enable-javascript-debugger \ - %{extraconfigure} \ + %{?extraconfigure} \ --disable-static \ - --enable-shared -#make VERBOSE=1 %{?jobs:-j %jobs} -make VERBOSE=1 + --enable-shared \ + --with-gstreamer=1.0 \ +%if %{_withwk2} + --enable-webkit2 +%else + --disable-webkit2 +%endif +make V=1 %install %makeinstall @@ -260,6 +297,12 @@ %postun -n libwebkitgtk%{_sover} -p /sbin/ldconfig +%if %{_withwk2} +%post -n libwebkit2gtk%{_wk2sover} -p /sbin/ldconfig + +%postun -n libwebkit2gtk%{_wk2sover} -p /sbin/ldconfig +%endif + %post -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig %postun -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig @@ -273,6 +316,14 @@ %{_libdir}/libwebkitgtk-%{_sonamever}.so.* %{_datadir}/webkitgtk-%{_sonamever}/ +%if %{_withwk2} +%files -n libwebkit2gtk%{_wk2sover} +%defattr(-,root,root) +%{_libdir}/libwebkit2gtk-%{_sonamever}.so.* +%{_libexecdir}/WebKitPluginProcess +%{_libexecdir}/WebKitWebProcess +%endif + %files -n libjavascriptcoregtk%{_sover} %defattr(-, root, root) %doc Source/JavaScriptCore/COPYING.LIB Source/WebKit/gtk/NEWS @@ -296,6 +347,11 @@ %{_libdir}/pkgconfig/webkit%{_pkgconfig_suffix}.pc %{_includedir}/webkitgtk-%{_sonamever}/ %{_datadir}/gir-1.0/*.gir +%if %{_withwk2} +%doc %{_datadir}/gtk-doc/html/webkit2gtk/ +%{_libdir}/libwebkit2gtk-%{_sonamever}.so +%{_libdir}/pkgconfig/webkit2%{_pkgconfig_suffix}.pc +%endif %files -n webkit-jsc-%{_jscver} %defattr(-,root,root) ++++++ webkit-ld-optimization.patch ++++++ --- /var/tmp/diff_new_pack.y0bkfZ/_old 2012-10-03 10:32:07.000000000 +0200 +++ /var/tmp/diff_new_pack.y0bkfZ/_new 2012-10-03 10:32:07.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- Source/WebKit/gtk/GNUmakefile.am.orig +++ Source/WebKit/gtk/GNUmakefile.am -@@ -78,7 +78,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSIO +@@ -71,7 +71,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSIO libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ -version-info @LIBWEBKITGTK_VERSION@ \ @@ -15,10 +15,10 @@ =================================================================== --- Source/WebKit2/GNUmakefile.am.orig +++ Source/WebKit2/GNUmakefile.am -@@ -1059,7 +1059,7 @@ endif +@@ -151,7 +151,7 @@ endif libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ - -version-info @LIBWEBKITGTK_VERSION@ \ + -version-info @LIBWEBKIT2GTK_VERSION@ \ - $(version_script) \ + $(version_script) -Wl,--reduce-memory-overheads -Wl,--no-keep-memory \ $(no_undefined) @@ -28,7 +28,7 @@ =================================================================== --- GNUmakefile.in.orig +++ GNUmakefile.in -@@ -19150,7 +19150,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSIO +@@ -22263,7 +22263,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSIO libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ -version-info @LIBWEBKITGTK_VERSION@ \ @@ -37,12 +37,12 @@ $(no_undefined) libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \ -@@ -20509,7 +20509,7 @@ Programs_ImageDiff_LDFLAGS = \ +@@ -22805,7 +22805,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSI libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ - -version-info @LIBWEBKITGTK_VERSION@ \ + -version-info @LIBWEBKIT2GTK_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 = \ + libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
