Accepting request 915362 from KDE:Frameworks5

Plasma 5.22.5. Hasn't finished building yet (forwarded request 915319 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/915362
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kde-gtk-config5?expand=0&rev=120
This commit is contained in:
Dominique Leuenberger 2021-09-04 20:32:23 +00:00 committed by Git OBS Bridge
commit 4c23439988
7 changed files with 28 additions and 51 deletions

View File

@ -1,35 +0,0 @@
From da887d179bff6597355b0214c4e6c56f327b6ce3 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Mon, 2 Aug 2021 13:47:36 +0200
Subject: [PATCH] Make sure to actually commit GSettings changes
g_settings_set_* is async, so make sure the change is actually performed before
returning and eventually exiting. This mostly affected the gtk_theme update
binary, because that isn't long running unlike the kded module.
---
kded/configeditor.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kded/configeditor.cpp b/kded/configeditor.cpp
index a51f48b..587ff7c 100644
--- a/kded/configeditor.cpp
+++ b/kded/configeditor.cpp
@@ -38,12 +38,15 @@ void ConfigEditor::setGtkConfigValueGSettings(const QString &paramName, const QV
} else if (paramValue.type() == QVariant::Type::Bool) {
g_settings_set_boolean(gsettings, paramName.toUtf8().constData(), paramValue.toBool());
}
+
+ g_settings_sync();
}
void ConfigEditor::setGtkConfigValueGSettingsAsEnum(const QString &paramName, int paramValue, const QString &category)
{
g_autoptr(GSettings) gsettings = g_settings_new(category.toUtf8().constData());
g_settings_set_enum(gsettings, paramName.toUtf8().constData(), paramValue);
+ g_settings_sync();
}
void ConfigEditor::setGtkConfigValueSettingsIni(const QString &versionString, const QString &paramName, const QVariant &paramValue)
--
2.32.0

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
size 70832

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmD/3cIACgkQ7JTRj38F
mX7v6wf+OTPZWTUBITqXDHVgioPmjPy75MzUsRCZnTFGi1n0JYSvO6lTRnD0jIBH
vkNuvH6H7ySB+fYyFRNYBiLndOBmzPtPaNdC/l1DIaU1A1a0EtWNTj4a7kdN/Tpa
GKGjnLYHcVZDE5zyaiP527WxOGAE/a35n0b/tGRZImsQTKiiCwbsj1PlK33a0Fds
zgGTInskCoMywqq4JVM7KIWjtOJ2xVeCVWZQymfrk0F6XWIcxh+DPtvxMRrYfdYy
RSjOW5ddVwIUGci1Ed/YLm7E13sMBinDde1wPu2yRfLlXHOVdwXJvxddtC4ZYvyV
ROsYHf8QdaxgP8xsqWeJUsMqDzVTFw==
=gk2Q
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:daf8ca2d5e3e3986a478238bcc6d22cc750e20ea37ce198e1f7ef1d88c971e6c
size 71064

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmEuE7QACgkQ7JTRj38F
mX6h7gf/e+n4kqAHPYO7yYgJClcBADToxm/X53jb2+W7kM6aB6ijzMTF4Dvkm5+W
vZmK4wuThaytqXmA6PIa8Gi66NwbDei4cp+SCw+75TpMMdkgDqhQU50RpSBFBxpU
+X4jdfnFoqxBv+pFsTHCLtPDK5ExYz2iUcy+9BTQ4MsSYIfAaqNnbKqBsLWjwo2f
gku0TUmcIOocfDRNQPKKtyiYpFV17yDiedIDsaBwJ7EyUSH/UV3O7cAxETihK6eC
NktoFi8EHSNgg/jkb/L8eSISs4tRaOS83OSDiWoMqLpRv13mqIvkUgT6MuyIS1QB
xHyYs2D3RQk9sXPZS1FNB/quqeRN+A==
=kh6a
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Aug 31 19:08:39 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.22.5
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.22.5
- Changes since 5.22.4:
* Don't apply window_decorations.css to non-Breeze themes.
* Make sure to actually commit GSettings changes
- Drop patches, now upstream:
* 0001-Make-sure-to-actually-commit-GSettings-changes.patch
-------------------------------------------------------------------
Mon Aug 2 11:58:51 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -18,7 +18,7 @@
%bcond_without lang
Name: kde-gtk-config5
Version: 5.22.4
Version: 5.22.5
Release: 0
Summary: Daemon for GTK2 and GTK3 Applications Appearance Under KDE
License: GPL-3.0-or-later AND LGPL-3.0-or-later
@ -30,7 +30,6 @@ Source1: https://download.kde.org/stable/plasma/%{version}/kde-gtk-config
Source2: plasma.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch1: 0001-Make-sure-to-actually-commit-GSettings-changes.patch
Patch2: 0001-Drop-unused-dependency-on-gtk-2.0.patch
BuildRequires: extra-cmake-modules >= 0.0.9
BuildRequires: gsettings-desktop-schemas