From 8457635d1352c51b15f8f122a3a8122517fc26b9e3283d71fe0262de4b45d601 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 20 Sep 2019 11:01:11 +0000 Subject: [PATCH] Plasma 5.17 Beta, fourth try OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/breeze-gtk?expand=0&rev=99 --- breeze-gtk-5.16.5.tar.xz | 3 -- breeze-gtk-5.16.5.tar.xz.sig | 11 ------- breeze-gtk-5.16.90.tar.xz | 3 ++ breeze-gtk-5.16.90.tar.xz.sig | 11 +++++++ breeze-gtk.changes | 23 ++++++++++++++ breeze-gtk.spec | 10 +++---- update_from_BreezeGTK.patch | 56 ----------------------------------- 7 files changed, 41 insertions(+), 76 deletions(-) delete mode 100644 breeze-gtk-5.16.5.tar.xz delete mode 100644 breeze-gtk-5.16.5.tar.xz.sig create mode 100644 breeze-gtk-5.16.90.tar.xz create mode 100644 breeze-gtk-5.16.90.tar.xz.sig delete mode 100644 update_from_BreezeGTK.patch diff --git a/breeze-gtk-5.16.5.tar.xz b/breeze-gtk-5.16.5.tar.xz deleted file mode 100644 index 895c5db..0000000 --- a/breeze-gtk-5.16.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9849ecf6c2fc85fde76912410ab36c46ca65b96d80b4e51819ca35015a88098 -size 47412 diff --git a/breeze-gtk-5.16.5.tar.xz.sig b/breeze-gtk-5.16.5.tar.xz.sig deleted file mode 100644 index 310a25c..0000000 --- a/breeze-gtk-5.16.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl1ubYYACgkQ7JTRj38F -mX5/wggAnswK8M9dkOVJZ8CSMnZB8s7ob3Tx1/fEVcvcex2mb6fS8JMO/qsSKCyz -G7RuBg15Bgz63KmRHooSyEsbqIoWipNvawriNtb06yuLnkGS0YnOUl7yq8iMb0/j -jTYVwQt/XVlDSglOrgLo8JE5uf+gFIKK3JJd/astt/5USd0Mua3P5/YiXrz4B/Rn -g84x0X6LaOEZ8apGZoiyumwh+q7CXstwfunZr8M7ywhdZXE++nSKOwfLfIYm8yCs -wftiDQfyyWar/nVA6soKH9oTNAgLGoswgptP6phRWT1eV/QJTtCl9XsXY6yy+m8r -oY62BKqVT/C6O4K4HdRkBt2qLo2qPA== -=EM1q ------END PGP SIGNATURE----- diff --git a/breeze-gtk-5.16.90.tar.xz b/breeze-gtk-5.16.90.tar.xz new file mode 100644 index 0000000..643d177 --- /dev/null +++ b/breeze-gtk-5.16.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79bd34fc7bb957ba10d7542fe0c275a8fc7890830f29d5b6e8b5d0bd6bc3250c +size 44064 diff --git a/breeze-gtk-5.16.90.tar.xz.sig b/breeze-gtk-5.16.90.tar.xz.sig new file mode 100644 index 0000000..88e81b2 --- /dev/null +++ b/breeze-gtk-5.16.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl2DWl4ACgkQ7JTRj38F +mX57lwgAoTAPsMRQX+WHq9OcTir7KkcRnAMHKUbywo3m7hkWXGaPzzBEWO4xjTLC +LnZ5P3isGN9232Q32l5YYYjKTUBGIwnVVzU+bt+wHjilhdgCGn1dQ3A7gZhnA67U +ADmwcU1/JeLNogD8qLb7jVCL/OzkvJnQFuX0MYRjT7iawYC0QyS0jn/hhq80jjas +Wt5pqUlghymWxF0g9W7cz5AohB0bqTK1hG6oKqnlhHbGRLCl+lg/fsywqV+F76WF +er/9v6OnQRoZhtLuGNPzu7TQVTTakxXdZ1Y/tOICcOIHY60Ik39lmgdi6m7RqpsZ +noPqLDfRFANQGKZQaCuQ0wr1X/QYZQ== +=9NMq +-----END PGP SIGNATURE----- diff --git a/breeze-gtk.changes b/breeze-gtk.changes index f8ea4a6..b72b86a 100644 --- a/breeze-gtk.changes +++ b/breeze-gtk.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Sep 19 12:32:33 UTC 2019 - Fabian Vogt + +- Update to 5.16.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.16.90.php +- Changes since 5.16.5: + * Fix build_theme.sh invocation without arguments + * [GTK3] Make CSD window decorations 18px instead of 16px + * [GTK3] Have checkboxes and radiobuttons respect the user's color scheme. + * [GTK3] Recolor CSD titlebuttons according to user's color scheme + * [GTK3 -> Chrome/ium] Tweak tab stylings (kde#403108) + * GTK3 - Fix menu port to colordefs + * Convert colors into GTK colordefs + * [GTK3] Give checkboxes and radiobuttons a pressed appearance + * Merge gtk320 and gtk318 into gtk3 + * kconf_update: Also migrate from BreezyGTK + * Border for "separator_menu_item" should be 0 (kde#404045) + * Remove background from scrollbars when hovering on them +- Remove patches, now upstream: + * update_from_BreezeGTK.patch + ------------------------------------------------------------------- Tue Sep 3 12:44:11 UTC 2019 - Fabian Vogt diff --git a/breeze-gtk.spec b/breeze-gtk.spec index e74355c..37f08dd 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -19,26 +19,24 @@ %define _name breeze Name: breeze-gtk -Version: 5.16.5 +Version: 5.16.90 Release: 0 Summary: GTK+ theme matching KDE's Breeze License: LGPL-2.1 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-OPENSUSE update_from_BreezeGTK.patch boo#994832 -- update user's config from the old BreezyGTK theme -Patch100: update_from_BreezeGTK.patch BuildRequires: breeze5-style BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: kf5-filesystem -BuildRequires: pkgconfig(Qt5Core) +BuildRequires: cmake(Qt5Core) BuildRequires: python3-cairo BuildRequires: sassc diff --git a/update_from_BreezeGTK.patch b/update_from_BreezeGTK.patch deleted file mode 100644 index 48764ad..0000000 --- a/update_from_BreezeGTK.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: breeze-gtk-5.12.2/kconf_update/main.cpp -=================================================================== ---- breeze-gtk-5.12.2.orig/kconf_update/main.cpp -+++ breeze-gtk-5.12.2/kconf_update/main.cpp -@@ -63,7 +63,7 @@ static QString gtk2ThemePath(QString the - } - - /* -- * Check if gtk theme is already set to oxygen or Orion, if it is then we want to upgrade to the breeze theme -+ * Check if gtk theme is already set to oxygen, BreezyGTK or Orion, if it is then we want to upgrade to the breeze theme - * gtkSettingsFile: filename to use - * settingsKey: ini group to read from - * returns: full path to settings file -@@ -84,9 +84,9 @@ bool isGtkThemeSetToOldTheme(QString gtk - if (!settingsKey.isNull()) { - gtkrcSettings.beginGroup(settingsKey); - } -- //if it is set to Oxygen or Orion then we want to upgrade it to Breeze -- if (gtkrcSettings.value("gtk-theme-name") == QLatin1String("oxygen-gtk") || gtkrcSettings.value("gtk-theme-name") == QLatin1String("Orion")) { -- qCDebug(GTKBREEZE) << "using oxygen or orion " << gtkrcSettings.value("gtk-theme-name"); -+ //if it is set to Oxygen, BreezyGTK or Orion then we want to upgrade it to Breeze -+ if (gtkrcSettings.value("gtk-theme-name") == QLatin1String("oxygen-gtk") || gtkrcSettings.value("gtk-theme-name") == QLatin1String("BreezyGTK") || gtkrcSettings.value("gtk-theme-name") == QLatin1String("Orion")) { -+ qCDebug(GTKBREEZE) << "using oxygen, BreezyGTK or orion " << gtkrcSettings.value("gtk-theme-name"); - return true; - } else { - return false; -@@ -115,11 +115,11 @@ int setGtk2() - - bool needsUpdate = isGtkThemeSetToOldTheme(gtkrc2path, QString()); - if (needsUpdate == false) { -- qCDebug(GTKBREEZE) << "gtkrc2 already exists and is not using oxygen or orion, quitting"; -+ qCDebug(GTKBREEZE) << "gtkrc2 already exists and is not using oxygen, BreezyGTK or orion, quitting"; - return 0; - } - -- qCDebug(GTKBREEZE) << "no gtkrc2 file or oxygen/orion being used, setting to new theme"; -+ qCDebug(GTKBREEZE) << "no gtkrc2 file or oxygen/BreezyGTK/orion being used, setting to new theme"; - QFile gtkrc2writer(gtkrc2path); - bool opened = gtkrc2writer.open(QIODevice::WriteOnly | QIODevice::Text); - if (!opened) { -@@ -160,13 +160,13 @@ int setGtk3() - QString gtkrc3path = configPath + "/gtk-3.0/settings.ini"; - bool needsUpdate = isGtkThemeSetToOldTheme(gtkrc3path, "Settings"); - if ( !needsUpdate ) { -- qCDebug(GTKBREEZE) << "gtkrc3 already exists and is not using oxygen/orion, quitting"; -+ qCDebug(GTKBREEZE) << "gtkrc3 already exists and is not using oxygen/BreezyGTK/orion, quitting"; - return 0; - } - QDir dir = QFileInfo(gtkrc3path).dir(); - dir.mkpath(dir.path()); - -- qCDebug(GTKBREEZE) << "no gtkrc3 file or oxygen/orion being used, setting to new theme"; -+ qCDebug(GTKBREEZE) << "no gtkrc3 file or oxygen/BreezyGTK/orion being used, setting to new theme"; - QFile gtkrc3writer(gtkrc3path); - bool opened = gtkrc3writer.open(QIODevice::WriteOnly | QIODevice::Text); - if (!opened) {