From fe86d9c974f3244a054c6aa7c9f75cc87b1060e5b94d17bb97ff7ead6ca2a68d Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 21 Sep 2020 06:29:49 +0000 Subject: [PATCH 1/2] Plasma 5.20 Beta again - untested and needs a bit of cleanup still OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-gtk-config5?expand=0&rev=261 --- kde-gtk-config-5.19.5.tar.xz | 3 --- kde-gtk-config-5.19.5.tar.xz.sig | 11 --------- kde-gtk-config-5.19.90.tar.xz | 3 +++ kde-gtk-config-5.19.90.tar.xz.sig | 11 +++++++++ kde-gtk-config5.changes | 17 +++++++++++++ kde-gtk-config5.spec | 41 ++++++++++++++----------------- 6 files changed, 49 insertions(+), 37 deletions(-) delete mode 100644 kde-gtk-config-5.19.5.tar.xz delete mode 100644 kde-gtk-config-5.19.5.tar.xz.sig create mode 100644 kde-gtk-config-5.19.90.tar.xz create mode 100644 kde-gtk-config-5.19.90.tar.xz.sig diff --git a/kde-gtk-config-5.19.5.tar.xz b/kde-gtk-config-5.19.5.tar.xz deleted file mode 100644 index 28d1117..0000000 --- a/kde-gtk-config-5.19.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9b79917994a18001691ce675d5f2e95367c872694d82540fb245ab6e57035a3 -size 26224 diff --git a/kde-gtk-config-5.19.5.tar.xz.sig b/kde-gtk-config-5.19.5.tar.xz.sig deleted file mode 100644 index 2279bb6..0000000 --- a/kde-gtk-config-5.19.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl9OIYgACgkQ7JTRj38F -mX7RnQf+P/IXs62DAytSbAKRm8jmZnbQejprH/lji9IXSeGOAjOzv6OD/L17mXGF -cMm36KXAvGIiCRO2fI278z9AwpEr8aFVWeGWVS2XuVuoAv50zFWZY6PEg8KFrnK/ -6dFQr7u3f8kRQsGAGPDZA6SFHVMlR6sLZ58adQ8kQilJets/FnF3eXnN9RI8J1M9 -GY2zyxMcKdIjDA8Y21LFMmLJ2x9uSlsNhJTJb+f8uKMSzvj6+8DIC+2vZLeQuj74 -X1fjxoWkrRm5yDUz1hcKQLfcg7z6CvOg1qmYk9rr1mVk6GFKgporEI95vOFExwWM -5kNvoaF+owg83y7ucFMi5zXuxjEkJw== -=oJxT ------END PGP SIGNATURE----- diff --git a/kde-gtk-config-5.19.90.tar.xz b/kde-gtk-config-5.19.90.tar.xz new file mode 100644 index 0000000..3854ce1 --- /dev/null +++ b/kde-gtk-config-5.19.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a12141f2323e3d676af41cbe42a45500911eb3b57cfcedae65a00112b8c34346 +size 68088 diff --git a/kde-gtk-config-5.19.90.tar.xz.sig b/kde-gtk-config-5.19.90.tar.xz.sig new file mode 100644 index 0000000..5e1521a --- /dev/null +++ b/kde-gtk-config-5.19.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAl9jP8cACgkQEZaMRJKM +rvy4gwf9Eg2ziIVy0Ou8lQ/zoa6sK0GX9EK6fS2SqQc2kQVseAie+8cT5e+ubQOs +aw41xiTUEq/a/gxOSZAjfTqriIyY8/150jQlDdqnTVOZQC2SFFxDd/1f6sRnage2 +joigvkJlDxZAiaSMH9Etkg78o0QWegFuZ6bMwyFy85SAY42Y0GewB1Gd3bonJuYg +bTuY85BH7jy6810SsdSg4Y+itKYRzlmnWizIIQWwLiZdq3W8HVOVB2khHMXKub0A +GFyfu+w+HVheAYnLPkdsg0rcvStk+5aRdau/L5rH+ityimSZOlEB77a51XLtskak +j4ApXX17iziI6V67uMbPKgL9/Y/P2w== +=/6Vh +-----END PGP SIGNATURE----- diff --git a/kde-gtk-config5.changes b/kde-gtk-config5.changes index f70875a..9c2e08c 100644 --- a/kde-gtk-config5.changes +++ b/kde-gtk-config5.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Sep 17 20:02:58 UTC 2020 - Fabian Vogt + +- Update to 5.19.90 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma-5.19.90 +- Changes since 5.19.5: + * Convert copyright statements to SPDX expressions + * Sync titlebar button appearance with GTK CSD apps + * Port deprecated method + * Make a strong hint, that xsettingsd is a de facto required runtime dependency + * Provide an unified interface for setting GTK theme + * Synchronize the cursor size setting (kde#421133) + * Create README for the project + * Provide a logo for the project + ------------------------------------------------------------------- Tue Sep 1 11:38:48 UTC 2020 - Fabian Vogt diff --git a/kde-gtk-config5.spec b/kde-gtk-config5.spec index d84dce7..0799afc 100644 --- a/kde-gtk-config5.spec +++ b/kde-gtk-config5.spec @@ -18,26 +18,31 @@ %bcond_without lang Name: kde-gtk-config5 -Version: 5.19.5 +Version: 5.19.90 Release: 0 Summary: Daemon for GTK2 and GTK3 Applications Appearance Under KDE License: LGPL-3.0-or-later AND GPL-3.0-or-later Group: System/GUI/KDE URL: http://projects.kde.org/kde-gtk-config -Source: https://download.kde.org/stable/plasma/%{version}/kde-gtk-config-%{version}.tar.xz +Source: kde-gtk-config-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/%{version}/kde-gtk-config-%{version}.tar.xz.sig +Source1: kde-gtk-config-%{version}.tar.xz.sig Source2: plasma.keyring %endif BuildRequires: extra-cmake-modules >= 0.0.9 BuildRequires: kf5-filesystem +BuildRequires: sassc BuildRequires: xz +BuildRequires: cmake(KDecoration2) BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF5GuiAddons) BuildRequires: cmake(KF5IconThemes) +# Dropped upstream in 5.20.0 +BuildRequires: cmake(KF5Service) +BuildRequires: cmake(Qt5Svg) BuildRequires: pkgconfig(giomm-2.4) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) @@ -52,26 +57,20 @@ Provides: kde-gtk-config = %{version} Obsoletes: kde-gtk-config < %{version} # Existed only up to 5.17 Obsoletes: %{name}-lang < %{version} +# Since Plasma 5.19, the gtk3 settings also apply to gtk2 +# and in 5.20 the gtk2 preview got dropped. +Provides: kde-gtk-config5-gtk2 = %{version} +Obsoletes: kde-gtk-config5-gtk2 < %{version} +Recommends: %{name}-gtk3 %description kde-gtk-config is a KDED module which configures GTK2 and GTK3 applications appearance under KDE. -%package gtk2 -Summary: GTK2 Preview Helper for the GTK Configuration -Group: System/GUI/KDE -Requires: %{name} = %{version} -Supplements: packageand(%{name}:libgtk-2_0-0) - -%description gtk2 -This package contains a helper application that allows previewing -the GTK2 application style from within the application style KCM - %package gtk3 Summary: GTK3 Preview Helper for the GTK Configuration Group: System/GUI/KDE Requires: %{name} = %{version} -Supplements: packageand(%{name}:libgtk-3-0) %description gtk3 This package contains a helper application that allows previewing @@ -88,28 +87,24 @@ the GTK3 application style from within the application style KCM %kf5_makeinstall -C build %files -%license COPYING* +%license LICENSES/* %dir %{_kf5_libdir}/gtk-3.0/ %dir %{_kf5_libdir}/gtk-3.0/modules/ %{_kf5_libdir}/gtk-3.0/modules/libcolorreload-gtk-module.so +%{_kf5_libdir}/gtk-3.0/modules/libwindow-decorations-gtk-module.so %dir %{_kf5_plugindir}/kf5 %dir %{_kf5_plugindir}/kf5/kded %{_kf5_plugindir}/kf5/kded/gtkconfig.so -%dir %{_kf5_sharedir}/kcm-gtk-module/ -%{_kf5_sharedir}/kcm-gtk-module/preview.ui %dir %{_kf5_sharedir}/kconf_update/ %{_kf5_sharedir}/kconf_update/gtkconfig.upd %dir %{_kf5_libdir}/kconf_update_bin/ %{_kf5_libdir}/kconf_update_bin/gtk_theme -%files gtk2 -%license COPYING* -%{_kf5_libdir}/libexec/gtk_preview -%{_kf5_libdir}/libexec/reload_gtk_apps - %files gtk3 -%license COPYING* +%license LICENSES/* %{_kf5_libdir}/libexec/gtk3_preview +%dir %{_kf5_sharedir}/themes/Breeze/ +%{_kf5_sharedir}/themes/Breeze/window_decorations.css %changelog From 4e89f996fd8a9dcd71ce857e3cd262c85d98e84a4daac368b52e67d68b2c8fa2 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 11 Oct 2020 11:01:00 +0000 Subject: [PATCH 2/2] Plasma 5.20.0, second try OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-gtk-config5?expand=0&rev=262 --- kde-gtk-config-5.19.90.tar.xz | 3 --- kde-gtk-config-5.19.90.tar.xz.sig | 11 ----------- kde-gtk-config-5.20.0.tar.xz | 3 +++ kde-gtk-config-5.20.0.tar.xz.sig | 11 +++++++++++ kde-gtk-config5.changes | 12 ++++++++++++ kde-gtk-config5.spec | 4 +--- 6 files changed, 27 insertions(+), 17 deletions(-) delete mode 100644 kde-gtk-config-5.19.90.tar.xz delete mode 100644 kde-gtk-config-5.19.90.tar.xz.sig create mode 100644 kde-gtk-config-5.20.0.tar.xz create mode 100644 kde-gtk-config-5.20.0.tar.xz.sig diff --git a/kde-gtk-config-5.19.90.tar.xz b/kde-gtk-config-5.19.90.tar.xz deleted file mode 100644 index 3854ce1..0000000 --- a/kde-gtk-config-5.19.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a12141f2323e3d676af41cbe42a45500911eb3b57cfcedae65a00112b8c34346 -size 68088 diff --git a/kde-gtk-config-5.19.90.tar.xz.sig b/kde-gtk-config-5.19.90.tar.xz.sig deleted file mode 100644 index 5e1521a..0000000 --- a/kde-gtk-config-5.19.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAl9jP8cACgkQEZaMRJKM -rvy4gwf9Eg2ziIVy0Ou8lQ/zoa6sK0GX9EK6fS2SqQc2kQVseAie+8cT5e+ubQOs -aw41xiTUEq/a/gxOSZAjfTqriIyY8/150jQlDdqnTVOZQC2SFFxDd/1f6sRnage2 -joigvkJlDxZAiaSMH9Etkg78o0QWegFuZ6bMwyFy85SAY42Y0GewB1Gd3bonJuYg -bTuY85BH7jy6810SsdSg4Y+itKYRzlmnWizIIQWwLiZdq3W8HVOVB2khHMXKub0A -GFyfu+w+HVheAYnLPkdsg0rcvStk+5aRdau/L5rH+ityimSZOlEB77a51XLtskak -j4ApXX17iziI6V67uMbPKgL9/Y/P2w== -=/6Vh ------END PGP SIGNATURE----- diff --git a/kde-gtk-config-5.20.0.tar.xz b/kde-gtk-config-5.20.0.tar.xz new file mode 100644 index 0000000..159fb78 --- /dev/null +++ b/kde-gtk-config-5.20.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89590b6950c343e67a15d89058461eef6379e824861197f525e2678d0e901df2 +size 68040 diff --git a/kde-gtk-config-5.20.0.tar.xz.sig b/kde-gtk-config-5.20.0.tar.xz.sig new file mode 100644 index 0000000..c5270b7 --- /dev/null +++ b/kde-gtk-config-5.20.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl9/OacACgkQ7JTRj38F +mX6cSgf8CMxMhPv00LxcjQETJWZ6nN2E4FY/neJnvJxo2PzCKC6/Ln7WAVxlxc2i +2PbPV5clEb/9SDEAAiTzH8+VdanIWmfzstiorfXFyxiSHeFbC9LYpyA2QhotDFYt ++z+4CANp6EsVFHYml6OscUF7F8EwUnArJw9Le9mU+sipghemtZpQvmz56Vo8rBAW +Y9hnrxb/b9k8fvaSSuUc5Bx42Y3Cxcw4Q2XZqO4pD+A9v4vreRJK/GvBDHU3X7+v +DEfnj1J9W3p6itoKbwuPqRBmpNbJRWQKIkJRQBXoOk2GuwjZMwHwqviNxnAmEXEn +QjY1C4iPBDjE2sDaLEptv4nMq1R38A== +=ym7Y +-----END PGP SIGNATURE----- diff --git a/kde-gtk-config5.changes b/kde-gtk-config5.changes index 9c2e08c..dcb741f 100644 --- a/kde-gtk-config5.changes +++ b/kde-gtk-config5.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Oct 8 16:55:19 UTC 2020 - Fabian Vogt + +- Update to 5.20.0 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma-5.20.0 +- Changes since 5.19.90: + * Disable global animations for the time decoration is being rendered (kde#426687) + * Fix default decoration fallback + * Remove kservice dependency + ------------------------------------------------------------------- Thu Sep 17 20:02:58 UTC 2020 - Fabian Vogt diff --git a/kde-gtk-config5.spec b/kde-gtk-config5.spec index 0799afc..9b2dd8a 100644 --- a/kde-gtk-config5.spec +++ b/kde-gtk-config5.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kde-gtk-config5 -Version: 5.19.90 +Version: 5.20.0 Release: 0 Summary: Daemon for GTK2 and GTK3 Applications Appearance Under KDE License: LGPL-3.0-or-later AND GPL-3.0-or-later @@ -40,8 +40,6 @@ BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF5GuiAddons) BuildRequires: cmake(KF5IconThemes) -# Dropped upstream in 5.20.0 -BuildRequires: cmake(KF5Service) BuildRequires: cmake(Qt5Svg) BuildRequires: pkgconfig(giomm-2.4) BuildRequires: pkgconfig(gtk+-2.0)