Hello community,
here is the log from the commit of package libQtWebKit4 for openSUSE:Factory checked in at 2012-04-12 09:38:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libQtWebKit4 (Old)
and /work/SRC/openSUSE:Factory/.libQtWebKit4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libQtWebKit4", Maintainer is "DMueller@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libQtWebKit4/libQtWebKit4.changes 2012-02-20 17:23:25.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libQtWebKit4.new/libQtWebKit4.changes 2012-04-12 09:38:30.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Apr 5 09:40:35 UTC 2012 - dmueller@suse.com
+
+- add back designer plugin (bnc#743937)
+
+-------------------------------------------------------------------
+Fri Mar 30 10:17:43 UTC 2012 - idonmez@suse.com
+
+- Sync with Qt 4.8.1
+
+-------------------------------------------------------------------
New:
----
qwebview-4.8.1.tar.bz2
qwebview-buildfixes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libQtWebKit4.spec ++++++
--- /var/tmp/diff_new_pack.RrDWdI/_old 2012-04-12 09:38:44.000000000 +0200
+++ /var/tmp/diff_new_pack.RrDWdI/_new 2012-04-12 09:38:44.000000000 +0200
@@ -15,16 +15,21 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
+
Name: libQtWebKit4
%define tar_version 2.2.0
-Version: 4.8.0+%tar_version
+%define qt_version 4.8.1
+Version: %qt_version+%tar_version
Release: 0
Summary: Open source Web Browser engine based on Qt4
License: LGPL-2.1+ ; BSD-3-Clause
Group: Development/Libraries/C and C++
Url: http://trac.webkit.org/wiki/QtWebKit
Source0: QtWebKit-%{tar_version}.tar.bz2
-Source1: baselibs.conf
+Source1: qwebview-%qt_version.tar.bz2
+Source99: baselibs.conf
+
# PATCH-FIX-OPENSUSE webkit-qtwebkit-2.2-tp1-pluginpath.patch asterios.dramis@gmail.com -- Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too (taken from Fedora)
Patch0: webkit-qtwebkit-2.2-tp1-pluginpath.patch
# PATCH-FIX-OPENSUSE webkit-qtwebkit-2.2tp1-qt46.patch asterios.dramis@gmail.com -- Fix for qt-4.6.x (taken from Fedora)
@@ -44,6 +49,7 @@
Patch11: reduce-link-optimization.diff
Patch12: build-with-glib-231.diff
Patch13: avoid-rpath.diff
+Patch14: qwebview-buildfixes.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison
@@ -88,7 +94,7 @@
This package contains development files for qtwebkit.
%prep
-%setup -q -n QtWebKit-%{tar_version}
+%setup -q -n QtWebKit-%{tar_version} -a 1
%patch0 -p1 -b .pluginpath
%patch3 -p1 -b .qt46
%patch4 -p1
@@ -103,6 +109,7 @@
%endif
%patch12
%patch13
+%patch14
%build
export QTDIR=%{_prefix}
@@ -125,9 +132,14 @@
--makeargs="%{?_smp_mflags}" \
--qmakearg="CONFIG+=use_system_icu QMAKE_CFLAGS+=\"${RPM_OPT_FLAGS}\" QMAKE_CXXFLAGS+=\"${RPM_OPT_FLAGS}\" DEFINES+=USE_GSTREAMER=1"
+pushd tools/designer/src/plugins/qwebview/
+qmake
+make
+popd
+
%install
make install INSTALL_ROOT=%{buildroot} -C WebKitBuild/Release
-
+make install INSTALL_ROOT=%{buildroot} -C tools/designer/src/plugins/qwebview
#
find %{buildroot}%{_libdir} -type f -name '*prl' -exec perl -pi -e "s, -L$RPM_BUILD_DIR/\S+,,g" {} \;
find %{buildroot}%{_libdir} -type f -name '*prl' -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
@@ -146,6 +158,7 @@
%defattr(-,root,root,-)
%{_libdir}/qt4/plugins/imports/QtWebKit/
%{_libdir}/libQtWebKit.so.4*
+%{_libdir}/qt4/plugins/designer/libqwebview.so
%files -n libQtWebKit-devel
%defattr(-,root,root,-)
++++++ qwebview-buildfixes.diff ++++++
--- tools/designer/src/plugins/qwebview/qwebview_plugin.cpp
+++ tools/designer/src/plugins/qwebview/qwebview_plugin.cpp
@@ -45,7 +45,7 @@
#include