diff --git a/breeze-gtk-5.5.2-gtkrc-openmamba.patch b/breeze-gtk-5.5.2-gtkrc-openmamba.patch deleted file mode 100644 index bf56a2a..0000000 --- a/breeze-gtk-5.5.2-gtkrc-openmamba.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- breeze-gtk-5.5.2/Breeze-gtk/gtk-2.0/gtkrc.orig 2015-12-27 18:10:45.464626301 +0100 -+++ breeze-gtk-5.5.2/Breeze-gtk/gtk-2.0/gtkrc 2015-12-27 18:10:50.729582369 +0100 -@@ -2,12 +2,19 @@ - # Theme: Breezy - # Description: Breeze theme for GTK+2.0 - --gtk-color-scheme = "bg_color:#EFF0F1\nselected_bg_color:#3DAEE9\nbase_color:#FCFCFC" # Background, base. -+gtk-color-scheme = "bg_color:#EFF0F1\nselected_bg_color:#52AE32\nbase_color:#FCFCFC" # Background, base. - gtk-color-scheme = "fg_color:#31363B\nselected_fg_color:#FFFFFF\ninsensitive_fg_color:#BDC3C7\ntext_color:#31363B" # Foreground, text. - gtk-color-scheme = "tooltip_bg_color:#31363B\ntooltip_fg_color:#FCFCFC" # Tooltips. - -+gtk-font-name="Bitstream Vera Sans Roman 9" -+gtk-theme-name="Breeze" -+gtk-menu-images=0 -+gtk-button-images=0 -+ - gtk-auto-mnemonics = 1 - -+pixmap_path "/usr/share/themes/Breeze/gtk-2.0/" -+ - style "default" - { - xthickness = 1 -@@ -77,8 +84,8 @@ - - GtkEntry::state-hint = 1 - -- GtkWidget::link-color = "#1998DA" -- GtkWidget::visited-link-color = "#1478AC" -+ GtkWidget::link-color = "#4A7F37" -+ GtkWidget::visited-link-color = "#65885E" - - # Colors - diff --git a/breeze-gtk-5.6.95-gtkrc-openmamba.patch b/breeze-gtk-5.6.95-gtkrc-openmamba.patch new file mode 100644 index 0000000..6b9bcc6 --- /dev/null +++ b/breeze-gtk-5.6.95-gtkrc-openmamba.patch @@ -0,0 +1,90 @@ +diff -Nru breeze-gtk-5.6.95/Breeze-dark-gtk/gtk-2.0/gtkrc breeze-gtk-5.6.95.new/Breeze-dark-gtk/gtk-2.0/gtkrc +--- breeze-gtk-5.6.95/Breeze-dark-gtk/gtk-2.0/gtkrc 2016-06-16 12:16:20.000000000 +0200 ++++ breeze-gtk-5.6.95.new/Breeze-dark-gtk/gtk-2.0/gtkrc 2016-06-21 11:58:50.087968606 +0200 +@@ -7,7 +7,7 @@ + gtk-color-scheme = "fg_color:#eff0f1" + gtk-color-scheme = "bg_color:#31363b" + gtk-color-scheme = "selected_fg_color:#eff0f1" +-gtk-color-scheme = "selected_bg_color:#3daee9" ++gtk-color-scheme = "selected_bg_color:#52ae32" + gtk-color-scheme = "button_fg_color:#eff0f1" + gtk-color-scheme = "tooltip_fg_color:#eff0f1" + gtk-color-scheme = "tooltip_bg_color:#31363b" +@@ -17,14 +17,21 @@ + gtk-color-scheme = "button_active:#3daee9" + gtk-color-scheme = "border_color:#606468" + +-include "widgets/default" +-include "widgets/buttons" +-include "widgets/menu" +-include "widgets/entry" +-include "widgets/notebook" +-include "widgets/range" +-include "widgets/scrollbar" +-include "widgets/toolbar" +-include "widgets/progressbar" +-include "widgets/misc" +-include "widgets/styles" ++gtk-font-name = "Bitstream Vera Sans Roman 9" ++gtk-theme-name = "Breeze-Dark" ++gtk-menu-images = 0 ++gtk-button-images = 0 ++ ++pixmap_path "/usr/share/themes/Breeze-Dark/gtk-2.0/" ++ ++include "/usr/share/themes/Breeze-Dark/gtk-2.0/widgets/default" ++include "/usr/share/themes/Breeze-Dark/gtk-2.0/widgets/buttons" ++include "/usr/share/themes/Breeze-Dark/gtk-2.0/widgets/menu" ++include "/usr/share/themes/Breeze-Dark/gtk-2.0/widgets/entry" ++include "/usr/share/themes/Breeze-Dark/gtk-2.0/widgets/notebook" ++include "/usr/share/themes/Breeze-Dark/gtk-2.0/widgets/range" ++include "/usr/share/themes/Breeze-Dark/gtk-2.0/widgets/scrollbar" ++include "/usr/share/themes/Breeze-Dark/gtk-2.0/widgets/toolbar" ++include "/usr/share/themes/Breeze-Dark/gtk-2.0/widgets/progressbar" ++include "/usr/share/themes/Breeze-Dark/gtk-2.0/widgets/misc" ++include "/usr/share/themes/Breeze-Dark/gtk-2.0/widgets/styles" +diff -Nru breeze-gtk-5.6.95/Breeze-gtk/gtk-2.0/gtkrc breeze-gtk-5.6.95.new/Breeze-gtk/gtk-2.0/gtkrc +--- breeze-gtk-5.6.95/Breeze-gtk/gtk-2.0/gtkrc 2016-06-16 12:16:20.000000000 +0200 ++++ breeze-gtk-5.6.95.new/Breeze-gtk/gtk-2.0/gtkrc 2016-06-21 11:58:31.261969458 +0200 +@@ -7,7 +7,7 @@ + gtk-color-scheme = "fg_color:#31363b" + gtk-color-scheme = "bg_color:#eff0f1" + gtk-color-scheme = "selected_fg_color:#eff0f1" +-gtk-color-scheme = "selected_bg_color:#3daee9" ++gtk-color-scheme = "selected_bg_color:#52ae32" + gtk-color-scheme = "button_fg_color:#31363b" + gtk-color-scheme = "tooltip_fg_color:#eff0f1" + gtk-color-scheme = "tooltip_bg_color:#31363b" +@@ -17,14 +17,21 @@ + gtk-color-scheme = "button_active:#3daee9" + gtk-color-scheme = "border_color:#bfc1c3" + +-include "widgets/default" +-include "widgets/buttons" +-include "widgets/menu" +-include "widgets/entry" +-include "widgets/notebook" +-include "widgets/range" +-include "widgets/scrollbar" +-include "widgets/toolbar" +-include "widgets/progressbar" +-include "widgets/misc" +-include "widgets/styles" ++gtk-font-name="Bitstream Vera Sans Roman 9" ++gtk-theme-name="Breeze" ++gtk-menu-images=0 ++gtk-button-images=0 ++ ++pixmap_path "/usr/share/themes/Breeze/gtk-2.0/" ++ ++include "/usr/share/themes/Breeze/gtk-2.0/widgets/default" ++include "/usr/share/themes/Breeze/gtk-2.0/widgets/buttons" ++include "/usr/share/themes/Breeze/gtk-2.0/widgets/menu" ++include "/usr/share/themes/Breeze/gtk-2.0/widgets/entry" ++include "/usr/share/themes/Breeze/gtk-2.0/widgets/notebook" ++include "/usr/share/themes/Breeze/gtk-2.0/widgets/range" ++include "/usr/share/themes/Breeze/gtk-2.0/widgets/scrollbar" ++include "/usr/share/themes/Breeze/gtk-2.0/widgets/toolbar" ++include "/usr/share/themes/Breeze/gtk-2.0/widgets/progressbar" ++include "/usr/share/themes/Breeze/gtk-2.0/widgets/misc" ++include "/usr/share/themes/Breeze/gtk-2.0/widgets/styles" diff --git a/breeze-gtk.spec b/breeze-gtk.spec index 61991d8..cb1f146 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -1,7 +1,7 @@ %define majver %(echo %version | cut -d. -f1-2) Name: breeze-gtk -Version: 5.6.5 +Version: 5.6.95 Release: 1mamba Summary: A GTK Theme Built to Match KDE's Breeze Group: Graphical Desktop/Look 'n' feel @@ -9,8 +9,8 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://www.kde.org -Source: http://download.kde.org/stable/plasma/%{version}/breeze-gtk-%{version}.tar.xz -Patch0: breeze-gtk-5.5.2-gtkrc-openmamba.patch +Source: http://download.kde.org/unstable/plasma/%{version}/breeze-gtk-%{version}.tar.xz +Patch0: breeze-gtk-5.6.95-gtkrc-openmamba.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -26,6 +26,7 @@ Obsoletes: oxygen-gtk3 Provides: QtCurve Requires: breeze-icons Requires: adwaita-icon-theme +Requires: gnome-themes-standard BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -38,10 +39,12 @@ A GTK Theme Built to Match KDE's Breeze. %patch0 -p1 # openmamba color in breeze for gtk 3 -sed -i "s|#3daee9|#52ae32|g" Breeze-gtk/gtk-3.0/gtk.css +sed -i "s|#3daee9|#52ae32|g" Breeze-gtk/gtk-3.20/gtk.css %build -%cmake_kde5 -d build +%cmake_kde5 -d build \ + -DWITH_GTK3_VERSION=3.20 + %make %install @@ -60,8 +63,8 @@ gtk-menu-images=0 gtk-button-images=1 _EOF -mv %{buildroot}%{_datadir}/themes/Breeze/gtk-3.0/gtk.css \ - %{buildroot}%{_datadir}/themes/Breeze/gtk-3.0/gtk.css.bak +#mv %{buildroot}%{_datadir}/themes/Breeze/gtk-3.0/gtk.css \ +# %{buildroot}%{_datadir}/themes/Breeze/gtk-3.0/gtk.css.bak %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -91,11 +94,15 @@ fi %{_libdir}/kconf_update_bin/gtkbreeze5.5 %{_datadir}/kconf_update/gtkbreeze5.5.upd %dir %{_datadir}/themes/Breeze +%dir %{_datadir}/themes/Breeze/assets +%{_datadir}/themes/Breeze/assets/* %dir %{_datadir}/themes/Breeze/gtk-2.0 %{_datadir}/themes/Breeze/gtk-2.0/* %dir %{_datadir}/themes/Breeze/gtk-3.0 %{_datadir}/themes/Breeze/gtk-3.0/* %dir %{_datadir}/themes/Breeze-Dark +%dir %{_datadir}/themes/Breeze-Dark/assets +%{_datadir}/themes/Breeze-Dark/assets/* %dir %{_datadir}/themes/Breeze-Dark/gtk-2.0 %{_datadir}/themes/Breeze-Dark/gtk-2.0/* %dir %{_datadir}/themes/Breeze-Dark/gtk-3.0 @@ -103,6 +110,9 @@ fi %doc COPYING.LIB %changelog +* Tue Jun 21 2016 Silvan Calarco 5.6.95-1mamba +- update to 5.6.95 + * Tue Jun 14 2016 Automatic Build System 5.6.5-1mamba - automatic version update by autodist