Hello community, here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory checked in at 2014-02-28 07:21:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebkit" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes 2014-02-18 16:18:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/libqt5-qtwebkit.changes 2014-02-28 07:21:33.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Feb 26 22:40:56 UTC 2014 - [email protected] + +- Added dont-pollute-prl-and-pc-files.patch from upstream - fixes + issue where private dependencies (such as e.g. gstreamer) where + marked as public +- As per patch, remove all external/private Requires of devel + subpackages + +------------------------------------------------------------------- New: ---- dont-pollute-prl-and-pc-files.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebkit.spec ++++++ --- /var/tmp/diff_new_pack.nGy3Lb/_old 2014-02-28 07:21:34.000000000 +0100 +++ /var/tmp/diff_new_pack.nGy3Lb/_new 2014-02-28 07:21:34.000000000 +0100 @@ -48,6 +48,8 @@ Patch130: no-Werror-rpath.diff # PATCH-FIX-UPSTREAM fix build with disabled jit Patch131: fix-no-jit-build.patch +# PATCH-FIX-UPSTREAM dont-pollute-prl-and-pc-files.patch -- Don't pollute .prl & .pc files with private dependencies +Patch132: dont-pollute-prl-and-pc-files.patch BuildRequires: pkgconfig(Qt5Core) >= %{version} BuildRequires: pkgconfig(Qt5Network) >= %{version} BuildRequires: pkgconfig(Qt5OpenGL) >= %{version} @@ -127,6 +129,7 @@ %patch5 -p1 %patch130 -p1 %patch131 +%patch132 -p1 %package -n %libname Summary: Qt 5 WebKit Library @@ -150,7 +153,6 @@ Group: Development/Libraries/X11 Requires: %libname = %{version} Requires: libQt5WebKit5-devel = %{version} -Requires: libicu-devel Requires: libqt5-qtdeclarative-devel >= %{version} Requires: libqt5-qtsensors-devel >= %{version} @@ -161,8 +163,6 @@ Summary: Qt Development Kit Group: Development/Libraries/X11 Requires: libQt5WebKit5 = %version -Requires: libjpeg-devel -Requires: libxslt-devel Requires: pkgconfig(Qt5Core) >= %version Requires: pkgconfig(Qt5Gui) >= %version Requires: pkgconfig(Qt5Network) >= %version @@ -170,31 +170,6 @@ Requires: pkgconfig(Qt5Quick) >= %version Requires: pkgconfig(Qt5Sensors) >= %version Requires: pkgconfig(Qt5Sql) >= %version -Requires: pkgconfig(fontconfig) -Requires: pkgconfig(gl) -Requires: pkgconfig(glib-2.0) -Requires: pkgconfig(libpng) -Requires: pkgconfig(libwebp) -Requires: pkgconfig(sqlite3) -Requires: pkgconfig(x11) -Requires: pkgconfig(xext) -Requires: pkgconfig(xrender) -%if 0%{?suse_version} < 1330 -Requires: pkgconfig(gstreamer-0.10) -Requires: pkgconfig(gstreamer-app-0.10) -Requires: pkgconfig(gstreamer-base-0.10) -Requires: pkgconfig(gstreamer-interfaces-0.10) -Requires: pkgconfig(gstreamer-pbutils-0.10) -Requires: pkgconfig(gstreamer-plugins-base-0.10) -Requires: pkgconfig(gstreamer-video-0.10) -%else -Requires: pkgconfig(gstreamer-1.0) -Requires: pkgconfig(gstreamer-app-1.0) -Requires: pkgconfig(gstreamer-base-1.0) -Requires: pkgconfig(gstreamer-pbutils-1.0) -Requires: pkgconfig(gstreamer-plugins-base-1.0) -Requires: pkgconfig(gstreamer-video-1.0) -%endif %description -n libQt5WebKit5-devel You need this package, if you want to compile programs with qtwebkit. ++++++ dont-pollute-prl-and-pc-files.patch ++++++ From: Jocelyn Turcotte <[email protected]> Date: Tue, 28 Jan 2014 12:07:59 +0000 Subject: Don't pollute .prl & .pc files with private dependencies --- Don't pollute .prl & .pc files with private dependencies Also change the creating_module check in needToLink to make sure that only the main module will try to link directly with the WebCore and JavaScriptCore static libraries. Task-number: QTBUG-35774 Initial-patch-by: Oswald Buddenhagen <[email protected]> Change-Id: Ib5992e112803679837249400e98cb8c22636096d Reviewed-by: Oswald Buddenhagen <[email protected]> Reviewed-by: Allan Sandfeld Jensen <[email protected]> --- --- a/Source/widgetsapi.pri +++ b/Source/widgetsapi.pri @@ -49,6 +49,7 @@ WEBKIT += javascriptcore wtf webcore MODULE = webkitwidgets +CONFIG += creating_module # We want the QtWebKit API forwarding includes to live in the root build dir. MODULE_BASE_DIR = $$_PRO_FILE_PWD_ --- a/Tools/qmake/mkspecs/features/default_post.prf +++ b/Tools/qmake/mkspecs/features/default_post.prf @@ -171,8 +171,8 @@ } defineTest(needToLink) { - # The main dynamic library always needs to link in the intermediate libraries - creating_module: return(true) + # The main module dynamic library always needs to link in the intermediate libraries + isEqual(MODULE, webkit): return(true) force_static_libs_as_shared { # So do the individual libraries if they are dynamic -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
