diff --git a/0001-Revert-GTK3-Revert-checkbox-recolouring.patch b/0001-Revert-GTK3-Revert-checkbox-recolouring.patch deleted file mode 100644 index 0e36a4b..0000000 --- a/0001-Revert-GTK3-Revert-checkbox-recolouring.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 6c70cac5e4d6566eded5893e34ac356e29deaff6 Mon Sep 17 00:00:00 2001 -From: Carson Black -Date: Sat, 16 Nov 2019 10:36:29 -0500 -Subject: [PATCH] Revert "[GTK3] Revert checkbox recolouring" - -Summary: -This reverts commit b1649126c8c6d1af746a8472939fcda40a260095, as an upstream librsvg bug was fixed, allowing checkboxes and radiobuttons to recolour properly. - -https://gitlab.gnome.org/GNOME/librsvg/issues/525 - -Test Plan: See that checkbox recolouring works as expected. - -Reviewers: #breeze, #vdg, ngraham - -Reviewed By: #breeze, #vdg, ngraham - -Subscribers: ngraham, plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D25336 ---- - src/gtk3/widgets/_checkboxes.scss | 92 ++++++++++++------------------- - src/gtk3/widgets/_menus.scss | 29 +++++++--- - 2 files changed, 55 insertions(+), 66 deletions(-) - -diff --git a/src/gtk3/widgets/_checkboxes.scss b/src/gtk3/widgets/_checkboxes.scss -index 3f398ae..b9fa4bd 100644 ---- a/src/gtk3/widgets/_checkboxes.scss -+++ b/src/gtk3/widgets/_checkboxes.scss -@@ -3,20 +3,6 @@ - /************************* - * Check and Radio items * - *************************/ --@each $s,$as in ('','-unchecked'), -- (':hover', '-unchecked-hover'), -- (':active', '-unchecked-active'), -- (':backdrop', '-unchecked-backdrop'), -- (':checked', '-checked-active'), -- (':checked:hover', '-checked-hover'), -- (':checked:active', '-checked-active'), -- (':backdrop:checked', '-checked-backdrop') { -- .view.content-view.check#{$s}:not(list) { -- -gtk-icon-shadow: none; -- -gtk-icon-source: -gtk-scaled(url("../assets/check-selectionmode#{$as}.png"), url("../assets/check-selectionmode#{$as}@2.png")); -- background-color: transparent; -- } --} - - checkbutton.text-button, radiobutton.text-button { - // this is for a nice focus on check and radios text -@@ -32,53 +18,43 @@ checkbutton.text-button, radiobutton.text-button { - } - } - --@each $a in ('check','radio') { -+check, radio { -+ margin: 0 4px; - -- #{$a} { -- margin: 0 4px; -+ &:only-child { margin: 0; } - -- &:only-child { margin: 0; } -+ min-height: 18px; -+ min-width: 18px; -+ //border: none; -+ animation: none; -+ background-color: transparent; -+ -gtk-icon-palette: error gtk("@theme_button_decoration_focus"), success gtk("@borders"), warning gtk("@theme_button_background_normal"); -+ -gtk-icon-shadow: 1px 1px rgba(35,38,41,0.2); - -- min-height: 18px; -- min-width: 18px; -- //border: none; -- animation: none; -- background-color: transparent; -- -gtk-icon-source: -gtk-scaled(url("../assets/#{$a}-unchecked.png"), url("../assets/#{$a}-unchecked@2.png")); -+ &:hover { -+ -gtk-icon-palette: error gtk("@theme_button_decoration_focus"), success gtk("@theme_button_decoration_focus"), warning gtk("@theme_button_background_normal"); -+ } -+ &:disabled { -+ -gtk-icon-palette: error gtk("@theme_button_decoration_focus_insensitive"), success gtk("@insensitive_borders"), warning gtk("@theme_button_background_insensitive"); -+ } - -- @each $s,$as in ('hover','-hover'), -- ('active','-active'), -- ('disabled','-insensitive'), -- ('backdrop','-backdrop'), -- ('backdrop:disabled','-backdrop-insensitive') { -- &:#{$s} { -gtk-icon-source: -gtk-scaled(url("../assets/#{$a}-unchecked#{$as}.png"), url("../assets/#{$a}-unchecked#{$as}@2.png")); } -- &:checked { -- -gtk-icon-source: -gtk-scaled(url("../assets/#{$a}-checked-active.png"), url("../assets/#{$a}-checked-active@2.png")); -- &:#{$s} { -gtk-icon-source: -gtk-scaled(url("../assets/#{$a}-checked#{$as}.png"), url("../assets/#{$a}-checked#{$as}@2.png")); } -- } -- &:indeterminate { -- -gtk-icon-source: -gtk-scaled(url("../assets/#{$a}-mixed-active.png"), url("../assets/#{$a}-mixed-active@2.png")); -- &:#{$s} { -gtk-icon-source: -gtk-scaled(url("../assets/#{$a}-mixed#{$as}.png"), url("../assets/#{$a}-mixed#{$as}@2.png")); } -- } -+ menu menuitem & { -+ margin: 0; // this is a workaround for a menu check/radio size allocation issue -+ min-height: 18px; -+ min-width: 18px; -+ background-color: transparent; -+ box-shadow: none; -+ -gtk-icon-shadow: none; -+ animation: none; - } -- -- menu menuitem & { -- margin: 0; // this is a workaround for a menu check/radio size allocation issue -- min-height: 18px; -- min-width: 18px; -- background-color: transparent; -- box-shadow: none; -- -gtk-icon-shadow: none; -- animation: none; -- &:hover { -- -gtk-icon-source: -gtk-scaled(url("../assets/#{$a}-unchecked.png"), url("../assets/#{$a}-unchecked@2.png")); -- } -- &:checked:hover { -- -gtk-icon-source: -gtk-scaled(url("../assets/#{$a}-checked-active.png"), url("../assets/#{$a}-checked-active@2.png")); -- } -- &:indeterminate:hover { -- -gtk-icon-source: -gtk-scaled(url("../assets/#{$a}-mixed-active.png"), url("../assets/#{$a}-mixed-active@2.png")); -- } -- } -+} -+@each $type in ('check', 'radio') { -+ #{$type} { -+ -gtk-icon-source: -gtk-recolor(url("../assets/breeze-#{$type}-unchecked-symbolic.svg")); -+ @each $state in ('checked', 'indeterminate') { -+ &:#{$state} { -+ -gtk-icon-source: -gtk-recolor(url("../assets/breeze-#{$type}-#{$state}-symbolic.svg")); -+ } -+ } - } --} -\ No newline at end of file -+} -diff --git a/src/gtk3/widgets/_menus.scss b/src/gtk3/widgets/_menus.scss -index c241eab..7f6c40e 100644 ---- a/src/gtk3/widgets/_menus.scss -+++ b/src/gtk3/widgets/_menus.scss -@@ -205,14 +205,27 @@ modelbutton.flat, - @extend %undecorated_button; - color: gtk("@theme_unfocused_fg_color"); - } -- check:hover {-gtk-icon-source: -gtk-scaled(url("../assets/check-unchecked.png"), url("../assets/check-unchecked@2.png"));} -- radio:hover {-gtk-icon-source: -gtk-scaled(url("../assets/radio-unchecked.png"), url("../assets/radio-unchecked@2.png"));} -- -- check:checked:hover {-gtk-icon-source: -gtk-scaled(url("../assets/check-checked-active.png"), url("../assets/check-checked-active@2.png"));} -- radio:checked:hover {-gtk-icon-source: -gtk-scaled(url("../assets/radio-checked-active.png"), url("../assets/radio-checked-active@2.png"));} -- -- check:indeterminate:hover {-gtk-icon-source: -gtk-scaled(url("../assets/check-mixed.png"), url("../assets/check-mixed@2.png"));} -- radio:indeterminate:hover {-gtk-icon-source: -gtk-scaled(url("../assets/radio-mixed.png"), url("../assets/radio-mixed@2.png"));} -+ check, radio { -+ -gtk-icon-palette: error gtk("@theme_button_decoration_focus"), success gtk("@borders"), warning gtk("@theme_button_background_normal"); -+ -gtk-icon-shadow: 1px 1px rgba(35,38,41,0.2); -+ -+ &:hover { -+ -gtk-icon-palette: error gtk("@theme_button_decoration_focus"), success gtk("@theme_button_decoration_focus"), warning gtk("@theme_button_background_normal"); -+ } -+ &:disabled { -+ -gtk-icon-palette: error gtk("@theme_button_decoration_focus_insensitive"), success gtk("@insensitive_borders"), warning gtk("@theme_button_background_insensitive"); -+ } -+ } -+ @each $type in ('check', 'radio') { -+ #{$type} { -+ -gtk-icon-source: -gtk-recolor(url("../assets/breeze-#{$type}-unchecked-symbolic.svg")); -+ @each $state in ('checked', 'indeterminate') { -+ &:#{$state} { -+ -gtk-icon-source: -gtk-recolor(url("../assets/breeze-#{$type}-#{$state}-symbolic.svg")); -+ } -+ } -+ } -+ } - - // FIXME: remove the following when the checks/radios rewrite lands - check:last-child, --- -2.23.0 - diff --git a/breeze-gtk-5.17.5.tar.xz b/breeze-gtk-5.17.5.tar.xz deleted file mode 100644 index 7fcb2c4..0000000 --- a/breeze-gtk-5.17.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6dbd8e7d936840fbaf7016574d07729c9d0791711ad6d371136585ddb8f76e66 -size 44424 diff --git a/breeze-gtk-5.17.5.tar.xz.sig b/breeze-gtk-5.17.5.tar.xz.sig deleted file mode 100644 index fe0a64f..0000000 --- a/breeze-gtk-5.17.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl4UoVMACgkQ7JTRj38F -mX75mQf6AvjdXbUWrvqWI3ok6FN1Lu3wzHz08xUowdvXCM4jAZaGUPWfXAMbqVgC -TUtLj6sLmC5qinPKLs5wlWTf2sdxORB6eZQNnAKF4FyC1feV214GbtPk/IoNyQk/ -88c5s2apAQoxbNreX1gSkkTRxmhKwiWU45YgOI6g/39pbQdd8E9mZeRWojl5uwJA -FSrq0ZlebVf8NixY2Zg96oK1POT6CEcNO5FsZnlYZ0Qoe1Sl1F/s2x32DtORERqy -8a2X7hZvuGfE8+s0w4mZaAWaKHvU1zmdWN3dlbfJxcQ8A6GcpfdwKZpz7Z7A8xvM -T4heJ3gQKOSWSt1p6IfOjE2H1aLEEw== -=XYEU ------END PGP SIGNATURE----- diff --git a/breeze-gtk-5.18.0.tar.xz b/breeze-gtk-5.18.0.tar.xz new file mode 100644 index 0000000..4233e46 --- /dev/null +++ b/breeze-gtk-5.18.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c4c7758b1cbedc27e63320b7010a681e095b9367a659a8ecd62ee918769218d +size 42368 diff --git a/breeze-gtk-5.18.0.tar.xz.sig b/breeze-gtk-5.18.0.tar.xz.sig new file mode 100644 index 0000000..dbcfc85 --- /dev/null +++ b/breeze-gtk-5.18.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl48DkkACgkQ7JTRj38F +mX6axAgAmH4/3kJ5rGqzZBWsbU60a/ppNCmq8iKqO2FKGdJKfPhWX0l+SNBgq7MG +17a2Up9e1bs8tIi1BUgtMDUwUzRNemrDJrUrUCeLqr1XWbS72ulGoCH78kCU1TN9 +JZuYE6hWMSbdu9UxXoDn1XnLO/ApqW76kQtQmTPMU1bpSiUKtCiGQ5nJ1o5XBub1 +OJ5q+V+0vxZi9oI12j2gIJNU5srdgnq3mLyBX1En3uWvN6BhQm8k6ne9c9/etVNm +E7nHqi0h7sr8SBKlxIv3ENreemT9t0Dw2Xy30rAZzvefZkVU8fw0aY+3U3eBqzhV +Gx1kddVHUUI/vDiVdwOHv9MgUCItgA== +=DeT7 +-----END PGP SIGNATURE----- diff --git a/breeze-gtk.changes b/breeze-gtk.changes index 6b34d17..a5236e4 100644 --- a/breeze-gtk.changes +++ b/breeze-gtk.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Thu Feb 6 15:10:03 UTC 2020 - Fabian Vogt + +- Update to 5.18.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.18.0.php +- Changes since 5.17.90: + * Drop kconf_update module, handled by kde-gtk-config now + +------------------------------------------------------------------- +Thu Feb 6 14:52:04 UTC 2020 - Fabian Vogt + +- Use %cmake_build + +------------------------------------------------------------------- +Thu Jan 16 14:04:15 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: + * [GTK3] Fix Chromium maximized maximize button + * [GTK3] Fix treeview hover colour (kde#414263) + * [GTK3] Improve Electron menubar legibility (kde#413915) + * Revert "[GTK3] Revert checkbox recolouring" + * [GTK3] Add styles for libhandy widgets + * Fix compatibility of build_theme.sh with Dash + * [GTK3] Fix menu bugs +- Drop patches, now upstream: + * 0001-Revert-GTK3-Revert-checkbox-recolouring.patch + ------------------------------------------------------------------- Tue Jan 7 16:24:34 UTC 2020 - Fabian Vogt diff --git a/breeze-gtk.spec b/breeze-gtk.spec index 207173e..66c6f56 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -19,28 +19,24 @@ %define _name breeze Name: breeze-gtk -Version: 5.17.5 +Version: 5.18.0 Release: 0 Summary: GTK+ theme matching KDE's Breeze License: LGPL-2.1-only Group: System/GUI/KDE URL: https://projects.kde.org/breeze-gtk -Source: https://download.kde.org/stable/plasma/%{version}/breeze-gtk-%{version}.tar.xz +Source: breeze-gtk-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/%{version}/breeze-gtk-%{version}.tar.xz.sig +Source1: breeze-gtk-%{version}.tar.xz.sig Source2: plasma.keyring %endif -# PATCH-FIX-UPSTREAM (in master) -Patch1: 0001-Revert-GTK3-Revert-checkbox-recolouring.patch BuildRequires: breeze5-style BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules BuildRequires: fdupes -BuildRequires: gcc-c++ BuildRequires: kf5-filesystem BuildRequires: python3-cairo BuildRequires: sassc -BuildRequires: cmake(Qt5Core) %description A GTK+ theme created to match with the new Plasma 5 Breeze theme. @@ -85,7 +81,7 @@ A GTK+ theme created to match with the new Plasma 5 Breeze theme. %build %cmake_kf5 -make %{?_smp_mflags} +%cmake_build %install %kf5_makeinstall @@ -96,11 +92,7 @@ make %{?_smp_mflags} %doc README.md %{_datadir}/themes/Breeze*/ %exclude %{_datadir}/themes/Breeze*/gtk-*/ -%dir %{_kf5_sharedir}/kconf_update/ %dir %{_kf5_sharedir}/themes/Breeze*/assets/ -%{_kf5_sharedir}/kconf_update/*%{_name}* -%dir %{_kf5_libdir}/kconf_update_bin/ -%{_kf5_libdir}/kconf_update_bin/*%{_name}* %files -n gtk2-metatheme-%{_name} %{_datadir}/themes/Breeze*/gtk-2.0/