[gtk-theme-engine-clearlooks] Include buttons patch from upstream

Cosimo Cecchi cosimoc at fedoraproject.org
Mon Jan 17 09:01:47 UTC 2011


commit 1f9eb3a571694e5ce0bfa70463167ba33b6dd615
Author: Cosimo Cecchi <cosimoc at gnome.org>
Date:   Mon Jan 17 10:00:28 2011 +0100

    Include buttons patch from upstream

 clearlooks-buttons.patch         |   23 +++++++++++++++++++++++
 gtk-theme-engine-clearlooks.spec |   10 +++++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/clearlooks-buttons.patch b/clearlooks-buttons.patch
new file mode 100644
index 0000000..a897712
--- /dev/null
+++ b/clearlooks-buttons.patch
@@ -0,0 +1,23 @@
+From 349278c5a22201e73eadce08a96d211f0bfaf0bd Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc at gnome.org>
+Date: Thu, 13 Jan 2011 00:20:39 +0000
+Subject: draw: don't swap normal<->active states when drawing buttons
+
+This is a regression from commit
+8d881a1ebd4858f7fd586aa879c16fa2689e023b
+---
+diff --git a/src/clearlooks_draw.c b/src/clearlooks_draw.c
+index 3ee38cb..5c8ea28 100644
+--- a/src/clearlooks_draw.c
++++ b/src/clearlooks_draw.c
+@@ -344,7 +344,7 @@ clearlooks_draw_button (cairo_t *cr,
+ 	                                     height-(yoffset*2)-2,
+ 				    radius, clearlooks_get_corners (engine));
+ 
+-	if (state & GTK_STATE_FLAG_ACTIVE)
++	if ((state & GTK_STATE_FLAG_ACTIVE) == 0)
+ 	{
+ 		cairo_pattern_t *pattern;
+ 		CairoColor top_shade, topmiddle_shade, bottom_shade, middle_shade;
+--
+cgit v0.8.3.1
diff --git a/gtk-theme-engine-clearlooks.spec b/gtk-theme-engine-clearlooks.spec
index 9b9d9e5..f37d7c9 100644
--- a/gtk-theme-engine-clearlooks.spec
+++ b/gtk-theme-engine-clearlooks.spec
@@ -1,6 +1,6 @@
 Name: gtk-theme-engine-clearlooks
 Version: 2.91.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Clearlooks GTK+ theme engine
 
 Group: User Interface/Desktops
@@ -11,6 +11,8 @@ Source0: http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.b
 BuildRequires:  gtk3-devel >= 2.99.0
 BuildRequires: intltool gettext
 
+Patch0: clearlooks-buttons.patch
+
 %description
 The Clearlooks GTK+ engine provides the default look for the GNOME desktop.
 
@@ -18,6 +20,9 @@ The Clearlooks GTK+ engine provides the default look for the GNOME desktop.
 %prep
 %setup -q
 
+# already upstreamed
+%patch0 -p1 -b .buttons
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -41,6 +46,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs rm
 
 
 %changelog
+* Mon Jan 17 2011 Cosimo Cecchi <cosimoc at redhat.com> 2.91.5-2
+- Add a patch 
+
 * Fri Jan  7 2011 Matthias Clasen <mclasen at redhat.com> 2.91.5-1
 - Update to 2.91.5
 


More information about the scm-commits mailing list