Hello community,

here is the log from the commit of package breeze-gtk for openSUSE:Factory 
checked in at 2016-08-29 15:24:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/breeze-gtk (Old)
 and      /work/SRC/openSUSE:Factory/.breeze-gtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "breeze-gtk"

Changes:
--------
--- /work/SRC/openSUSE:Factory/breeze-gtk/breeze-gtk.changes    2016-08-12 
15:38:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.breeze-gtk.new/breeze-gtk.changes       
2016-08-29 15:24:43.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Aug 26 20:36:41 UTC 2016 - [email protected]
+
+- 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 - [email protected]
+
+- Add update_from_BreezeGTK.patch to fix the GTK theme settings on
+  upgrades from Leap 42.1, which shipped with BreezyGTK (boo#994832)
+
+-------------------------------------------------------------------

Old:
----
  breeze-gtk-5.7.3.tar.xz

New:
----
  breeze-gtk-5.7.4.tar.xz
  update_from_BreezeGTK.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ breeze-gtk.spec ++++++
--- /var/tmp/diff_new_pack.iV9gpu/_old  2016-08-29 15:24:44.000000000 +0200
+++ /var/tmp/diff_new_pack.iV9gpu/_new  2016-08-29 15:24:44.000000000 +0200
@@ -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 @@
 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 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 chmod a-x COPYING* README.md
 
 %build

++++++ breeze-gtk-5.7.3.tar.xz -> breeze-gtk-5.7.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/breeze-gtk-5.7.3/CMakeLists.txt 
new/breeze-gtk-5.7.4/CMakeLists.txt
--- old/breeze-gtk-5.7.3/CMakeLists.txt 2016-08-02 11:32:22.000000000 +0200
+++ new/breeze-gtk-5.7.4/CMakeLists.txt 2016-08-23 14:30:59.000000000 +0200
@@ -1,5 +1,5 @@
 project(breeze-gtk)
-set(PROJECT_VERSION "5.7.3")
+set(PROJECT_VERSION "5.7.4")
 set(PROJECT_VERSION_MAJOR 5)
 
 cmake_minimum_required(VERSION 2.8.12)

++++++ update_from_BreezeGTK.patch ++++++
--- 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) {

Reply via email to