rpms/gnome-desktop/devel gnome-desktop.spec, 1.129, 1.130 multires.patch, 1.1, 1.2
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Tue Feb 26 18:34:57 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9924
Modified Files:
gnome-desktop.spec multires.patch
Log Message:
2.21.92
Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- gnome-desktop.spec 26 Feb 2008 18:11:25 -0000 1.129
+++ gnome-desktop.spec 26 Feb 2008 18:33:57 -0000 1.130
@@ -11,8 +11,8 @@
Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop
-Version: 2.21.91
-Release: 8%{?dist}
+Version: 2.21.92
+Release: 1%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/2.21/%{name}-%{version}.tar.bz2
License: GPLv2+ and LGPLv2+
@@ -21,8 +21,6 @@
Patch1: gnome-desktop-2.1.90-kdetheme.patch
Patch2: add-randr-12.patch
-# fixed in upstream svn
-Patch3: no-info.patch
Patch4: multires.patch
Requires: redhat-menus
@@ -76,8 +74,7 @@
%patch1 -p1 -b .kdetheme
%patch2 -p1 -b .add-randr-12
-%patch3 -p1 -b .no-info
-#%patch4 -p1 -b .multires
+%patch4 -p1 -b .multires
%build
autoreconf
@@ -124,6 +121,9 @@
%doc %{_datadir}/gtk-doc/html/gnome-desktop/
%changelog
+* Tue Feb 26 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.92-1
+- Update to 2.21.92
+
* Sun Feb 24 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.91-8
- Support multi-resolution backgrounds
multires.patch:
Index: multires.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/multires.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multires.patch 25 Feb 2008 04:21:28 -0000 1.1
+++ multires.patch 26 Feb 2008 18:33:57 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up gnome-desktop-2.21.91/libgnome-desktop/gnome-bg.c.multires gnome-desktop-2.21.91/libgnome-desktop/gnome-bg.c
---- gnome-desktop-2.21.91/libgnome-desktop/gnome-bg.c.multires 2008-02-24 23:16:26.000000000 -0500
-+++ gnome-desktop-2.21.91/libgnome-desktop/gnome-bg.c 2008-02-24 23:16:33.000000000 -0500
+diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c
+--- gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires 2008-02-26 12:35:16.000000000 -0500
++++ gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c 2008-02-26 13:30:53.000000000 -0500
@@ -49,8 +49,17 @@ struct _Slide
double duration; /* in seconds */
gboolean fixed;
@@ -38,7 +38,7 @@
static void
gnome_bg_init (GnomeBG *bg)
-@@ -379,6 +391,10 @@ gboolean
+@@ -386,6 +398,10 @@ gboolean
gnome_bg_changes_with_size (GnomeBG *bg)
{
g_return_val_if_fail (bg != NULL, FALSE);
@@ -49,7 +49,7 @@
if (bg->color_type != GNOME_BG_COLOR_SOLID) {
if (!get_pixbuf (bg))
-@@ -489,7 +505,17 @@ gnome_bg_create_pixmap (GnomeBG *bg,
+@@ -496,7 +512,17 @@ gnome_bg_create_pixmap (GnomeBG *bg,
g_return_val_if_fail (bg != NULL, NULL);
g_return_val_if_fail (window != NULL, NULL);
@@ -68,7 +68,7 @@
gnome_bg_get_pixmap_size (bg, width, height, &pm_width, &pm_height);
if (root) {
-@@ -658,8 +684,10 @@ gnome_bg_get_image_size (GnomeBG
+@@ -665,8 +691,10 @@ gnome_bg_get_image_size (GnomeBG
SlideShow *show = get_as_slideshow (bg, bg->uri);
if (show) {
double alpha;
@@ -80,7 +80,7 @@
thumb = create_thumbnail_for_uri (factory, uri);
}
}
-@@ -790,6 +818,8 @@ struct _SlideShow
+@@ -797,6 +825,8 @@ struct _SlideShow
GQueue *slides;
@@ -89,7 +89,7 @@
/* used during parsing */
struct tm start_tm;
GQueue *stack;
-@@ -1162,16 +1192,23 @@ create_img_thumbnail (GnomeBG
+@@ -1169,16 +1199,23 @@ create_img_thumbnail (GnomeBG
if (slide->fixed) {
GdkPixbuf *tmp;
@@ -116,7 +116,7 @@
if (p1 && p2) {
GdkPixbuf *thumb1, *thumb2;
-@@ -1200,6 +1237,51 @@ create_img_thumbnail (GnomeBG
+@@ -1207,6 +1244,51 @@ create_img_thumbnail (GnomeBG
return NULL;
}
@@ -168,7 +168,7 @@
static GdkPixbuf *
get_pixbuf (GnomeBG *bg)
{
-@@ -1220,11 +1302,18 @@ get_pixbuf (GnomeBG *bg)
+@@ -1227,11 +1309,18 @@ get_pixbuf (GnomeBG *bg)
Slide *slide = get_current_slide (show, &alpha);
if (slide->fixed) {
@@ -190,7 +190,7 @@
if (p1 && p2) {
bg->pixbuf_cache = blend (p1, p2, alpha);
-@@ -1524,6 +1613,7 @@ pixbuf_tile (GdkPixbuf *src, GdkPixbuf *
+@@ -1531,6 +1620,7 @@ pixbuf_tile (GdkPixbuf *src, GdkPixbuf *
}
}
@@ -198,7 +198,7 @@
/* Parser for fading background */
static void
-@@ -1535,6 +1625,7 @@ handle_start_element (GMarkupParseContex
+@@ -1542,6 +1632,7 @@ handle_start_element (GMarkupParseContex
GError **err)
{
SlideShow *parser = user_data;
@@ -206,7 +206,7 @@
if (strcmp (name, "static") == 0 || strcmp (name, "transition") == 0) {
Slide *slide = g_new0 (Slide, 1);
-@@ -1544,7 +1635,25 @@ handle_start_element (GMarkupParseContex
+@@ -1551,7 +1642,25 @@ handle_start_element (GMarkupParseContex
g_queue_push_tail (parser->slides, slide);
}
@@ -233,7 +233,7 @@
g_queue_push_tail (parser->stack, g_strdup (name));
}
-@@ -1612,6 +1721,8 @@ handle_text (GMarkupParseContext *contex
+@@ -1634,6 +1743,8 @@ handle_text (GMarkupParseContext *contex
{
SlideShow *parser = user_data;
Slide *slide = parser->slides->tail? parser->slides->tail->data : NULL;
@@ -242,11 +242,12 @@
if (stack_is (parser, "year", "starttime", "background", NULL)) {
parser->start_tm.tm_year = parse_int (text) - 1900;
-@@ -1638,10 +1749,47 @@ handle_text (GMarkupParseContext *contex
+@@ -1660,12 +1771,47 @@ handle_text (GMarkupParseContext *contex
}
else if (stack_is (parser, "file", "static", "background", NULL) ||
stack_is (parser, "from", "transition", "background", NULL)) {
- slide->file1 = g_strdup (text);
+- slide->file1 = make_uri (slide->file1);
+ for (i = 0; text[i]; i++) {
+ if (!g_ascii_isspace (text[i]))
+ break;
@@ -256,7 +257,7 @@
+ fs = g_new (FileSize, 1);
+ fs->width = -1;
+ fs->height = -1;
-+ fs->file = g_strdup (text);
++ fs->file = make_uri (g_strdup (text));
+ slide->file1 = g_slist_prepend (slide->file1, fs);
+ if (slide->file1->next != NULL)
+ parser->changes_with_size = TRUE;
@@ -264,35 +265,36 @@
+ else if (stack_is (parser, "size", "file", "static", "background", NULL) ||
+ stack_is (parser, "size", "from", "transition", "background", NULL)) {
+ fs = slide->file1->data;
-+ fs->file = g_strdup (text);
++ fs->file = make_uri (g_strdup (text));
+ if (slide->file1->next != NULL)
-+ parser->changes_with_size = TRUE;
++ parser->changes_with_size = TRUE;
}
else if (stack_is (parser, "to", "transition", "background", NULL)) {
- slide->file2 = g_strdup (text);
+- slide->file2 = make_uri (slide->file2);
+ for (i = 0; text[i]; i++) {
+ if (!g_ascii_isspace (text[i]))
-+ break;
++ break;
+ }
+ if (text[i] == 0)
+ return;
+ fs = g_new (FileSize, 1);
+ fs->width = -1;
+ fs->height = -1;
-+ fs->file = g_strdup (text);
-+ slide->file2 = g_slist_prepend (slide->file2, fs);
++ fs->file = make_uri (g_strdup (text));
++ slide->file1 = g_slist_prepend (slide->file1, fs);
+ if (slide->file1->next != NULL)
+ parser->changes_with_size = TRUE;
+ }
+ else if (stack_is (parser, "size", "to", "transition", "background", NULL)) {
+ fs = slide->file2->data;
-+ fs->file = g_strdup (text);
++ fs->file = make_uri (g_strdup (text));
+ if (slide->file2->next != NULL)
+ parser->changes_with_size = TRUE;
}
}
-@@ -1649,12 +1797,25 @@ static void
+@@ -1673,12 +1819,25 @@ static void
slideshow_free (SlideShow *show)
{
GList *list;
@@ -321,7 +323,7 @@
g_free (slide);
}
-@@ -1682,9 +1843,19 @@ dump_bg (SlideShow *show)
+@@ -1706,9 +1865,19 @@ dump_bg (SlideShow *show)
Slide *slide = list->data;
g_print ("\nSlide: %s\n", slide->fixed? "fixed" : "transition");
@@ -344,7 +346,7 @@
}
#endif
}
-@@ -1747,8 +1918,8 @@ read_slideshow_file (const char *uri,
+@@ -1771,8 +1940,8 @@ read_slideshow_file (const char *uri,
show = NULL;
}
@@ -355,7 +357,7 @@
slideshow_free (show);
show = NULL;
}
-@@ -1839,3 +2010,10 @@ get_thumb_annotations (GdkPixbuf *thumb,
+@@ -1863,3 +2032,10 @@ get_thumb_annotations (GdkPixbuf *thumb,
return FALSE;
}
More information about the fedora-extras-commits
mailing list