commit:     117c55dda3e55d36d869c69f9abb4290b7368500
Author:     Michal Privoznik <mprivozn <AT> redhat <DOT> com>
AuthorDate: Thu Feb 11 16:29:19 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 20:55:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=117c55dd

kde-plasma/kde-gtk-config: Don't print debug message

I've noticed that whenever a GTK application is started the
stdout is polluted with the following message:

WINDOW DECORATIONS RELOADED

After some research I came across KDE bug:

  https://bugs.kde.org/show_bug.cgi?id=431365

which says the message is a debug message and could be dropped.
In the upstream repository, the following commit was merged which
does exactly that:

https://invent.kde.org/plasma/kde-gtk-config/-/commit/62e272df848d6848482ceb534d14bf36c9fde241.patch

Backport the commit until the version of kde-gtk-config is
bumped.

Closes: https://bugs.gentoo.org/770097
Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com>
Closes: https://github.com/gentoo/gentoo/pull/19415
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...config-5.20.5-window-decorations-reloaded.patch | 24 +++++++++
 .../kde-gtk-config/kde-gtk-config-5.20.5-r1.ebuild | 59 ++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git 
a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.20.5-window-decorations-reloaded.patch
 
b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.20.5-window-decorations-reloaded.patch
new file mode 100644
index 00000000000..9b790a03dd1
--- /dev/null
+++ 
b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.20.5-window-decorations-reloaded.patch
@@ -0,0 +1,24 @@
+From 62e272df848d6848482ceb534d14bf36c9fde241 Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wen...@gmail.com>
+Date: Sat, 9 Jan 2021 19:07:24 -0800
+Subject: [PATCH] Remove debug message to avoid polute to stdout.
+
+This would break application like zenity which output to stdout.
+---
+ window-decorations-reload-module/reloader.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/window-decorations-reload-module/reloader.c 
b/window-decorations-reload-module/reloader.c
+index 9e367dc..606bb1f 100644
+--- a/window-decorations-reload-module/reloader.c
++++ b/window-decorations-reload-module/reloader.c
+@@ -55,7 +55,6 @@ void manage_css_provider(GFileMonitor *monitor, GFile *file, 
GFile *other_file,
+ 
+ void reload_css_provider()
+ {
+-    printf("WINDOW DECORATIONS RELOADED\n");
+     if (css_provider != NULL) {
+         remove_css_provider();
+     }
+-- 
+GitLab

diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.5-r1.ebuild 
b/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.5-r1.ebuild
new file mode 100644
index 00000000000..10b6fa2e627
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.5-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="GTK2 and GTK3 configurator for KDE Plasma"
+HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config";
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+IUSE=""
+
+BDEPEND="
+       dev-lang/sassc
+"
+DEPEND="
+       dev-cpp/glibmm:2
+       dev-libs/glib:2
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtsvg-${QTMIN}:5
+       gnome-base/gsettings-desktop-schemas
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kguiaddons-${KFMIN}:5
+       >=kde-plasma/kdecoration-${PVCUT}:5
+       x11-libs/gtk+:2
+       x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
+       x11-misc/xsettingsd
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.20.5-window-decorations-reloaded.patch" )
+
+src_configure() {
+       local mycmakeargs=(
+               -DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+       )
+
+       ecm_src_configure
+}
+
+pkg_postinst() {
+       ecm_pkg_postinst
+       elog "If you notice missing icons in your GTK applications, you may 
have to install"
+       elog "the corresponding themes for GTK. A good guess would be 
x11-themes/oxygen-gtk"
+       elog "for example."
+}

Reply via email to