Hello community,
here is the log from the commit of package kdebase3 for openSUSE:Factory
checked in at 2013-12-05 21:39:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase3 (Old)
and /work/SRC/openSUSE:Factory/.kdebase3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase3"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase3/kdebase3.changes 2013-11-07
14:44:39.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdebase3.new/kdebase3.changes 2013-12-05
21:39:25.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Dec 5 01:49:53 UTC 2013 - an...@opensuse.org
+
+- merge changes from KDE3 SVN at KDE.org
+ (kdebase-svn-merge-diff.patch)
+
+-------------------------------------------------------------------
Old:
----
3_5_BRANCH.diff
New:
----
kdebase-svn-merge-diff.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.Wp8Vnu/_old 2013-12-05 21:39:27.000000000 +0100
+++ /var/tmp/diff_new_pack.Wp8Vnu/_new 2013-12-05 21:39:27.000000000 +0100
@@ -127,7 +127,7 @@
Source23: sourceforge.desktop
Source24: udisks-glue.conf
Source25: kdm3
-Patch0: 3_5_BRANCH.diff
+Patch0: kdebase-svn-merge-diff.patch
Patch3: startkde.diff
Patch5: media-iPod.diff
Patch6: ksysguardd-openslp.diff
@@ -485,7 +485,7 @@
%prep
%setup -q -b 8 -b 13 -n kdebase-%{kde_version}
-%patch0
+%patch0 -p1
%patch3
%patch5
%if 0%{?with_hal} == 0
++++++ kdebase-svn-merge-diff.patch ++++++
++++ 1506 lines (skipped)
++++++ kickoff.diff ++++++
--- /var/tmp/diff_new_pack.Wp8Vnu/_old 2013-12-05 21:39:27.000000000 +0100
+++ /var/tmp/diff_new_pack.Wp8Vnu/_new 2013-12-05 21:39:27.000000000 +0100
@@ -251,13 +251,11 @@
void KickerTip::display()
{
if (!tippingEnabled())
-@@ -192,9 +200,7 @@
+@@ -192,7 +200,6 @@
void KickerTip::mousePressEvent(QMouseEvent * /*e*/)
{
- QToolTip::setGloballyEnabled(m_toolTipsEnabled);
- m_timer.stop();
-- m_frameTimer.stop();
hide();
}
@@ -274,7 +272,7 @@
}
}
@@ -411,6 +420,8 @@
- m_tippingFor = 0;
+ m_timer.stop();
m_frameTimer.stop();
QWidget::hide();
+
@@ -299,13 +297,11 @@
m_timer.stop();
if (isTippingFor(widget) && isVisible())
-@@ -475,9 +483,7 @@
+@@ -475,7 +483,6 @@
tipFor(0);
break;
case QEvent::MouseButtonPress:
- QToolTip::setGloballyEnabled(m_toolTipsEnabled);
- m_timer.stop();
-- m_frameTimer.stop();
hide();
default:
break;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
