rpm/breeze-gtk
SHA256
1
0
Fork 0
forked from pool/breeze-gtk
Code Pull Requests Activity

Accepting request 423304 from KDE:Frameworks5

Browse Source 
(forwarded request 423298 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/423304
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/breeze-gtk?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2016-08-29 13:24:39 +00:00 committed by Git OBS Bridge
commit f9cb19ae46
5 changed files with 75 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
breeze-gtk-5.7.3.tar.xz
View File

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

3
breeze-gtk-5.7.4.tar.xz Normal file
View File

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

14
breeze-gtk.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Aug 26 20:36:41 UTC 2016 - fabian@ritter-vogt.de
- Update to 5.7.4
* New bugfix release
* For more details please see:
https://www.kde.org/announcements/plasma-5.7.4.php
-------------------------------------------------------------------
Mon Aug 22 11:33:33 UTC 2016 - wbauer@tmo.at
- Add update_from_BreezeGTK.patch to fix the GTK theme settings on
upgrades from Leap 42.1, which shipped with BreezyGTK (boo#994832)
-------------------------------------------------------------------
Tue Aug 2 11:35:50 UTC 2016 - hrvoje.senjan@gmail.com

5
breeze-gtk.spec
View File

@ -18,7 +18,7 @@
%define _name breeze
Name: breeze-gtk
Version: 5.7.3
Version: 5.7.4
Release: 0
Summary: GTK+ theme matching KDE's Breeze
License: LGPL-2.1
@ -27,6 +27,8 @@ Url: https://projects.kde.org/breeze-gtk
Source: %{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE Install-GTK3-theme-version-depending-on-present-libg.patch
Patch0: Install-GTK3-theme-version-depending-on-present-libg.patch
# PATCH-FIX-OPENSUSE update_from_BreezeGTK.patch boo#994832 -- update user's config from the old BreezyGTK theme
Patch1: update_from_BreezeGTK.patch
BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
@ -72,6 +74,7 @@ A GTK+ theme created to match with the new Plasma 5 Breeze theme.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
chmod a-x COPYING* README.md
%build

54
update_from_BreezeGTK.patch Normal file
View File

@ -0,0 +1,54 @@
--- breeze-gtk-5.5.5.orig/kconf_update/main.cpp 2016-03-01 14:27:02.000000000 +0100
+++ breeze-gtk-5.5.5/kconf_update/main.cpp 2016-03-08 17:24:37.883095403 +0100
@@ -46,7 +46,7 @@ QString isGtkThemeInstalled(QString them
}
/*
- * 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
@@ -67,9 +67,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;
@@ -98,11 +98,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) {
@@ -145,13 +145,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) {