Hello community,

here is the log from the commit of package plasma5-workspace for 
openSUSE:Factory checked in at 2020-10-13 16:17:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old)
 and      /work/SRC/openSUSE:Factory/.plasma5-workspace.new.3486 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "plasma5-workspace"

Tue Oct 13 16:17:02 2020 rev:147 rq:841562 version:5.20.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes      
2020-10-13 15:31:13.160907840 +0200
+++ 
/work/SRC/openSUSE:Factory/.plasma5-workspace.new.3486/plasma5-workspace.changes
    2020-10-13 16:17:05.686274231 +0200
@@ -1,0 +2,6 @@
+Tue Oct 13 10:21:44 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Add patch to fix startup of some applications (mostly Tk):
+  * 0001-Revert-krdb-Call-xrdb-with-nocpp-to-fix-gitk-runtime.patch
+
+-------------------------------------------------------------------

New:
----
  0001-Revert-krdb-Call-xrdb-with-nocpp-to-fix-gitk-runtime.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ plasma5-workspace.spec ++++++
--- /var/tmp/diff_new_pack.rYKv3E/_old  2020-10-13 16:17:06.546274608 +0200
+++ /var/tmp/diff_new_pack.rYKv3E/_new  2020-10-13 16:17:06.546274608 +0200
@@ -41,6 +41,7 @@
 Source3:        baselibs.conf
 Source4:        plasmafullwayland.desktop
 # PATCH-FIX-UPSTREAM
+Patch1:         0001-Revert-krdb-Call-xrdb-with-nocpp-to-fix-gitk-runtime.patch
 # PATCHES 501-??? are PATCH-FIX-OPENSUSE
 Patch501:       0001-Use-qdbus-qt5.patch
 Patch502:       0001-Ignore-default-sddm-face-icons.patch

++++++ 0001-Revert-krdb-Call-xrdb-with-nocpp-to-fix-gitk-runtime.patch ++++++
>From ae43cd883313e2309b3f90416b69e2e008b54a25 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christo...@krop.fr>
Date: Thu, 1 Oct 2020 11:16:02 +0000
Subject: [PATCH] Revert "krdb: Call xrdb with -nocpp" to fix gitk runtime
 errors

This commit was preventing gitk from starting with
'unknown color name "BACKGROUND"' errors.

This reverts commit d360e3dcb608bd96d674bbae597b7938334972fd.


(cherry picked from commit f0764d87fe5275a123cdf6dca1ab3d0399c97578)
---
 kcms/krdb/krdb.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
index c47e0353b..59ba546c4 100644
--- a/kcms/krdb/krdb.cpp
+++ b/kcms/krdb/krdb.cpp
@@ -493,11 +493,11 @@ void runRdb( uint flags )
   tmpFile.flush();
 
   KProcess proc;
-  proc << QStringLiteral("xrdb") << QStringLiteral("-nocpp")
-#ifdef NDEBUG
-    << QStringLiteral("-quiet")
+#ifndef NDEBUG
+  proc << QStringLiteral("xrdb") << QStringLiteral("-merge") << 
tmpFile.fileName();
+#else
+  proc << "xrdb" << "-quiet" << "-merge" << tmpFile.fileName();
 #endif
-    << QStringLiteral("-merge") << tmpFile.fileName();
   proc.execute();
 
   applyGtkStyles(exportColors, 1);
-- 
2.25.1




Reply via email to