rpms/gnome-desktop/devel gnome-desktop-2.25.1.1-fade.patch, 1.1, 1.2 gnome-desktop.spec, 1.186, 1.187
Matthias Clasen
mclasen at fedoraproject.org
Thu Nov 13 06:04:44 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25250
Modified Files:
gnome-desktop-2.25.1.1-fade.patch gnome-desktop.spec
Log Message:
update patches
gnome-desktop-2.25.1.1-fade.patch:
Index: gnome-desktop-2.25.1.1-fade.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop-2.25.1.1-fade.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-desktop-2.25.1.1-fade.patch 13 Nov 2008 05:44:41 -0000 1.1
+++ gnome-desktop-2.25.1.1-fade.patch 13 Nov 2008 06:04:43 -0000 1.2
@@ -1,6 +1,6 @@
diff -up gnome-desktop-2.25.1.1/libgnome-desktop/gnome-bg.c.fade gnome-desktop-2.25.1.1/libgnome-desktop/gnome-bg.c
--- gnome-desktop-2.25.1.1/libgnome-desktop/gnome-bg.c.fade 2008-11-05 07:51:36.000000000 -0500
-+++ gnome-desktop-2.25.1.1/libgnome-desktop/gnome-bg.c 2008-11-13 00:42:31.000000000 -0500
++++ gnome-desktop-2.25.1.1/libgnome-desktop/gnome-bg.c 2008-11-13 01:00:52.000000000 -0500
@@ -38,10 +38,14 @@ Author: Soren Sandmann <sandmann at redhat.
#include <X11/Xlib.h>
#include <X11/Xatom.h>
@@ -325,7 +325,7 @@
}
diff -up /dev/null gnome-desktop-2.25.1.1/libgnome-desktop/gnome-bg-crossfade.c
--- /dev/null 2008-11-12 15:48:32.607088093 -0500
-+++ gnome-desktop-2.25.1.1/libgnome-desktop/gnome-bg-crossfade.c 2008-11-13 00:40:56.000000000 -0500
++++ gnome-desktop-2.25.1.1/libgnome-desktop/gnome-bg-crossfade.c 2008-11-13 01:00:52.000000000 -0500
@@ -0,0 +1,451 @@
+/* gnome-bg-crossfade.h - fade window background between two pixmaps
+ *
@@ -363,7 +363,7 @@
+#include <cairo.h>
+#include <cairo-xlib.h>
+
-+#include <libgnomeui/libgnomeui.h>
++#include <gtk/gtk.h>
+
+#define GNOME_DESKTOP_USE_UNSTABLE_API
+#include <libgnomeui/gnome-bg.h>
@@ -780,7 +780,7 @@
+}
diff -up /dev/null gnome-desktop-2.25.1.1/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h
--- /dev/null 2008-11-12 15:48:32.607088093 -0500
-+++ gnome-desktop-2.25.1.1/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h 2008-11-13 00:40:56.000000000 -0500
++++ gnome-desktop-2.25.1.1/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h 2008-11-13 01:00:52.000000000 -0500
@@ -0,0 +1,76 @@
+/* gnome-bg-crossfade.h - fade window background between two pixmaps
+
@@ -813,7 +813,7 @@
+#error GnomeBGCrossfade is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnome-bg-crossfade.h
+#endif
+
-+#include <libgnomeui/libgnomeui.h>
++
+#include <gdk/gdk.h>
+
+G_BEGIN_DECLS
@@ -860,8 +860,16 @@
+#endif
diff -up gnome-desktop-2.25.1.1/libgnome-desktop/libgnomeui/gnome-bg.h.fade gnome-desktop-2.25.1.1/libgnome-desktop/libgnomeui/gnome-bg.h
--- gnome-desktop-2.25.1.1/libgnome-desktop/libgnomeui/gnome-bg.h.fade 2008-11-05 07:51:36.000000000 -0500
-+++ gnome-desktop-2.25.1.1/libgnome-desktop/libgnomeui/gnome-bg.h 2008-11-13 00:40:56.000000000 -0500
-@@ -63,6 +63,8 @@ typedef enum {
++++ gnome-desktop-2.25.1.1/libgnome-desktop/libgnomeui/gnome-bg.h 2008-11-13 01:02:17.000000000 -0500
+@@ -31,6 +31,7 @@
+
+ #include <gdk/gdk.h>
+ #include <gconf/gconf-client.h>
++#include <libgnomeui/gnome-bg-crossfade.h>
+ #include <libgnomeui/gnome-desktop-thumbnail.h>
+
+ G_BEGIN_DECLS
+@@ -63,6 +64,8 @@ typedef enum {
GType gnome_bg_get_type (void);
GnomeBG * gnome_bg_new (void);
@@ -870,7 +878,7 @@
void gnome_bg_load_from_preferences (GnomeBG *bg,
GConfClient *client);
void gnome_bg_save_to_preferences (GnomeBG *bg,
-@@ -109,6 +111,10 @@ gboolean gnome_bg_changes_with_s
+@@ -109,6 +112,10 @@ gboolean gnome_bg_changes_with_s
void gnome_bg_set_pixmap_as_root (GdkScreen *screen,
GdkPixmap *pixmap);
@@ -881,10 +889,9 @@
G_END_DECLS
-diff -up gnome-desktop-2.25.1.1/libgnome-desktop/libgnomeui/Makefile.am.fade gnome-desktop-2.25.1.1/libgnome-desktop/libgnomeui/Makefile.am
diff -up gnome-desktop-2.25.1.1/libgnome-desktop/Makefile.am.fade gnome-desktop-2.25.1.1/libgnome-desktop/Makefile.am
--- gnome-desktop-2.25.1.1/libgnome-desktop/Makefile.am.fade 2008-11-05 07:51:36.000000000 -0500
-+++ gnome-desktop-2.25.1.1/libgnome-desktop/Makefile.am 2008-11-13 00:43:05.000000000 -0500
++++ gnome-desktop-2.25.1.1/libgnome-desktop/Makefile.am 2008-11-13 01:00:52.000000000 -0500
@@ -22,6 +22,7 @@ libgnome_desktop_2_la_SOURCES = \
gnome-desktop-thumbnail.c \
gnome-thumbnail-pixbuf-utils.c \
Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- gnome-desktop.spec 13 Nov 2008 05:44:41 -0000 1.186
+++ gnome-desktop.spec 13 Nov 2008 06:04:43 -0000 1.187
@@ -12,7 +12,7 @@
Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop
Version: 2.25.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/2.25/%{name}-%{version}.tar.bz2
License: GPLv2+ and LGPLv2+
@@ -127,7 +127,7 @@
%doc %{_datadir}/gtk-doc/html/gnome-desktop/
%changelog
-* Thu Nov 13 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.1.1-2
+* Thu Nov 13 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.1.1-3
- Update to 2.25.1.1
* Thu Nov 6 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-5
More information about the fedora-extras-commits
mailing list