rpms/gtk2/devel evo-composer.patch,NONE,1.1 gtk2.spec,1.309,1.310

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Mon Aug 11 21:14:38 UTC 2008


Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15335

Modified Files:
	gtk2.spec 
Added Files:
	evo-composer.patch 
Log Message:
fix evo composer


evo-composer.patch:

--- NEW FILE evo-composer.patch ---
diff -up gtk+-2.13.6/gtk/gtkadjustment.c.evo-composer gtk+-2.13.6/gtk/gtkadjustment.c
--- gtk+-2.13.6/gtk/gtkadjustment.c.evo-composer	2008-08-11 17:11:17.000000000 -0400
+++ gtk+-2.13.6/gtk/gtkadjustment.c	2008-08-11 17:11:47.000000000 -0400
@@ -359,7 +359,8 @@ gtk_adjustment_set_value (GtkAdjustment 
 {
   g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
 
-  value = CLAMP (value, adjustment->lower, adjustment->upper - adjustment->page_size);
+  value = MIN (value, adjustment->upper - adjustment->page_size);
+  value = MAX (value, adjustment->lower);
 
   if (value != adjustment->value)
     {


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- gtk2.spec	10 Aug 2008 03:13:33 -0000	1.309
+++ gtk2.spec	11 Aug 2008 21:14:08 -0000	1.310
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.13/gtk+-%{version}.tar.bz2
@@ -32,6 +32,8 @@
 Patch2: workaround.patch
 # from upstream svn
 Patch3: menu-breakage.patch
+# from upstream svn
+Patch4: evo-composer.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -118,6 +120,7 @@
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .menu-breakage
+%patch4 -p1 -b .evo-composer
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -301,6 +304,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Aug 11 2008 Matthias Clasen <mclasen at redhat.com> - 2.13.6-3
+- Fix evolution composer breakage
+
 * Sat Aug  9 2008 Matthias Clasen <mclasen at redhat.com> - 2.13.6-2
 - Fix menu breakage
 




More information about the fedora-extras-commits mailing list