diff --git a/gtk3-settings.ini-kde4.template b/gtk3-settings.ini-kde4.template deleted file mode 100644 index c16705c..0000000 --- a/gtk3-settings.ini-kde4.template +++ /dev/null @@ -1,8 +0,0 @@ -[Settings] -gtk-font-name=Noto Sans Regular 10 -gtk-theme-name=@@THEME_NAME@@ -gtk-icon-theme-name=breeze -gtk-fallback-icon-theme=gnome -gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ -gtk-menu-images=1 -gtk-button-images=1 diff --git a/gtkrc-2.0-kde4.template b/gtkrc-2.0-kde4.template deleted file mode 100644 index 4b9d859..0000000 --- a/gtkrc-2.0-kde4.template +++ /dev/null @@ -1,14 +0,0 @@ -include "/usr/share/themes/@@THEME_NAME@@/gtk-2.0/gtkrc" -include "/etc/gtk-2.0/gtkrc" -style "user-font" -{ - font_name="Noto Sans Regular" -} -widget_class "*" style "user-font" -gtk-font-name="Noto Sans Regular 10" -gtk-theme-name="@@THEME_NAME@@" -gtk-icon-theme-name="breeze" -gtk-fallback-icon-theme="gnome" -gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ -gtk-menu-images=1 -gtk-button-images=1 diff --git a/kde-gtk-config-5.17.5.tar.xz b/kde-gtk-config-5.17.5.tar.xz deleted file mode 100644 index 8878922..0000000 --- a/kde-gtk-config-5.17.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5feff23c756f1fb0ba9ab88c2aed92c0e7c5521c757f5a0cdd057273538f0010 -size 155340 diff --git a/kde-gtk-config-5.17.5.tar.xz.sig b/kde-gtk-config-5.17.5.tar.xz.sig deleted file mode 100644 index a93ad0e..0000000 --- a/kde-gtk-config-5.17.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl4UoosACgkQ7JTRj38F -mX7PlQf/VCb6gxX0bD36Z6g4LsqQDOFrWVcpHoUN7ihowYbEOllx1vOBeRgJguFw -BFFmJ9aV3HuAQ/aijKPyhpLoK+KPDL6XebmoXl7azIx+uCndyZHCP+1PqHOIdbkg -pbouVOAjAAdwuD7AvBbZj7cTea/ZYlkIYn68f2Fm3pBCzzolxIb0qIj1rhBMynhm -OBAg6T+t1N3ivqHd3tUpGM+riTmJbg2Jco7XJe/FC267+BpvA60YLbQ4jQHDfxwP -viY+KyfEsZSUD/u/uUtrDlhaBeiPw+9Bx/dR4iDsZqJcS3h+1m6z8q+gH0GAKXXg -GSGKSB0X9Qj9TyZSsEfA2iI6wy6bcg== -=+PCg ------END PGP SIGNATURE----- diff --git a/kde-gtk-config-5.17.90.tar.xz b/kde-gtk-config-5.17.90.tar.xz new file mode 100644 index 0000000..5b75dc9 --- /dev/null +++ b/kde-gtk-config-5.17.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2061f8b6851fb1d950f737e4ba68d898990a7140f92576a2d13578f39e6294b2 +size 22920 diff --git a/kde-gtk-config-5.17.90.tar.xz.sig b/kde-gtk-config-5.17.90.tar.xz.sig new file mode 100644 index 0000000..229f16a --- /dev/null +++ b/kde-gtk-config-5.17.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl4gU2EACgkQ7JTRj38F +mX7+Qgf+Jps7ogh3gK/j53GpD8IXOOQgLOPTQ4Bo1fAxX38QnhHbW83pvXV2Yf8f +Iom6z771mwC/bJacncSe9Vd8Fa3Jo5iyqoPte9Xl/8wVCFH+GPoRLG1Du2M4MIt5 +sVwtjX/s3p5crEaTx7h6hSw0jZSzMRqgJGkZS2rI7h4xxIC/S+sV/J2uh9loQO8/ +NKo1eFCVeATg4njTKyTR4BD78iTRSzgAU3/wi81FyyprI015rLrq5N78Q40pCFU1 +7bo4q7RJmdNCgf1bsWRdB7oH3hwbiy6rOqf0QkGNKTgU9jf+pjKdJn6UWcSL27Hb +UE8yz5xA+1fSAfTc1pQNkCzB/cB6ng== +=YX2R +-----END PGP SIGNATURE----- diff --git a/kde-gtk-config5.changes b/kde-gtk-config5.changes index 37cc47a..feeacfa 100644 --- a/kde-gtk-config5.changes +++ b/kde-gtk-config5.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Thu Jan 16 14:04:16 UTC 2020 - Fabian Vogt + +- Update to 5.17.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.17.90.php +- Changes since 5.17.5: + * Remove GTK KCM + * Rewrite GTK KCM (kde#405405) + * Respect GTK2_RC_FILES environmental variable (kde#415770) + * Synchronize decorations buttons order in GTK headerbars + * Sync dark theme preference for GTK3 applications + * Refactor GTK KCM code + * Remove traces of old GTK configs + * Remove scrollbar behavior option in GTK KCM + * Sync scrollbar behavior with GTK applications + * Remove redundant finder + * Remove unneeded options in GTK KCM (kde#406740,kde#401008,kde#401123) + * Add default value for cursor theme (kde#414109) + * Update GTK settings according to Plasma settings (kde#401507,kde#375272,kde#411097) + * port old style connects + * Add KDEClangFormat cmake support + * Make it compile without deorecated method +- Drop files which were only used by the long gone + kde_gtk_config.suse.sh script: + * gtk3-settings.ini-kde4.template + * gtkrc-2.0-kde4.template + ------------------------------------------------------------------- Tue Jan 7 16:24:35 UTC 2020 - Fabian Vogt diff --git a/kde-gtk-config5.spec b/kde-gtk-config5.spec index 80b0b50..beda625 100644 --- a/kde-gtk-config5.spec +++ b/kde-gtk-config5.spec @@ -18,36 +18,29 @@ %bcond_without lang Name: kde-gtk-config5 -Version: 5.17.5 +Version: 5.17.90 Release: 0 -Summary: KCM Module to Configure GTK2 and GTK3 Applications Appearance Under KDE +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: https://download.kde.org/unstable/plasma/%{version}/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: https://download.kde.org/unstable/plasma/%{version}/kde-gtk-config-%{version}.tar.xz.sig Source2: plasma.keyring %endif -Source3: gtkrc-2.0-kde4.template -Source4: gtk3-settings.ini-kde4.template BuildRequires: extra-cmake-modules >= 0.0.9 BuildRequires: kf5-filesystem BuildRequires: xz -BuildRequires: cmake(KF5Archive) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5KCMUtils) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(Qt5Svg) >= 5.4.0 -BuildRequires: cmake(Qt5Test) >= 5.4.0 -BuildRequires: cmake(Qt5Widgets) >= 5.4.0 BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(x11) -Recommends: %{name}-lang +# Needed for syncing GTK+ settings +Requires: xsettingsd Suggests: gtk2-metatheme-breeze Suggests: gtk3-metatheme-breeze Supplements: packageand(plasma5-workspace:libgtk-2_0-0) @@ -56,66 +49,46 @@ Provides: kde-gtk-config = %{version} Obsoletes: kde-gtk-config < %{version} %description -kde-gtk-config is a KCM module to configure GTK2 and GTK3 applications +kde-gtk-config is a KDED module which configures GTK2 and GTK3 applications appearance under KDE. -Among its many features, it lets you: - - Choose which theme is used for GTK2 and GTK3 applications. - - Tweak some GTK applications behaviour. - - Select what icon theme to use in GTK applications. - - Select GTK applications default fonts. - - Easily browse and install new GTK2 and GTK3 themes. - %package gtk2 -Summary: GTK2 Preview Helper for the GTK Configuration KCM +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 GTK configuration KCM +the GTK2 application style from within the application style KCM %package gtk3 -Summary: GTK3 Preview Helper for the GTK Configuration KCM +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 -the GTK3 application style from within the GTK configuration KCM - -%lang_package +the GTK3 application style from within the application style KCM %prep -%setup -q -n kde-gtk-config-%{version} -%autopatch -p1 +%autosetup -p1 -n kde-gtk-config-%{version} %build - %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} + %cmake_kf5 -d build %make_jobs %install %kf5_makeinstall -C build -%if %{with lang} - %kf5_find_lang -%endif - -install -Dpm 0644 %{SOURCE3} %{buildroot}%{_kf5_sharedir}/%{name}/gtkrc-2.0-kde4.template -install -Dpm 0644 %{SOURCE4} %{buildroot}%{_kf5_sharedir}/%{name}/gtk3-settings.ini-kde4.template %files %license COPYING* -%{_kf5_sharedir}/%{name}/ -%{_kf5_knsrcfilesdir}/cgctheme.knsrc -%{_kf5_knsrcfilesdir}/cgcgtk3.knsrc -%{_kf5_servicesdir}/ -%{_kf5_plugindir}/ -%{_kf5_sharedir}/kcm-gtk-module/ -%dir %{_kf5_sharedir}/icons/hicolor/8x8 -%dir %{_kf5_sharedir}/icons/hicolor/8x8/apps -%{_kf5_sharedir}/icons/hicolor/*/*/*.* +%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 %files gtk2 %license COPYING* @@ -126,8 +99,4 @@ install -Dpm 0644 %{SOURCE4} %{buildroot}%{_kf5_sharedir}/%{name}/gtk3-settings. %license COPYING* %{_kf5_libdir}/libexec/gtk3_preview -%if %{with lang} -%files lang -f %{name}.lang -%endif - %changelog