rev 13594 - in branches/kde4.2/packages/kdelibs/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2009-01-26 23:02:18 +0000 (Mon, 26 Jan 2009)
New Revision: 13594

Added:
   branches/kde4.2/packages/kdelibs/debian/patches/00_917014_kde4.2.0_tag.diff
Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/patches/00_917133_qreal_portability_fix.diff
   branches/kde4.2/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff
   branches/kde4.2/packages/kdelibs/debian/patches/series
Log:
Get kdelibs up-to-date with 4.2.0 tag

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-26 22:29:58 UTC (rev 13593)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-26 23:02:18 UTC (rev 13594)
@@ -7,8 +7,10 @@
     to fix FTBFS on armel.
   * Deprecate external Qt symbols in libplasma3 symbols template
     (Closes: #513133).
+  * Get up-to-date with kdelibs 4.2.0 tag: add 00_917014_kde4.2.0_tag.diff
+    patch (plasma security issue).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 Jan 2009 00:06:22 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 Jan 2009 01:00:17 +0200
 
 kde4libs (4:4.2.0-1) experimental; urgency=low
 

Added: branches/kde4.2/packages/kdelibs/debian/patches/00_917014_kde4.2.0_tag.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/00_917014_kde4.2.0_tag.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdelibs/debian/patches/00_917014_kde4.2.0_tag.diff	2009-01-26 23:02:18 UTC (rev 13594)
@@ -0,0 +1,19 @@
+--- a/plasma/containment.cpp
++++ b/plasma/containment.cpp
+@@ -1602,12 +1602,10 @@
+         }
+ 
+         bool canConfig = unlocked || KAuthorized::authorize("PlasmaAllowConfigureWhenLocked");
+-        if (canConfig) {
+-            action = actions().action("activity settings");
+-            if (action) {
+-                action->setVisible(canConfig);
+-                action->setEnabled(canConfig);
+-            }
++        action = actions().action("activity settings");
++        if (action) {
++            action->setVisible(canConfig);
++            action->setEnabled(canConfig);
+         }
+ 
+         // tell the applets too

Modified: branches/kde4.2/packages/kdelibs/debian/patches/00_917133_qreal_portability_fix.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/00_917133_qreal_portability_fix.diff	2009-01-26 22:29:58 UTC (rev 13593)
+++ branches/kde4.2/packages/kdelibs/debian/patches/00_917133_qreal_portability_fix.diff	2009-01-26 23:02:18 UTC (rev 13594)
@@ -1,5 +1,5 @@
---- a/khtml/misc/borderarcstroker.cpp	2009-01-14 06:51:46.000000000 +0000
-+++ b/khtml/misc/borderarcstroker.cpp	2009-01-14 06:52:08.000000000 +0000
+--- a/khtml/misc/borderarcstroker.cpp
++++ b/khtml/misc/borderarcstroker.cpp
 @@ -347,7 +347,7 @@
      const KCubicBezier inner(innerPath.elementAt(0), innerPath.elementAt(1), innerPath.elementAt(2), innerPath.elementAt(3));
      const KCubicBezier outer(outerPath.elementAt(0), outerPath.elementAt(1), outerPath.elementAt(2), outerPath.elementAt(3));

Modified: branches/kde4.2/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff	2009-01-26 22:29:58 UTC (rev 13593)
+++ branches/kde4.2/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff	2009-01-26 23:02:18 UTC (rev 13594)
@@ -4,7 +4,7 @@
 See also 04_disable_debug_by_default.diff in kdebase-runtime.
 --- a/kdecore/io/kdebug.cpp
 +++ b/kdecore/io/kdebug.cpp
-@@ -313,7 +313,9 @@ struct KDebugPrivate
+@@ -313,7 +313,9 @@
          }
  
          KConfigGroup cg(config, QString::number(area));
@@ -17,7 +17,7 @@
  
 --- a/kdecore/kdebugrc
 +++ b/kdecore/kdebugrc
-@@ -82,7 +82,7 @@ InfoOutput=4
+@@ -82,7 +82,7 @@
  
  # KMail
  [5006]

Modified: branches/kde4.2/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/series	2009-01-26 22:29:58 UTC (rev 13593)
+++ branches/kde4.2/packages/kdelibs/debian/patches/series	2009-01-26 23:02:18 UTC (rev 13594)
@@ -1,3 +1,4 @@
+00_917014_kde4.2.0_tag.diff
 00_917133_qreal_portability_fix.diff
 08_add_debian_build_type.diff
 09_disable_debug_messages_if_not_explicitly_enabled.diff