SHA256
1
0
forked from pool/breeze-gtk

Plasma 5.17 Beta, fourth try

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/breeze-gtk?expand=0&rev=99
This commit is contained in:
Fabian Vogt 2019-09-20 11:01:11 +00:00 committed by Git OBS Bridge
parent 8fff80896c
commit 8457635d13
7 changed files with 41 additions and 76 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9849ecf6c2fc85fde76912410ab36c46ca65b96d80b4e51819ca35015a88098
size 47412

View File

@ -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-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79bd34fc7bb957ba10d7542fe0c275a8fc7890830f29d5b6e8b5d0bd6bc3250c
size 44064

View File

@ -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-----

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Thu Sep 19 12:32:33 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- 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 <fabian@ritter-vogt.de> Tue Sep 3 12:44:11 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -19,26 +19,24 @@
%define _name breeze %define _name breeze
Name: breeze-gtk Name: breeze-gtk
Version: 5.16.5 Version: 5.16.90
Release: 0 Release: 0
Summary: GTK+ theme matching KDE's Breeze Summary: GTK+ theme matching KDE's Breeze
License: LGPL-2.1 License: LGPL-2.1
Group: System/GUI/KDE Group: System/GUI/KDE
Url: https://projects.kde.org/breeze-gtk 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} %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 Source2: plasma.keyring
%endif %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: breeze5-style
BuildRequires: cmake >= 2.8.12 BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem
BuildRequires: pkgconfig(Qt5Core) BuildRequires: cmake(Qt5Core)
BuildRequires: python3-cairo BuildRequires: python3-cairo
BuildRequires: sassc BuildRequires: sassc

View File

@ -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) {