[kde-runtime] 4.11.1
Rex Dieter
rdieter at fedoraproject.org
Tue Sep 3 18:04:52 UTC 2013
commit 0b249f5b835c7cbc6836a611554cfbe4f54f51a7
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Sep 3 13:04:42 2013 -0500
4.11.1
.gitignore | 7 +----
kde-runtime-mouseeventlistener-1.patch | 36 ++++++++++++++++++++++++++++++++
kde-runtime-mouseeventlistener.patch | 12 +++++-----
kde-runtime.spec | 17 ++++++++++----
sources | 2 +-
5 files changed, 57 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7f1b6a..f5990d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-/kde-runtime-4.10.4.tar.xz
-/kde-runtime-4.10.90.tar.xz
-/kde-runtime-4.10.95.tar.xz
-/kde-runtime-4.10.97.tar.xz
-/kde-runtime-4.11.0.tar.xz
+/kde-runtime-4.10.5.tar.xz
+/kde-runtime-4.11.1.tar.xz
diff --git a/kde-runtime-mouseeventlistener-1.patch b/kde-runtime-mouseeventlistener-1.patch
new file mode 100644
index 0000000..7ab90cd
--- /dev/null
+++ b/kde-runtime-mouseeventlistener-1.patch
@@ -0,0 +1,36 @@
+diff --git a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
+index b534845..36530e0 100644
+--- a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
++++ b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
+@@ -90,6 +90,7 @@ bool MouseEventListener::containsMouse() const
+ void MouseEventListener::mousePressEvent(QGraphicsSceneMouseEvent *me)
+ {
+ if (m_lastEvent == me) {
++ m_lastEvent = 0;
+ return;
+ }
+
+@@ -112,6 +113,7 @@ void MouseEventListener::mousePressEvent(QGraphicsSceneMouseEvent *me)
+ void MouseEventListener::mouseMoveEvent(QGraphicsSceneMouseEvent *me)
+ {
+ if (m_lastEvent == me) {
++ m_lastEvent = 0;
+ return;
+ }
+
+@@ -122,6 +124,7 @@ void MouseEventListener::mouseMoveEvent(QGraphicsSceneMouseEvent *me)
+ void MouseEventListener::mouseReleaseEvent(QGraphicsSceneMouseEvent *me)
+ {
+ if (m_lastEvent == me) {
++ m_lastEvent = 0;
+ return;
+ }
+
+@@ -138,6 +141,7 @@ void MouseEventListener::mouseReleaseEvent(QGraphicsSceneMouseEvent *me)
+ void MouseEventListener::wheelEvent(QGraphicsSceneWheelEvent *we)
+ {
+ if (m_lastEvent == we) {
++ m_lastEvent = 0;
+ return;
+ }
+
diff --git a/kde-runtime-mouseeventlistener.patch b/kde-runtime-mouseeventlistener.patch
index 32125d1..702400c 100644
--- a/kde-runtime-mouseeventlistener.patch
+++ b/kde-runtime-mouseeventlistener.patch
@@ -1,7 +1,7 @@
-diff -Naur kde-runtime-4.10.3.orig/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp kde-runtime-4.10.3/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
---- kde-runtime-4.10.3.orig/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp 2013-06-10 23:26:05.000000000 +0200
-+++ kde-runtime-4.10.3/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp 2013-06-12 00:19:53.000000000 +0200
-@@ -160,6 +160,10 @@
+diff -up kde-runtime-4.11.1/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp.mouseeventlistener-2 kde-runtime-4.11.1/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
+--- kde-runtime-4.11.1/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp.mouseeventlistener-2 2013-09-03 12:52:22.673778954 -0500
++++ kde-runtime-4.11.1/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp 2013-09-03 12:54:34.166760188 -0500
+@@ -164,6 +164,10 @@ bool MouseEventListener::sceneEventFilte
return false;
}
@@ -9,6 +9,6 @@ diff -Naur kde-runtime-4.10.3.orig/plasma/declarativeimports/qtextracomponents/m
+ return QDeclarativeItem::sceneEventFilter(item, event);
+ }
+
- m_lastEvent = event;
-
switch (event->type()) {
+ case QEvent::GraphicsSceneMousePress: {
+ m_lastEvent = event;
diff --git a/kde-runtime.spec b/kde-runtime.spec
index 5d64fb5..f0464a4 100644
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@ -5,8 +5,8 @@
Name: kde-runtime
Summary: KDE Runtime
-Version: 4.11.0
-Release: 1%{?dist}
+Version: 4.11.1
+Release: 0.1%{?dist}
# http://techbase.kde.org/Policies/Licensing_Policy
License: LGPLv2+ and GPLv2+
@@ -48,12 +48,15 @@ Patch11: kde-runtime-4.10.4-trash-readonly.patch
## upstreamable patches
# make installdbgsymbols.sh use pkexec instead of su
# increase some timeouts in an effort to see (some) errors before close
-Patch51: kde-runtime-4.9.0-installdbgsymbols.patch
+Patch50: kde-runtime-4.9.0-installdbgsymbols.patch
+## mouseeventlistener
+Patch51: kde-runtime-mouseeventlistener-1.patch
# avoid X3 mouse events
# https://bugs.kde.org/show_bug.cgi?id=316546
Patch52: kde-runtime-mouseeventlistener.patch
+
# support password-less kwallet by default (default off)
# rejected upstream, I respectfully disagree -- rex
# https://git.reviewboard.kde.org/r/110328/
@@ -150,7 +153,7 @@ Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%package drkonqi
Summary: DrKonqi KDE crash handler
Requires: %{name} = %{version}-%{release}
-# drkonqi patch51 uses pkexec
+# drkonqi patch50 uses pkexec
Requires: polkit
%description drkonqi
%{summary}.
@@ -194,7 +197,8 @@ Requires: %{name} = %{version}-%{release}
%patch10 -p1 -b .kde310486
%endif
%patch11 -p1 -b .trash-readonly
-%patch51 -p1 -b .installdgbsymbols
+%patch50 -p1 -b .installdgbsymbols
+%patch51 -p1 -b .mouseeventlistener-1
%patch52 -p1 -b .mouseeventlistener
%patch53 -p1 -b .initial_passwordless_kwallet_option
@@ -414,6 +418,9 @@ fi
%changelog
+* Tue Sep 03 2013 Rex Dieter <rdieter at fedoraproject.org> 4.11.1-1
+- 4.11.1
+
* Thu Aug 08 2013 Than Ngo <than at redhat.com> - 4.11.0-1
- 4.11.0
diff --git a/sources b/sources
index ad1cf63..0e3d32f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-232aaae25c8adf2c28a0dfb8e89d04df kde-runtime-4.11.0.tar.xz
+b195a10b9ffda33aaef5b34092ddc23a kde-runtime-4.11.1.tar.xz
More information about the scm-commits
mailing list