From 0d2269da759db306c0dd5ee40593c2c27b33c97dcd3280f20c14fcc97b7c9d38 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 28 Nov 2018 10:42:24 +0000 Subject: [PATCH 1/3] Plasma 5.14.4, this time with .changes OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/breeze-gtk?expand=0&rev=79 --- ...fault-cursor-theme-to-breeze_cursors.patch | 45 +++++++++++++++++++ breeze-gtk-5.14.3.tar.xz | 3 -- breeze-gtk-5.14.3.tar.xz.sig | 11 ----- breeze-gtk-5.14.4.tar.xz | 3 ++ breeze-gtk-5.14.4.tar.xz.sig | 11 +++++ breeze-gtk.changes | 15 +++++++ breeze-gtk.spec | 17 +++---- 7 files changed, 83 insertions(+), 22 deletions(-) create mode 100644 0001-Set-the-default-cursor-theme-to-breeze_cursors.patch delete mode 100644 breeze-gtk-5.14.3.tar.xz delete mode 100644 breeze-gtk-5.14.3.tar.xz.sig create mode 100644 breeze-gtk-5.14.4.tar.xz create mode 100644 breeze-gtk-5.14.4.tar.xz.sig diff --git a/0001-Set-the-default-cursor-theme-to-breeze_cursors.patch b/0001-Set-the-default-cursor-theme-to-breeze_cursors.patch new file mode 100644 index 0000000..887f3e3 --- /dev/null +++ b/0001-Set-the-default-cursor-theme-to-breeze_cursors.patch @@ -0,0 +1,45 @@ +From dcacaa1d4f7e2a591de64889ae108e9c07054b1c Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Tue, 27 Nov 2018 15:36:07 +0100 +Subject: [PATCH] Set the default cursor theme to breeze_cursors + +Summary: Currently the cursor theme is not set by anything, so it's Adwaita by default. + +Test Plan: New user account has "Breeze" as cursor theme in kde-gtk-config. + +Reviewers: #plasma, ngraham + +Reviewed By: ngraham + +Subscribers: ngraham, broulik, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D17187 +--- + kconf_update/main.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/kconf_update/main.cpp b/kconf_update/main.cpp +index d5f7ce0..cde1838 100644 +--- a/kconf_update/main.cpp ++++ b/kconf_update/main.cpp +@@ -133,6 +133,7 @@ int setGtk2() + out << QStringLiteral(" font_name=\"Noto Sans Regular\"\n"); + out << QStringLiteral("}\n"); + out << QStringLiteral("widget_class \"*\" style \"user-font\"\n"); ++ out << QStringLiteral("gtk-cursor-theme-name=\"breeze_cursors\"\n"); + out << QStringLiteral("gtk-font-name=\"Noto Sans Regular 10\"\n"); // matches plasma-workspace:startkde/startkde.cmake + out << QStringLiteral("gtk-theme-name=\"Breeze\"\n"); + out << QStringLiteral("gtk-icon-theme-name=\"breeze\"\n"); +@@ -175,6 +176,7 @@ int setGtk3() + } + QTextStream out(>krc3writer); + out << QStringLiteral("[Settings]\n"); ++ out << QStringLiteral("gtk-cursor-theme-name=breeze_cursors\n"); + out << QStringLiteral("gtk-font-name=Noto Sans 10\n"); // matches plasma-workspace:startkde/startkde.cmake + out << QStringLiteral("gtk-theme-name=")+gtk3Theme+QStringLiteral("\n"); + out << QStringLiteral("gtk-icon-theme-name=breeze\n"); +-- +2.19.1 + diff --git a/breeze-gtk-5.14.3.tar.xz b/breeze-gtk-5.14.3.tar.xz deleted file mode 100644 index 0fdacc7..0000000 --- a/breeze-gtk-5.14.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6d75b2c3fb379245d4096f179a81375c796999400949b17e428facd90191c00 -size 202364 diff --git a/breeze-gtk-5.14.3.tar.xz.sig b/breeze-gtk-5.14.3.tar.xz.sig deleted file mode 100644 index 5366aab..0000000 --- a/breeze-gtk-5.14.3.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEE0HvYZixWyykbMW6y9WdWBcdOAs8FAlvhijsACgkQ9WdWBcdO -As+pUwf/TBFxbvUcDQAU30ClzAEtpViSfWRQExqvg9+KAe0tbmXYqU6MNAF2nWWL -wLRx39Bz1LgWYhF4qvk0X8gw3RSSreKvYKZ0HfK+PinmgYTVYHgnsM8bNoqmmKnp -XI0If8mC+w7nIK6YqliycNGp7g10TjkX5icMoPW7raiz1OAiod4tlBqx0oaeD6w6 -16+EiWtQkmej6ab2lLUDLBQQbt96veITg8/pMCp+SAv6lFmtOIx/UaNumgAXnqpf -WeoOaohw64IAPEXGosWkph8xZEOIRf5F63jeZBoeU/79OfKkk+MZUioAgdqSC9I2 -KHmQHiJcsbvgNPBsqqtdEZKGmBVniQ== -=JTx9 ------END PGP SIGNATURE----- diff --git a/breeze-gtk-5.14.4.tar.xz b/breeze-gtk-5.14.4.tar.xz new file mode 100644 index 0000000..5598ba3 --- /dev/null +++ b/breeze-gtk-5.14.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24619603b62b449df3ba7440d7e44ca83e918c3a7ddd10c494ea2619ae22122b +size 202436 diff --git a/breeze-gtk-5.14.4.tar.xz.sig b/breeze-gtk-5.14.4.tar.xz.sig new file mode 100644 index 0000000..97fa443 --- /dev/null +++ b/breeze-gtk-5.14.4.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlv9faEACgkQ7JTRj38F +mX4iYAf5AcqC/Uvwml7+5GEg03dr6GJwO/qd2QmQDDj/szx9MO/E2g4o+JLHkXL7 +0H+cYTKD9qrytoSUMwJRpksrCeLw3XCtqPI/AqxJuq8gS3w7gULgINHpurb37aD9 +8BE6hFMIDeFXa/Tg1Vgkr9AIEZqLaUkkuFOM2QjA8fgVn2pNg5e78rC7r0tZU9E2 +osrk3/wX4pgWCDJ9/tQC693FRYCeJ4GP9zCGV4Wr/DBi5cGVLQrRs6fIMkueC2TX +tGwxgO0r/6uMioQ+B0KRhZxLo5QE6hXCaprgtrj18oxZJKKhqLSI+4GUI6s4uGvU +YVfpE6dZR0+4/KA++HUVSyrX6RRwpQ== +=xKmk +-----END PGP SIGNATURE----- diff --git a/breeze-gtk.changes b/breeze-gtk.changes index 194059a..d4406c5 100644 --- a/breeze-gtk.changes +++ b/breeze-gtk.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Nov 28 07:52:44 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.14.4 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.14.4.php +- No code changes since 5.14.3 + +------------------------------------------------------------------- +Tue Nov 27 18:11:47 UTC 2018 - Fabian Vogt + +- Add patch to set the default cursor theme to Breeze: + * 0001-Set-the-default-cursor-theme-to-breeze_cursors.patch + ------------------------------------------------------------------- Tue Nov 6 15:53:05 UTC 2018 - fabian@ritter-vogt.de diff --git a/breeze-gtk.spec b/breeze-gtk.spec index dbeb5a2..dfaa086 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -19,7 +19,7 @@ %define _name breeze Name: breeze-gtk -Version: 5.14.3 +Version: 5.14.4 Release: 0 Summary: GTK+ theme matching KDE's Breeze License: LGPL-2.1 @@ -30,8 +30,10 @@ Source: https://download.kde.org/stable/plasma/%{version}/breeze-gtk-%{v Source1: https://download.kde.org/stable/plasma/%{version}/breeze-gtk-%{version}.tar.xz.sig Source2: plasma.keyring %endif +# PATCH-FIX-UPSTREAM +Patch1: 0001-Set-the-default-cursor-theme-to-breeze_cursors.patch # PATCH-FIX-OPENSUSE update_from_BreezeGTK.patch boo#994832 -- update user's config from the old BreezyGTK theme -Patch: update_from_BreezeGTK.patch +Patch100: update_from_BreezeGTK.patch BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -45,6 +47,8 @@ A GTK+ theme created to match with the new Plasma 5 Breeze theme. %package -n metatheme-%{_name}-common Summary: GTK+ theme matching KDE's Breeze -- Common Files Group: System/GUI/KDE +# Default cursor theme +Recommends: breeze5-cursors Suggests: gtk2-metatheme-%{_name} Suggests: gtk3-metatheme-%{_name} Provides: %{_name}-gtk = %{version} @@ -74,8 +78,7 @@ BuildArch: noarch A GTK+ theme created to match with the new Plasma 5 Breeze theme. %prep -%setup -q -%patch -p1 +%autosetup -p1 chmod a-x COPYING* README.md %build @@ -87,8 +90,8 @@ make %{?_smp_mflags} %fdupes %{buildroot}%{_datadir}/ %files -n metatheme-%{_name}-common -%defattr(-,root,root) -%doc COPYING* README.md +%license COPYING* +%doc README.md %{_datadir}/themes/Breeze*/ %exclude %{_datadir}/themes/Breeze*/gtk-*/ %dir %{_kf5_sharedir}/kconf_update/ @@ -98,11 +101,9 @@ make %{?_smp_mflags} %{_kf5_libdir}/kconf_update_bin/*%{_name}* %files -n gtk2-metatheme-%{_name} -%defattr(-,root,root) %{_datadir}/themes/Breeze*/gtk-2.0/ %files -n gtk3-metatheme-%{_name} -%defattr(-,root,root) %{_datadir}/themes/Breeze*/gtk-3.*/ %changelog From 04dc7ec4018b61c9673ceeb98ea374258decd9e83bbab90b9ac32a410f642b2c Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 28 Nov 2018 12:05:06 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/breeze-gtk?expand=0&rev=80 --- breeze-gtk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/breeze-gtk.spec b/breeze-gtk.spec index dfaa086..b213476 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -79,6 +79,7 @@ A GTK+ theme created to match with the new Plasma 5 Breeze theme. %prep %autosetup -p1 + chmod a-x COPYING* README.md %build From cc3890e95f19f203695813760d51f5b4f330adf62c0acad552bc4c34d3404a97 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 28 Nov 2018 12:28:26 +0000 Subject: [PATCH 3/3] Accepting request 652400 from home:wolfi323:test - Don't modify permissions of the README.md and COPYING.LIB files anymore, they have been fixed upstream a long time ago https://cgit.kde.org/breeze-gtk.git/commit/README.md?id=499226afa44cafb342546dd5362c4b0b1c916955 https://cgit.kde.org/breeze-gtk.git/commit/COPYING.LIB?id=499226afa44cafb342546dd5362c4b0b1c916955 OBS-URL: https://build.opensuse.org/request/show/652400 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/breeze-gtk?expand=0&rev=81 --- breeze-gtk.changes | 6 ++++++ breeze-gtk.spec | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/breeze-gtk.changes b/breeze-gtk.changes index d4406c5..e6f01eb 100644 --- a/breeze-gtk.changes +++ b/breeze-gtk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 28 12:15:52 UTC 2018 - wbauer@tmo.at + +- Don't modify permissions of the README.md and COPYING.LIB files + anymore, they have been fixed upstream a long time ago + ------------------------------------------------------------------- Wed Nov 28 07:52:44 UTC 2018 - fabian@ritter-vogt.de diff --git a/breeze-gtk.spec b/breeze-gtk.spec index b213476..eaddac9 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -80,8 +80,6 @@ A GTK+ theme created to match with the new Plasma 5 Breeze theme. %prep %autosetup -p1 -chmod a-x COPYING* README.md - %build %cmake_kf5 make %{?_smp_mflags}