Update to 4.9.3; fix a plasmoid bug

Rel 0.1, cause it doesn't build correctly on my env.
The plasmoid is 'webslice' and the bug is this:
https://bugs.kde.org/show_bug.cgi?id=310875

diff --git a/kde4-kdeplasma-addons.spec b/kde4-kdeplasma-addons.spec
index 3ee46bde1103f903367692e4957c3fe3aba483b2..3ef8dc34445b22d7fc5c7521c232ba43f7bf2aaf 100644 (file)
--- a/kde4-kdeplasma-addons.spec
+++ b/kde4-kdeplasma-addons.spec
@@ -12,14 +12,15 @@
 Summary:       KDE4 Plasmoids
 Summary(pl.UTF-8):     Plazmoidy dla KDE4
 Name:          kde4-kdeplasma-addons
-Version:       4.9.1
-Release:       1
+Version:       4.9.3
+Release:       0.1
 License:       GPL v2
 Group:         X11/Applications
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
-# Source0-md5: fe8e00ba630365cbeec1cb93427e301a
+# Source0-md5: 8ad3a80ffd15ad54c37dd0b984ef9c84
 Patch100:      %{name}-branch.diff
 Patch0:                %{name}-pastebinpld.patch
+Patch1:     webslice_fix_zoom_on_reload.patch
 URL:           http://www.kde.org/
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: OpenGL-devel
@@ -99,6 +100,7 @@ opartych na plazmoidach dla KDE4.
 %setup -q -n %{orgname}-%{version}
 #%patch100 -p0
 #%patch0 -p1
+%patch1 -p1
 
 %build
 install -d build

diff --git a/webslice_fix_zoom_on_reload.patch b/webslice_fix_zoom_on_reload.patch
new file mode 100644 (file)
index 0000000..b748955
--- /dev/null
+++ b/webslice_fix_zoom_on_reload.patch
@@ -0,0 +1,19 @@
+diff -urN kdeplasma-addons-4.9.3/applets/webslice.orig/kgraphicswebslice.cpp kdeplasma-addons-4.9.3/applets/webslice/kgraphicswebslice.cpp
+--- kdeplasma-addons-4.9.3/applets/webslice.orig/kgraphicswebslice.cpp 2012-08-13 11:33:13.000000000 +0200
++++ kdeplasma-addons-4.9.3/applets/webslice/kgraphicswebslice.cpp      2012-12-01 19:21:29.108289128 +0100
+@@ -196,9 +196,14 @@
+ void KGraphicsWebSlice::showSlice(const QString &selector)
+ {
+     QRectF r = sliceGeometry(selector);
++    // qDebug() << "area=" << d->documentGeometry << ", viewportSize=" << page()->viewportSize() << ", contentsRect=" << contentsRect().size();
+     if (!selector.isEmpty() && r.isValid()) {
+         zoom(r);
+-    } else {
++    } else if (d->documentGeometry.width() != contentsRect().size().width()) {
++        // Change zoom level only if the current one isn't appropriate
++        // but reset to 1.0 first
++        setZoomFactor(1.0);
++        updateElementCache();
+         zoom(d->documentGeometry);
+     }
+ }