- removed patch applied upstream

- rel 2

diff --git a/kde4-kdeplasma-addons.spec b/kde4-kdeplasma-addons.spec
index 30c47972fff977b0d40ca07664bad425783bbd12..52f35278ded3e999882c673d5d73d89768c64102 100644 (file)
--- a/kde4-kdeplasma-addons.spec
+++ b/kde4-kdeplasma-addons.spec
@@ -9,13 +9,12 @@ Summary:      KDE4 Plasmoids
 Summary(pl.UTF-8):     Plazmoidy dla KDE4
 Name:          kde4-kdeplasma-addons
 Version:       4.10.4
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         X11/Applications
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
 # Source0-md5: 817e31cca294dc41da57cee1e2858ed8
 Patch100:      %{name}-branch.diff
-Patch0:                webslice_fix_zoom_on_reload.patch
 URL:           http://www.kde.org/
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: OpenGL-devel
@@ -96,7 +95,6 @@ opartych na plazmoidach dla KDE4.
 %prep
 %setup -q -n %{orgname}-%{version}
 #%patch100 -p0
-%patch0 -p1
 
 %build
 install -d build

diff --git a/webslice_fix_zoom_on_reload.patch b/webslice_fix_zoom_on_reload.patch
deleted file mode 100644 (file)
index b748955..0000000
--- a/webslice_fix_zoom_on_reload.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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);
-     }
- }