Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2013-08-27 20:49:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2013-08-19 10:56:25.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2013-08-27 20:49:45.000000000 +0200
@@ -1,0 +2,17 @@
+Sun Aug 25 16:57:18 UTC 2013 - [email protected]
+
+- Added 2 patches from upstream instead of the previous workaround,
+ and aditional 3 for various KWin issues:
+ 0004-Don-t-attempt-to-publish-geometry-for-launcher-items.patch
+ 0005-More-sanity-checking.patch
+ 0006-c-cannot-invoke-other-constructors.patch
+ 0007-print-active-screen-strategy-blocking-for-retrace.patch
+ 0008-align-GUI-object-name-to-kcfg-name.patch
+
+-------------------------------------------------------------------
+Sun Aug 25 13:38:09 UTC 2013 - [email protected]
+
+- Added workaround for kde#322283, bnc#829298: execute plasma-desktop
+ with LANG enviroment variable
+
+-------------------------------------------------------------------
New:
----
0004-Don-t-attempt-to-publish-geometry-for-launcher-items.patch
0005-More-sanity-checking.patch
0006-c-cannot-invoke-other-constructors.patch
0007-print-active-screen-strategy-blocking-for-retrace.patch
0008-align-GUI-object-name-to-kcfg-name.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.GcJ1gx/_old 2013-08-27 20:49:46.000000000 +0200
+++ /var/tmp/diff_new_pack.GcJ1gx/_new 2013-08-27 20:49:46.000000000 +0200
@@ -149,6 +149,16 @@
Patch2001: 0002-Fix-rare-race-condition-crash.patch
# PATCH-FIX-UPSTREAM 0003-make-stacking_order-exclusive-during-shutdown.patch
(kde#323383)
Patch2002: 0003-make-stacking_order-exclusive-during-shutdown.patch
+# PATCH-FIX-UPSTREAM
0004-Don-t-attempt-to-publish-geometry-for-launcher-items.patch
+Patch2003: 0004-Don-t-attempt-to-publish-geometry-for-launcher-items.patch
+# PATCH-FIX-UPSTREAM 0005-More-sanity-checking.patch
+Patch2004: 0005-More-sanity-checking.patch
+# PATCH-FIX-UPSTREAM 0006-c-cannot-invoke-other-constructors.patch
+Patch2005: 0006-c-cannot-invoke-other-constructors.patch
+# PATCH-FIX-UPSTREAM
0007-print-active-screen-strategy-blocking-for-retrace.patch
+Patch2006: 0007-print-active-screen-strategy-blocking-for-retrace.patch
+# PATCH-FIX-UPSTREAM 0008-align-GUI-object-name-to-kcfg-name.patch
+Patch2007: 0008-align-GUI-object-name-to-kcfg-name.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-branding = %{_kde_branding_version}
Requires: %{name}-ksysguardd = %{version}
@@ -368,6 +378,11 @@
%patch2000 -p1
%patch2001 -p1
%patch2002 -p1
+%patch2003 -p1
+%patch2004 -p1
+%patch2005 -p1
+%patch2006 -p1
+%patch2007 -p1
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
%build
++++++ 0004-Don-t-attempt-to-publish-geometry-for-launcher-items.patch ++++++
>From 6878e972b87e9ef34617c6280eda8ac5d7113a29 Mon Sep 17 00:00:00 2001
From: Eike Hein <[email protected]>
Date: Sun, 25 Aug 2013 16:38:15 +0200
Subject: [PATCH 1/5] Don't attempt to publish geometry for launcher items.
CCBUG:322283
---
plasma/desktop/applets/tasks/package/contents/code/tools.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plasma/desktop/applets/tasks/package/contents/code/tools.js
b/plasma/desktop/applets/tasks/package/contents/code/tools.js
index 53e5563..028dd2c 100644
--- a/plasma/desktop/applets/tasks/package/contents/code/tools.js
+++ b/plasma/desktop/applets/tasks/package/contents/code/tools.js
@@ -100,7 +100,7 @@ function publishIconGeometries(taskItems) {
for (j = 0; j < taskIdList.length; ++j) {
tasks.itemGeometryChanged(taskIdList[j].itemId, task.x,
task.y, task.width, task.height);
}
- } else {
+ } else if (!task.isLauncher) {
tasks.itemGeometryChanged(task.itemId, task.x, task.y, task.width,
task.height);
}
}
--
1.8.3.4
++++++ 0005-More-sanity-checking.patch ++++++
>From 750a5b90d52a58af721d3838faa77f4bac37752e Mon Sep 17 00:00:00 2001
From: Eike Hein <[email protected]>
Date: Sun, 25 Aug 2013 16:41:12 +0200
Subject: [PATCH 2/5] More sanity checking.
---
plasma/desktop/applets/tasks/tasks.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/plasma/desktop/applets/tasks/tasks.cpp
b/plasma/desktop/applets/tasks/tasks.cpp
index c4aef4b..dd4e216 100644
--- a/plasma/desktop/applets/tasks/tasks.cpp
+++ b/plasma/desktop/applets/tasks/tasks.cpp
@@ -299,13 +299,19 @@ void Tasks::itemMove(int id, int newIndex)
void Tasks::itemGeometryChanged(int id, int x, int y, int width, int height)
{
- TaskManager::TaskItem* taskItem =
static_cast<TaskManager::TaskItem*>(m_groupManager->rootGroup()->getMemberById(id));
+ TaskManager:: AbstractGroupableItem *item =
m_groupManager->rootGroup()->getMemberById(id);
- if (!taskItem || !taskItem->task() || !scene())
+ if (!item || item->itemType() != TaskManager::TaskItemType || !scene())
{
return;
}
+ TaskManager::TaskItem *taskItem = static_cast<TaskManager::TaskItem
*>(item);
+
+ if (!taskItem->task()) {
+ return;
+ }
+
QGraphicsView *parentView = 0;
QGraphicsView *possibleParentView = 0;
// The following was taken from Plasma::Applet, it doesn't make sense to
make the item an applet, and this was the easiest way around it.
--
1.8.3.4
++++++ 0006-c-cannot-invoke-other-constructors.patch ++++++
>From ec6d66f53cf32e29ab54e450145585a6cc2eb8e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <[email protected]>
Date: Sun, 25 Aug 2013 16:17:20 +0200
Subject: [PATCH 3/5] c++ cannot invoke other constructors
BUG: 324004
FIXED-IN: 4.11.1
BUG: 112274
---
kwin/libkwineffects/kwinxrenderutils.cpp | 7 ++++++-
kwin/libkwineffects/kwinxrenderutils.h | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/kwin/libkwineffects/kwinxrenderutils.cpp
b/kwin/libkwineffects/kwinxrenderutils.cpp
index cfd3bc5..270474f 100644
--- a/kwin/libkwineffects/kwinxrenderutils.cpp
+++ b/kwin/libkwineffects/kwinxrenderutils.cpp
@@ -110,7 +110,7 @@ static xcb_render_picture_t createPicture(xcb_pixmap_t pix,
int depth)
XRenderPicture::XRenderPicture(const QPixmap &pix)
{
if (Extensions::nonNativePixmaps()) {
- XRenderPicture(pix.toImage());
+ fromImage(pix.toImage());
} else {
d = new XRenderPictureData(createPicture(pix.handle(), pix.depth()));
}
@@ -118,6 +118,11 @@ XRenderPicture::XRenderPicture(const QPixmap &pix)
XRenderPicture::XRenderPicture(const QImage &img)
{
+ fromImage(img);
+}
+
+void XRenderPicture::fromImage(const QImage &img)
+{
const int depth = img.depth();
xcb_pixmap_t xpix = xcb_generate_id(connection());
xcb_create_pixmap(connection(), depth, xpix, rootWindow(), img.width(),
img.height());
diff --git a/kwin/libkwineffects/kwinxrenderutils.h
b/kwin/libkwineffects/kwinxrenderutils.h
index a02028d..697c82d 100644
--- a/kwin/libkwineffects/kwinxrenderutils.h
+++ b/kwin/libkwineffects/kwinxrenderutils.h
@@ -74,6 +74,7 @@ public:
XRenderPicture(xcb_pixmap_t pix, int depth);
operator xcb_render_picture_t();
private:
+ void fromImage(const QImage &img);
KSharedPtr< XRenderPictureData > d;
};
--
1.8.3.4
++++++ 0007-print-active-screen-strategy-blocking-for-retrace.patch ++++++
>From 7d5f9dfc236944876e9bf5bd2b9aa63074cf2bbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <[email protected]>
Date: Sun, 18 Aug 2013 13:04:05 +0200
Subject: [PATCH 4/5] print active screen strategy, blocking for retrace
REVIEW: 112162
---
kwin/workspace.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp
index 3ec6979..8235aaa 100644
--- a/kwin/workspace.cpp
+++ b/kwin/workspace.cpp
@@ -1460,6 +1460,11 @@ QString Workspace::supportInformation() const
} else {
support.append("no\n");
}
+ support.append("Active screen follows mouse: ");
+ if (screens()->isCurrentFollowsMouse())
+ support.append(" yes\n");
+ else
+ support.append(" no\n");
support.append(QString("Number of Screens: %1\n").arg(screens()->count()));
for (int i=0; i<screens()->count(); ++i) {
const QRect geo = screens()->geometry(i);
@@ -1563,6 +1568,11 @@ QString Workspace::supportInformation() const
} else {
support.append("OpenGL 2 Shaders are not used. Legacy OpenGL
1.x code path is used.\n");
}
+ support.append("Painting blocks for vertical retrace: ");
+ if (m_compositor->scene()->blocksForRetrace())
+ support.append(" yes\n");
+ else
+ support.append(" no\n");
break;
}
case XRenderCompositing:
--
1.8.3.4
++++++ 0008-align-GUI-object-name-to-kcfg-name.patch ++++++
>From 445453997f3d9b1014d60e2b695c6601398915ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <[email protected]>
Date: Sat, 24 Aug 2013 12:19:28 +0200
Subject: [PATCH 5/5] align GUI object name to kcfg name
BUG: 315866
FIXED-IN: 4.11.1
REVIEW: 112237
---
kwin/effects/diminactive/diminactive_config.ui | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kwin/effects/diminactive/diminactive_config.ui
b/kwin/effects/diminactive/diminactive_config.ui
index ab6099a..99009f9 100644
--- a/kwin/effects/diminactive/diminactive_config.ui
+++ b/kwin/effects/diminactive/diminactive_config.ui
@@ -33,7 +33,7 @@
</widget>
</item>
<item row="4" column="0" colspan="3">
- <widget class="QCheckBox" name="kcfg_DimGroup">
+ <widget class="QCheckBox" name="kcfg_DimByGroup">
<property name="text">
<string>Apply effect to &groups</string>
</property>
@@ -111,7 +111,7 @@
<tabstop>kcfg_Strength</tabstop>
<tabstop>kcfg_DimPanels</tabstop>
<tabstop>kcfg_DimDesktop</tabstop>
- <tabstop>kcfg_DimGroup</tabstop>
+ <tabstop>kcfg_DimByGroup</tabstop>
</tabstops>
<resources/>
<connections>
--
1.8.3.4
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
