[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.11.9-1-11-gff39374

Maximiliano Curia maxy at moszumanska.debian.org
Fri Aug 1 09:04:45 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=2fdac64

The following commit has been merged in the master branch:
commit 2fdac64ea01fe49209ffd7b6af5a02ff1f125ec4
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jul 31 18:14:36 2014 +0200

    Refresh patches.
---
 debian/changelog                                   | 13 ++++
 ...-Present-Windows-effect-when-control-clic.patch | 88 ---------------------
 ...fter-dismissing-the-context-menu-of-a-jus.patch | 79 -------------------
 .../patches/0004-connect-to-the-right-signal.patch | 27 -------
 .../0009-Do-not-popup-during-initialization.patch  | 28 -------
 ...010-Fix-crash-when-DesktopNames-isn-t-set.patch | 35 ---------
 debian/patches/0012-Fix-wrong-icons.patch          | 36 ---------
 ...w-title-to-sizeGrip-for-easier-tracking-i.patch | 26 -------
 debian/patches/50_icon_in_oxygen_title_bar.diff    | 90 ----------------------
 debian/patches/kdm_X_path.diff                     | 16 ++--
 debian/patches/series                              |  7 --
 11 files changed, 23 insertions(+), 422 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4803c2..1f13394 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,19 @@ kde-workspace (4:4.11.11-1) UNRELEASED; urgency=medium
 
   [ Maximiliano Curia ]
   * New upstream release.
+  * Remove upstream patch: 0001-Trigger-the-Present-Windows-effect-when-
+    control-clic.patch
+  * Remove upstream patch: 0002-Fix-crash-after-dismissing-the-context-
+    menu-of-a-jus.patch
+  * Remove upstream patch: 0004-connect-to-the-right-signal.patch
+  * Remove upstream patch: 0009-Do-not-popup-during-initialization.patch
+  * Remove upstream patch: 0010-Fix-crash-when-DesktopNames-isn-t-
+    set.patch
+  * Remove upstream patch: 0012-Fix-wrong-icons.patch
+  * Remove upstream patch: 0015-added-window-title-to-sizeGrip-for-
+    easier-tracking-i.patch
+  * Remove unused patch: 50_icon_in_oxygen_title_bar.diff
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:35:32 +0200
 
diff --git a/debian/patches/0001-Trigger-the-Present-Windows-effect-when-control-clic.patch b/debian/patches/0001-Trigger-the-Present-Windows-effect-when-control-clic.patch
deleted file mode 100644
index 30c0086..0000000
--- a/debian/patches/0001-Trigger-the-Present-Windows-effect-when-control-clic.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 87a754910fdb3b71a489dbbaf8f962f0feb9b46d Mon Sep 17 00:00:00 2001
-From: Eike Hein <hein at kde.org>
-Date: Mon, 28 Apr 2014 10:12:31 +0200
-Subject: [PATCH 01/16] Trigger the Present Windows effect when
- control-clicking on a group.
-
-BUG:326279
----
- plasma/desktop/applets/tasks/package/contents/ui/Task.qml |  8 ++++++--
- plasma/desktop/applets/tasks/package/contents/ui/main.qml |  1 +
- plasma/desktop/applets/tasks/tasks.cpp                    | 10 ++++++++++
- plasma/desktop/applets/tasks/tasks.h                      |  1 +
- 4 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/plasma/desktop/applets/tasks/package/contents/ui/Task.qml b/plasma/desktop/applets/tasks/package/contents/ui/Task.qml
-index 0fe1a7d..c81e1c2 100644
---- a/plasma/desktop/applets/tasks/package/contents/ui/Task.qml
-+++ b/plasma/desktop/applets/tasks/package/contents/ui/Task.qml
-@@ -98,8 +98,12 @@ MouseEventListener {
- 
-     onClicked: {
-         if (isGroupParent) {
--            groupDialog.target = task;
--            groupDialog.visible = true;
-+            if (mouse.modifiers & Qt.ControlModifier) {
-+                tasks.presentWindows(model.Id);
-+            } else {
-+                groupDialog.target = task;
-+                groupDialog.visible = true;
-+            }
-         } else {
-             tasks.activateItem(model.Id, true);
-         }
-diff --git a/plasma/desktop/applets/tasks/package/contents/ui/main.qml b/plasma/desktop/applets/tasks/package/contents/ui/main.qml
-index cbaecb2..90cb35e 100644
---- a/plasma/desktop/applets/tasks/package/contents/ui/main.qml
-+++ b/plasma/desktop/applets/tasks/package/contents/ui/main.qml
-@@ -61,6 +61,7 @@ Item {
-     signal itemMove(int id, int newIndex)
-     signal itemGeometryChanged(int id, int x, int y, int width, int height)
-     signal itemNeedsAttention(bool needs)
-+    signal presentWindows(int groupParentId)
- 
-     onWidthChanged: {
-         taskList.width = Layout.layoutWidth();
-diff --git a/plasma/desktop/applets/tasks/tasks.cpp b/plasma/desktop/applets/tasks/tasks.cpp
-index 85090f2..329b107 100644
---- a/plasma/desktop/applets/tasks/tasks.cpp
-+++ b/plasma/desktop/applets/tasks/tasks.cpp
-@@ -133,6 +133,7 @@ void Tasks::init()
-     connect(m_declarativeWidget->rootObject(), SIGNAL(itemGeometryChanged(int,int,int,int,int)),
-         this, SLOT(itemGeometryChanged(int,int,int,int,int)));
-     connect(m_declarativeWidget->rootObject(), SIGNAL(itemNeedsAttention(bool)), this, SLOT(itemNeedsAttention(bool)));
-+    connect(m_declarativeWidget->rootObject(), SIGNAL(presentWindows(int)), this, SLOT(presentWindows(int)));
- 
-     connect(KWindowSystem::self(), SIGNAL(activeWindowChanged(WId)), this, SLOT(handleActiveWindowChanged(WId)));
- 
-@@ -358,6 +359,15 @@ void Tasks::itemNeedsAttention(bool needs)
-     }
- }
- 
-+void Tasks::presentWindows(int groupParentId)
-+{
-+    TaskManager:: AbstractGroupableItem *item = m_groupManager->rootGroup()->getMemberById(groupParentId);
-+
-+    if (item) {
-+        Plasma::WindowEffects::presentWindows(view()->winId(), QList<WId>::fromSet(item->winIds()));
-+    }
-+}
-+
- void Tasks::handleActiveWindowChanged(WId activeWindow)
- {
-     m_declarativeWidget->rootObject()->setProperty("activeWindowId", qulonglong(activeWindow));
-diff --git a/plasma/desktop/applets/tasks/tasks.h b/plasma/desktop/applets/tasks/tasks.h
-index 6746bd2..4ff07dc 100644
---- a/plasma/desktop/applets/tasks/tasks.h
-+++ b/plasma/desktop/applets/tasks/tasks.h
-@@ -65,6 +65,7 @@ class Tasks : public Plasma::Applet
-         void itemMove(int id, int newIndex);
-         void itemGeometryChanged(int id, int x, int y, int width, int height);
-         void itemNeedsAttention(bool needs);
-+        void presentWindows(int groupParentId);
- 
-         void handleActiveWindowChanged(WId activeWindow);
- 
--- 
-2.0.0.rc2
-
diff --git a/debian/patches/0002-Fix-crash-after-dismissing-the-context-menu-of-a-jus.patch b/debian/patches/0002-Fix-crash-after-dismissing-the-context-menu-of-a-jus.patch
deleted file mode 100644
index b269917..0000000
--- a/debian/patches/0002-Fix-crash-after-dismissing-the-context-menu-of-a-jus.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 6a3e000bfa16cb4f3371dd7bc7005659194d5c5b Mon Sep 17 00:00:00 2001
-From: Eike Hein <hein at kde.org>
-Date: Mon, 28 Apr 2014 10:12:37 +0200
-Subject: [PATCH 02/16] Fix crash after dismissing the context menu of a
- just-disappeared task.
-
-BUG:326941
----
- plasma/desktop/applets/tasks/package/contents/ui/main.qml |  6 ++++++
- plasma/desktop/applets/tasks/tasks.cpp                    | 14 +++++++++++++-
- plasma/desktop/applets/tasks/tasks.h                      |  3 ++-
- 3 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/plasma/desktop/applets/tasks/package/contents/ui/main.qml b/plasma/desktop/applets/tasks/package/contents/ui/main.qml
-index 90cb35e..3f3669a 100644
---- a/plasma/desktop/applets/tasks/package/contents/ui/main.qml
-+++ b/plasma/desktop/applets/tasks/package/contents/ui/main.qml
-@@ -188,6 +188,12 @@ Item {
-         dragSource = null;
-     }
- 
-+    function isTaskAt(pos) {
-+        var mapped = mapToItem(taskList, pos.x, pos.y);
-+
-+        return (taskList.childAt(mapped.x, mapped.y) != null);
-+    }
-+
-     Component.onCompleted: {
-         dragHelper.dropped.connect(resetDragSource);
-     }
-diff --git a/plasma/desktop/applets/tasks/tasks.cpp b/plasma/desktop/applets/tasks/tasks.cpp
-index 329b107..a881e16 100644
---- a/plasma/desktop/applets/tasks/tasks.cpp
-+++ b/plasma/desktop/applets/tasks/tasks.cpp
-@@ -128,7 +128,7 @@ void Tasks::init()
-     optimumCapacity.connectNotifySignal(this, SLOT(optimumCapacityChanged()));
- 
-     connect(m_declarativeWidget->rootObject(), SIGNAL(activateItem(int,bool)), this, SLOT(activateItem(int,bool)));
--    connect(m_declarativeWidget->rootObject(), SIGNAL(itemContextMenu(int)), this, SLOT(itemContextMenu(int)));
-+    connect(m_declarativeWidget->rootObject(), SIGNAL(itemContextMenu(int)), this, SLOT(itemContextMenu(int)), Qt::QueuedConnection);
-     connect(m_declarativeWidget->rootObject(), SIGNAL(itemMove(int,int)), this, SLOT(itemMove(int,int)));
-     connect(m_declarativeWidget->rootObject(), SIGNAL(itemGeometryChanged(int,int,int,int,int)),
-         this, SLOT(itemGeometryChanged(int,int,int,int,int)));
-@@ -277,6 +277,18 @@ void Tasks::itemContextMenu(int id)
-     menu->deleteLater();
- }
- 
-+void Tasks::contextMenuEvent(QGraphicsSceneContextMenuEvent* event)
-+{
-+    QVariant ret;
-+
-+    QMetaObject::invokeMethod(m_declarativeWidget->rootObject(), "isTaskAt",
-+        Q_RETURN_ARG(QVariant, ret), Q_ARG(QVariant, event->pos()));
-+
-+    if (!ret.toBool()) {
-+        Plasma::Applet::contextMenuEvent(event);
-+    }
-+}
-+
- void Tasks::itemHovered(int id, bool hovered)
- {
-     TaskManager::AbstractGroupableItem* item = m_groupManager->rootGroup()->getMemberById(id);
-diff --git a/plasma/desktop/applets/tasks/tasks.h b/plasma/desktop/applets/tasks/tasks.h
-index 4ff07dc..614205f 100644
---- a/plasma/desktop/applets/tasks/tasks.h
-+++ b/plasma/desktop/applets/tasks/tasks.h
-@@ -56,7 +56,8 @@ class Tasks : public Plasma::Applet
- 
-     protected:
-         void createConfigurationInterface(KConfigDialog *parent);
--        QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF()) const;
-+        QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
-+        void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
- 
-     private slots:
-         void activateItem(int id, bool toggle);
--- 
-2.0.0.rc2
-
diff --git a/debian/patches/0004-connect-to-the-right-signal.patch b/debian/patches/0004-connect-to-the-right-signal.patch
deleted file mode 100644
index d976248..0000000
--- a/debian/patches/0004-connect-to-the-right-signal.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3065554afa5f3a74035e6735dda06ec68ce2e38c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= <lukas at kde.org>
-Date: Tue, 29 Apr 2014 00:23:29 +0200
-Subject: [PATCH 04/16] connect to the right signal
-
-when updating the _device_ properties (ie. the remaining time),
-only happens with UPower >= 0.99
----
- powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
-index b592254..fd402c6 100644
---- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
-+++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
-@@ -465,7 +465,7 @@ void PowerDevilUPowerBackend::slotDeviceAdded(const QString & device)
- 
-     // for UPower >= 0.99.0 which doesn't emit the DeviceChanged(QString) signal
-     QDBusConnection::systemBus().connect(UPOWER_SERVICE, device, "org.freedesktop.DBus.Properties", "PropertiesChanged", this,
--                                         SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
-+                                         SLOT(onDevicePropertiesChanged(QString,QVariantMap,QStringList)));
- 
-     updateDeviceProps();
- }
--- 
-2.0.0.rc2
-
diff --git a/debian/patches/0009-Do-not-popup-during-initialization.patch b/debian/patches/0009-Do-not-popup-during-initialization.patch
deleted file mode 100644
index 3d39924..0000000
--- a/debian/patches/0009-Do-not-popup-during-initialization.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 42310a7851049d7706c66874f363ce7ef73655df Mon Sep 17 00:00:00 2001
-From: Jacopo De Simoi <wilderkde at gmail.com>
-Date: Thu, 1 May 2014 16:46:46 -0400
-Subject: [PATCH 09/16] Do not popup during initialization
-
-The notifier should not popup if devices are detected during the
-applet initialization phase (e.g. on plasma startup)
-CCBUG: 318061
----
- .../applets/devicenotifier/package/contents/ui/devicenotifier.qml       | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml b/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml
-index 9b6132e..473036f 100644
---- a/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml
-+++ b/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml
-@@ -74,7 +74,7 @@ Item {
-                     (devicesType == "removable" && data[last] && data[last]["Removable"] == true) ||
-                     (devicesType == "nonRemovable" && data[last] && data[last]["Removable"] == false)) {
-                     updateTooltip();
--                    if (expand) {
-+                    if (expand && hpSource.data[last]["added"]) {
-                         expandDevice(last)
-                     }
-                     last = "";
--- 
-2.0.0.rc2
-
diff --git a/debian/patches/0010-Fix-crash-when-DesktopNames-isn-t-set.patch b/debian/patches/0010-Fix-crash-when-DesktopNames-isn-t-set.patch
deleted file mode 100644
index b3ecdea..0000000
--- a/debian/patches/0010-Fix-crash-when-DesktopNames-isn-t-set.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f Mon Sep 17 00:00:00 2001
-From: David Faure <faure at kde.org>
-Date: Fri, 2 May 2014 10:26:38 +0200
-Subject: [PATCH 10/16] Fix crash when DesktopNames isn't set
-
-BUG: 334159
-FIXED-IN: 4.11.10
----
- kdm/backend/client.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-Index: kde-workspace/kdm/backend/client.c
-===================================================================
---- kde-workspace.orig/kdm/backend/client.c	2014-05-07 20:23:40.079982880 +0200
-+++ kde-workspace/kdm/backend/client.c	2014-05-07 20:23:40.075983044 +0200
-@@ -1814,12 +1814,14 @@
-                             !(sessargs = iniEntry(str, "Desktop Entry", "Exec", 0)))
-                         sessargs = "";
-                     buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0);
--                    for (buf2 = buf; *buf2; ++buf2) {
--                        if (*buf2 == ';')
--                            *buf2 = ':';
-+                    if (buf) {
-+                        for (buf2 = buf; *buf2; ++buf2) {
-+                            if (*buf2 == ';')
-+                                *buf2 = ':';
-+                        }
-+                        userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
-+                        free(buf);
-                     }
--                    userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
--                    free(buf);
-                     free(str);
-                     free(fname);
-                     goto gotit;
diff --git a/debian/patches/0012-Fix-wrong-icons.patch b/debian/patches/0012-Fix-wrong-icons.patch
deleted file mode 100644
index abdc082..0000000
--- a/debian/patches/0012-Fix-wrong-icons.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 246badf2c8edd93f6352797b9ddde1a626f4167a Mon Sep 17 00:00:00 2001
-From: Christoph Feck <christoph at maxiom.de>
-Date: Sun, 4 May 2014 12:35:02 +0200
-Subject: [PATCH 12/16] Fix wrong icons
-
-BUG: 334309
-FIXED-IN: 4.11.10
----
- kinfocenter/infocenter.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kinfocenter/infocenter.cpp b/kinfocenter/infocenter.cpp
-index b0ed9d1..7cd5640 100644
---- a/kinfocenter/infocenter.cpp
-+++ b/kinfocenter/infocenter.cpp
-@@ -134,7 +134,7 @@ void KInfoCenter::createToolBar()
- 
- 	m_aboutKcm = actionCollection()->addAction("help_about_module");
- 	m_aboutKcm->setText(i18nc("Information about current module located in about menu","About Current Information Module"));
--	m_aboutKcm->setIcon(KIcon("help"));
-+	m_aboutKcm->setIcon(KIcon("help-about"));
- 	m_aboutKcm->setEnabled(false);
- 
- 	m_exportAction = new KAction(this);
-@@ -192,7 +192,7 @@ void KInfoCenter::createMenuFrame()
- 	m_searchAction = new KAction(this);
- 	m_searchAction->setShortcut(KShortcut(QKeySequence(Qt::CTRL + Qt::Key_F)));
- 	m_searchAction->setText(i18nc("Kaction search label", "Search Modules"));
--	m_searchAction->setIcon(KIcon("search"));
-+	m_searchAction->setIcon(KIcon("edit-find"));
- 
- 	actionCollection()->addAction("search",m_searchAction);
- 
--- 
-2.0.0.rc2
-
diff --git a/debian/patches/0015-added-window-title-to-sizeGrip-for-easier-tracking-i.patch b/debian/patches/0015-added-window-title-to-sizeGrip-for-easier-tracking-i.patch
deleted file mode 100644
index 82afbfe..0000000
--- a/debian/patches/0015-added-window-title-to-sizeGrip-for-easier-tracking-i.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a6c8d3e81a318394055c09a423a39a1e8c0455da Mon Sep 17 00:00:00 2001
-From: Hugo Pereira Da Costa <hugo.pereira at free.fr>
-Date: Mon, 5 May 2014 12:00:46 +0200
-Subject: [PATCH 15/16] added window title to sizeGrip, for easier tracking in
- X Window tree
-
----
- kwin/clients/oxygen/oxygensizegrip.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/kwin/clients/oxygen/oxygensizegrip.cpp b/kwin/clients/oxygen/oxygensizegrip.cpp
-index 29d3539..be7dccf 100644
---- a/kwin/clients/oxygen/oxygensizegrip.cpp
-+++ b/kwin/clients/oxygen/oxygensizegrip.cpp
-@@ -108,6 +108,8 @@ namespace Oxygen
- 
-             // reparent
-             XReparentWindow( QX11Info::display(), winId(), current, 0, 0 );
-+            setWindowTitle( "Oxygen::SizeGrip" );
-+            
-         } else {
- 
-             hide();
--- 
-2.0.0.rc2
-
diff --git a/debian/patches/50_icon_in_oxygen_title_bar.diff b/debian/patches/50_icon_in_oxygen_title_bar.diff
deleted file mode 100644
index 36f2cae..0000000
--- a/debian/patches/50_icon_in_oxygen_title_bar.diff
+++ /dev/null
@@ -1,90 +0,0 @@
-We planned once to add a debioan icon in the titlebar of active windows.
-Unused right now.
---- a/kwin/clients/oxygen/oxygenclient.cpp
-+++ b/kwin/clients/oxygen/oxygenclient.cpp
-@@ -57,6 +57,9 @@
- #include "oxygenbutton.h"
- #include "oxygen.h"
- 
-+#define logourl "/usr/share/kde4/apps/kwin/titlebar_decor.png"
-+#define logoOffset 9
-+
- namespace Oxygen
- {
- 
-@@ -73,6 +76,7 @@
-     , colorCacheInvalid_(true)
-     , helper_(*globalHelper)
- {
-+    logo.load(logourl);
- }
- 
- OxygenClient::~OxygenClient()
-@@ -237,9 +241,9 @@
- }
- 
- 
--QColor OxygenClient::titlebarTextColor(const QPalette &palette)
-+QColor OxygenClient::titlebarTextColor(const QPalette &palette, bool active)
- {
--    if (isActive())
-+    if (active)
-         return palette.color(QPalette::Active, QPalette::WindowText);
-     else {
-         if(colorCacheInvalid_) {
-@@ -255,6 +259,9 @@
-     }
- }
- 
-+QColor OxygenClient::titlebarTextColor(const QPalette &palette) {
-+    return titlebarTextColor(palette, isActive());
-+}
- 
- void OxygenClient::paintEvent(QPaintEvent *e)
- {
-@@ -280,12 +287,14 @@
-     const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft);
-     const int marginLeft = layoutMetric(LM_TitleBorderLeft);
-     const int marginRight = layoutMetric(LM_TitleBorderRight);
-+    const int borderLeft = layoutMetric(LM_BorderLeft, true) + (layoutMetric(LM_BorderLeft, true) == 0 ? -1 : 0);
- 
-     const int titleLeft = frame.left() + titleEdgeLeft + buttonsLeftWidth() + marginLeft;
-+    const int fullLogoOffset = (logo.isNull() ? 0 : logo.width() + logoOffset - borderLeft);
-     const int titleWidth = frame.width() -
-             titleEdgeLeft - layoutMetric(LM_TitleEdgeRight) -
-             buttonsLeftWidth() - buttonsRightWidth() -
--            marginLeft - marginRight;
-+            marginLeft - marginRight - fullLogoOffset;
- 
- 
-     int splitY = qMin(300, 3*frame.height()/4);
-@@ -317,6 +326,15 @@
-     painter.drawText(titleLeft, titleTop-1, titleWidth, titleHeight,  // -1 is to go into top resizearea
-               OxygenFactory::titleAlign() | Qt::AlignVCenter, caption());
- 
-+    if (!logo.isNull() && isActive()) {
-+        QPixmap pix(logo.width(),logo.height());
-+        pix.fill(titlebarTextColor(palette, false));
-+        pix.setAlphaChannel(logo.alphaChannel());
-+        QFontMetrics fm(options()->font(isActive(), false));
-+        painter.drawPixmap(titleEdgeLeft + layoutMetric(LM_TitleEdgeRight) + buttonsLeftWidth()
-+          + qMin(fm.width(caption()), titleWidth) + logoOffset - borderLeft, titleTop, pix);
-+    }
-+
-     painter.setRenderHint(QPainter::Antialiasing);
- 
-     // Draw dividing line
---- a/kwin/clients/oxygen/oxygenclient.h
-+++ b/kwin/clients/oxygen/oxygenclient.h
-@@ -53,9 +53,11 @@
- 
- private:
-     void paintEvent(QPaintEvent *e);
-+    QColor titlebarTextColor(const QPalette &palette, bool active);
-     QColor titlebarTextColor(const QPalette &palette);
-     bool colorCacheInvalid_;
-     QColor cachedTitlebarTextColor_;
-+    QPixmap logo;
- 
- protected:
-     friend class OxygenButton;
diff --git a/debian/patches/kdm_X_path.diff b/debian/patches/kdm_X_path.diff
index eef0c9e..556d731 100644
--- a/debian/patches/kdm_X_path.diff
+++ b/debian/patches/kdm_X_path.diff
@@ -2,9 +2,11 @@ From: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Subject: Fallback to default X location (Debian specific)
 Forwarded: not-needed
 Last-Update: 2011-08-29
---- a/kdm/backend/dm.c
-+++ b/kdm/backend/dm.c
-@@ -629,7 +629,13 @@ startRemoteLogin(struct display *d)
+Index: kde-workspace/kdm/backend/dm.c
+===================================================================
+--- kde-workspace.orig/kdm/backend/dm.c	2014-07-31 18:05:25.926140713 +0200
++++ kde-workspace/kdm/backend/dm.c	2014-07-31 18:05:25.922140876 +0200
+@@ -640,7 +640,13 @@
              exit(1);
          debug("exec %\"[s
", argv);
          (void)execv(argv[0], argv);
@@ -19,9 +21,11 @@ Last-Update: 2011-08-29
          exit(1);
      case -1:
          logError("Forking X server for remote login failed: %m");
---- a/kdm/backend/server.c
-+++ b/kdm/backend/server.c
-@@ -97,6 +97,12 @@ startServerOnce(void)
+Index: kde-workspace/kdm/backend/server.c
+===================================================================
+--- kde-workspace.orig/kdm/backend/server.c	2014-07-31 18:05:25.926140713 +0200
++++ kde-workspace/kdm/backend/server.c	2014-07-31 18:05:25.922140876 +0200
+@@ -97,6 +97,12 @@
           */
          (void)Signal(SIGUSR1, SIG_IGN);
          (void)execv(argv[0], argv);
diff --git a/debian/patches/series b/debian/patches/series
index 47f16e2..fe1dd02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,10 +23,3 @@ kubuntu_kcm_display_add_kscreen.diff
 kubuntu_no_krandr.diff
 effect_gles_link_against_gles
 unlink_testsock
-0001-Trigger-the-Present-Windows-effect-when-control-clic.patch
-0002-Fix-crash-after-dismissing-the-context-menu-of-a-jus.patch
-0004-connect-to-the-right-signal.patch
-0009-Do-not-popup-during-initialization.patch
-0010-Fix-crash-when-DesktopNames-isn-t-set.patch
-0012-Fix-wrong-icons.patch
-0015-added-window-title-to-sizeGrip-for-easier-tracking-i.patch

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list