Hello community, here is the log from the commit of package webkitgtk for openSUSE:Factory checked in at 2017-10-02 16:51:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webkitgtk (Old) and /work/SRC/openSUSE:Factory/.webkitgtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webkitgtk" Mon Oct 2 16:51:48 2017 rev:47 rq:528881 version:2.4.11 Changes: -------- --- /work/SRC/openSUSE:Factory/webkitgtk/webkitgtk.changes 2017-08-29 11:39:43.465160833 +0200 +++ /work/SRC/openSUSE:Factory/.webkitgtk.new/webkitgtk.changes 2017-10-02 16:51:50.630265216 +0200 @@ -1,0 +2,12 @@ +Thu Sep 7 20:59:24 UTC 2017 - [email protected] + +- Drop webkitgtk3 linked sub package: + + Remove libwebkitgtk-3_0-0 and libjavascriptcoregtk-3_0-0 from + baselibs.conf. + + Drop conditional build for gtk3 defines from spec. + + Drop conditional pkgconfig(gail), pkgconfig(gail-3.0), + pkgconfig(gtk+-2.0), pkgconfig(gtk+-3.0) and + pkgconfig(gtk+-unix-print-3.0) BuildRequires: No longer needed. + + Drop no longer needed pre_checkin.sh: No longer needed. + +------------------------------------------------------------------- Old: ---- pre_checkin.sh webkitgtk3.changes webkitgtk3.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webkitgtk.spec ++++++ --- /var/tmp/diff_new_pack.Q7ifWD/_old 2017-10-02 16:51:51.934082220 +0200 +++ /var/tmp/diff_new_pack.Q7ifWD/_new 2017-10-02 16:51:51.934082220 +0200 @@ -16,23 +16,6 @@ # -%define build_for_gtk3 0 -%if %{build_for_gtk3} -# provide empty _find_debuginfo_dwz_opts for one or the other -# the .dwz files contain identical contents, which leads to identical -# checksums, which leads to file conflicts due to identical symlinks -%define _find_debuginfo_dwz_opts %{nil} -%define _pkgname_no_slpp libwebkitgtk3 -%define _sover -3_0-0 -%define _wk2sover -3_0-25 -%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 0 -%else %define _pkgname_no_slpp libwebkitgtk2 %define _sover -1_0-0 %define _sonamever 1.0 @@ -43,7 +26,6 @@ %define _gtkver 2.0 %define _jscver 1 %define _pkgconfig_suffix -1.0 -%endif %define _name webkitgtk Name: webkitgtk Version: 2.4.11 @@ -51,9 +33,6 @@ Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0+ AND BSD-3-Clause Group: Development/Libraries/C and C++ -# 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://webkitgtk.org/ Source: http://webkitgtk.org/releases/%{_name}-%{version}.tar.xz Source1: baselibs.conf @@ -97,10 +76,12 @@ BuildRequires: pkgconfig(enchant) >= 0.22 BuildRequires: pkgconfig(fontconfig) >= 2.5 BuildRequires: pkgconfig(freetype2) >= 9.0 +BuildRequires: pkgconfig(gail) >= 1.8 BuildRequires: pkgconfig(geoclue-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.36.0 BuildRequires: pkgconfig(gstreamer-1.0) >= 1.0.3 BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 1.0.3 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.10 BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libpng) @@ -117,17 +98,6 @@ BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(zlib) -%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.24.10 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.6.0 -BuildRequires: pkgconfig(gtk+-unix-print-3.0) -%else -BuildRequires: pkgconfig(gail) >= 1.8 -BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.10 -%endif %description WebKit is a web content engine, derived from KHTML and KJS from KDE, @@ -144,10 +114,8 @@ Recommends: %{_pkgname_no_slpp}-lang = %{version} # We provide %{_pkgname_no_slpp}: that's the GTK+ version being used. Provides: %{_pkgname_no_slpp} = %{version} -%if ! %{build_for_gtk3} Provides: libWebKitGtk0 = %{version} Obsoletes: libWebKitGtk0 < %{version} -%endif %description -n libwebkitgtk%{_sover} WebKit is a web content engine, derived from KHTML and KJS from KDE, @@ -158,39 +126,6 @@ also supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and more. -%if %{_withwk2} -%package -n libwebkit2gtk%{_wk2sover} -Summary: Library for rendering web content, GTK+ Port -# this will install the non-webkit2 library too; at some point, we should move -# the Provides for %%{_pkgname_no_slpp} here -Group: System/Libraries -Recommends: %{_pkgname_no_slpp}-lang = %{version} -# Recommend the injected bundles -Recommends: webkit2gtk-3_0-injected-bundles - -%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. - -%package -n webkit2gtk-3_0-injected-bundles -Summary: Library for rendering web content -- Injected bundles -Group: System/Libraries - -%description -n webkit2gtk-3_0-injected-bundles -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 Group: System/Libraries @@ -220,41 +155,6 @@ This package provides the GObject Introspection bindings for the GTK+ port of WebKit. -%if %{build_for_gtk3} -%package -n typelib-1_0-WebKit2-%{_sonameverpkg} -Summary: Library for rendering web content, GTK+ Port -- Introspection bindings -Group: System/Libraries - -%description -n typelib-1_0-WebKit2-%{_sonameverpkg} -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. - -This package provides the GObject Introspection bindings for the GTK+ -port of WebKit2. - -%package -n typelib-1_0-WebKit2WebExtension-%{_sonameverpkg} -Summary: Library for rendering web content, GTK+ Port -- Introspection bindings -Group: System/Libraries - -%description -n typelib-1_0-WebKit2WebExtension-%{_sonameverpkg} -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. - -This package provides the GObject Introspection bindings for the GTK+ -port of WebKit2. - -%endif - %package -n typelib-1_0-JavaScriptCore-%{_sonameverpkg} Summary: JavaScript Core Engine, GTK+ Port -- Introspection bindings Group: System/Libraries @@ -278,15 +178,10 @@ Requires: libwebkitgtk%{_sover} = %{version} Requires: typelib-1_0-JavaScriptCore-%{_sonameverpkg} Requires: typelib-1_0-WebKit-%{_sonameverpkg} -%if %{_withwk2} -Requires: libwebkit2gtk%{_wk2sover} = %{version} -%endif -%if ! %{build_for_gtk3} Provides: WebKitGtk-devel = %{version} Obsoletes: WebKitGtk-devel < %{version} Provides: libwebkit-devel = %{version} Obsoletes: libwebkit-devel < %{version} -%endif %description -n libwebkitgtk%{?_develnamever}-devel WebKit is a web content engine, derived from KHTML and KJS from KDE, @@ -301,10 +196,8 @@ Summary: Library for rendering web content, GTK+ Port Group: Development/Libraries/C and C++ Requires: libwebkitgtk%{_sover} = %{version} -%if ! %{build_for_gtk3} Provides: webkit-jsc = %{version} Obsoletes: webkit-jsc < %{version} -%endif %description -n webkit-jsc-%{_jscver} WebKit is a web content engine, derived from KHTML and KJS from KDE, @@ -381,40 +274,18 @@ --disable-static \ --enable-shared \ --with-gstreamer=1.0 \ -%if %{_withwk2} - --enable-webkit2 -%else --disable-webkit2 -%endif make %{?_smp_mflags} %install %makeinstall %find_lang WebKitGTK-%{_gtkver} %{no_lang_C} -# for webkitgtk3, we rename %{_datadir}/gtk-doc/html/webkitgtk to %{_datadir}/gtk-doc/html/webkitgtk3 -%if %{build_for_gtk3} -mv %{buildroot}%{_datadir}/gtk-doc/html/webkitgtk %{buildroot}%{_datadir}/gtk-doc/html/%{name} -mv %{buildroot}%{_datadir}/gtk-doc/html/webkitdomgtk %{buildroot}%{_datadir}/gtk-doc/html/webkitdomgtk%{?_develnamever} -%if %{_withwk2} -# Clean up some buildroot references in binaries -chrpath --delete %{buildroot}%{_libexecdir}/WebKitPluginProcess -chrpath --delete %{buildroot}%{_libexecdir}/WebKitWebProcess -%endif -%endif find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %post -n libwebkitgtk%{_sover} -p /sbin/ldconfig - %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 %files -n libwebkitgtk%{_sover} @@ -423,21 +294,6 @@ %{_libdir}/libwebkitgtk-%{_sonamever}.so.* %{_datadir}/webkitgtk-%{_sonamever}/ -%if %{_withwk2} -%files -n libwebkit2gtk%{_wk2sover} -%defattr(-,root,root) -%{_libdir}/libwebkit2gtk-%{_sonamever}.so.* -%{_libexecdir}/WebKitNetworkProcess -%{_libexecdir}/WebKitPluginProcess -%{_libexecdir}/WebKitWebProcess - -%files -n webkit2gtk-3_0-injected-bundles -%defattr(-,root,root) -%dir %{_libdir}/webkit2gtk-3.0 -%dir %{_libdir}/webkit2gtk-3.0/injected-bundle -%{_libdir}/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so -%endif - %files -n libjavascriptcoregtk%{_sover} %defattr(-, root, root) %doc Source/JavaScriptCore/COPYING.LIB Source/WebKit/gtk/NEWS @@ -447,16 +303,6 @@ %defattr(-,root,root) %{_libdir}/girepository-1.0/WebKit-%{_sonamever}.typelib -%if %{_withwk2} -%files -n typelib-1_0-WebKit2-%{_sonameverpkg} -%defattr(-,root,root) -%{_libdir}/girepository-1.0/WebKit2-%{_sonamever}.typelib - -%files -n typelib-1_0-WebKit2WebExtension-%{_sonameverpkg} -%defattr(-,root,root) -%{_libdir}/girepository-1.0/WebKit2WebExtension-%{_sonamever}.typelib -%endif - %files -n typelib-1_0-JavaScriptCore-%{_sonameverpkg} %defattr(-,root,root) %{_libdir}/girepository-1.0/JavaScriptCore-%{_sonamever}.typelib ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.Q7ifWD/_old 2017-10-02 16:51:51.978076045 +0200 +++ /var/tmp/diff_new_pack.Q7ifWD/_new 2017-10-02 16:51:51.978076045 +0200 @@ -1,4 +1,2 @@ libwebkitgtk-1_0-0 libjavascriptcoregtk-1_0-0 -libwebkitgtk-3_0-0 -libjavascriptcoregtk-3_0-0
