From 45ebf46c58e69012ae5f07dae7a90befb2111385 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: May 14 2008 05:13:17 +0000 Subject: - Update to 2.23.2 snapshot --- diff --git a/.cvsignore b/.cvsignore index 13c7f14..642c674 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-desktop-2.23.1.tar.bz2 +gnome-desktop-2.23.2.tar.bz2 diff --git a/gnome-desktop.spec b/gnome-desktop.spec index e830988..d04e26d 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -11,13 +11,13 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop -Version: 2.23.1 -Release: 1%{?dist} +Version: 2.23.2 +Release: 0.2008.05.14.1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2 License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: gnome-desktop-2.1.90-kdetheme.patch Patch2: add-randr-12.patch @@ -40,7 +40,7 @@ BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version} BuildRequires: startup-notification-devel >= %{startup_notification_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} -BuildRequires: scrollkeeper +BuildRequires: scrollkeeper BuildRequires: gettext BuildRequires: perl(XML::Parser) BuildRequires: gtk-doc >= %{gtk_doc_version} @@ -69,7 +69,7 @@ Requires: pkgconfig Requires: gtk-doc >= %{gtk_doc_version} %description devel -Libraries and header files for the GNOME-internal private library +Libraries and header files for the GNOME-internal private library libgnomedesktop. %prep @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Wed May 14 2008 Jon McCann - 2.23.2-0.2008.05.14.1 +- Update to 2.23.2 snapshot + * Fri Apr 25 2008 Matthias Clasen - 2.23.1-1 - Update to 2.23.1 diff --git a/multires.patch b/multires.patch index 14b5557..50b0836 100644 --- a/multires.patch +++ b/multires.patch @@ -1,14 +1,13 @@ -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 15:18:37.000000000 -0500 -@@ -49,8 +49,17 @@ struct _Slide +--- gnome-desktop-2.23.2/libgnome-desktop/gnome-bg.c.multires 2008-05-14 00:39:32.000000000 -0400 ++++ gnome-desktop-2.23.2/libgnome-desktop/gnome-bg.c 2008-05-14 01:03:52.000000000 -0400 +@@ -59,8 +59,17 @@ struct _Slide double duration; /* in seconds */ - gboolean fixed; - + gboolean fixed; + - char *file1; - char *file2; /* NULL if fixed is TRUE */ -+ GSList *file1; -+ GSList *file2; /* NULL if fixed is TRUE */ ++ GSList *file1; ++ GSList *file2; /* NULL if fixed is TRUE */ +}; + +typedef struct _FileSize FileSize; @@ -21,24 +20,25 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto }; /* This is the size of the GdkRGB dither matrix, in order to avoid -@@ -73,6 +82,8 @@ struct _GnomeBG - GnomeBGColorType color_type; +@@ -83,6 +92,9 @@ struct _GnomeBG GdkColor c1; GdkColor c2; -+ gint last_pixmap_width; -+ gint last_pixmap_height; - + ++ gint last_pixmap_width; ++ gint last_pixmap_height; ++ /* Cached information, only access through cache accessor functions */ SlideShow * slideshow; -@@ -147,6 +158,7 @@ static SlideShow * get_as_slideshow ( + time_t uri_mtime; +@@ -158,6 +170,7 @@ static SlideShow * get_as_slideshow ( const char *uri); static Slide * get_current_slide (SlideShow *show, double *alpha); +static gboolean slideshow_changes_with_size (SlideShow *show); static void - gnome_bg_init (GnomeBG *bg) -@@ -386,6 +398,10 @@ gboolean + set_color_from_string (const char *string, +@@ -512,6 +525,10 @@ gboolean gnome_bg_changes_with_size (GnomeBG *bg) { g_return_val_if_fail (bg != NULL, FALSE); @@ -49,7 +49,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto if (bg->color_type != GNOME_BG_COLOR_SOLID) { if (!get_pixbuf (bg)) -@@ -496,7 +512,17 @@ gnome_bg_create_pixmap (GnomeBG *bg, +@@ -622,7 +639,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 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto gnome_bg_get_pixmap_size (bg, width, height, &pm_width, &pm_height); if (root) { -@@ -665,8 +691,10 @@ gnome_bg_get_image_size (GnomeBG +@@ -791,8 +818,10 @@ gnome_bg_get_image_size (GnomeBG SlideShow *show = get_as_slideshow (bg, bg->uri); if (show) { double alpha; @@ -80,7 +80,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto thumb = create_thumbnail_for_uri (factory, uri); } } -@@ -797,6 +825,8 @@ struct _SlideShow +@@ -923,6 +952,8 @@ struct _SlideShow GQueue *slides; @@ -89,7 +89,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto /* used during parsing */ struct tm start_tm; GQueue *stack; -@@ -1169,16 +1199,23 @@ create_img_thumbnail (GnomeBG +@@ -1298,16 +1329,23 @@ create_img_thumbnail (GnomeBG if (slide->fixed) { GdkPixbuf *tmp; @@ -116,7 +116,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto if (p1 && p2) { GdkPixbuf *thumb1, *thumb2; -@@ -1207,6 +1244,51 @@ create_img_thumbnail (GnomeBG +@@ -1336,6 +1374,51 @@ create_img_thumbnail (GnomeBG return NULL; } @@ -168,7 +168,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto static GdkPixbuf * get_pixbuf (GnomeBG *bg) { -@@ -1227,11 +1309,18 @@ get_pixbuf (GnomeBG *bg) +@@ -1356,11 +1439,18 @@ get_pixbuf (GnomeBG *bg) Slide *slide = get_current_slide (show, &alpha); if (slide->fixed) { @@ -190,7 +190,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto if (p1 && p2) { bg->pixbuf_cache = blend (p1, p2, alpha); -@@ -1531,6 +1620,7 @@ pixbuf_tile (GdkPixbuf *src, GdkPixbuf * +@@ -1656,6 +1746,7 @@ pixbuf_tile (GdkPixbuf *src, GdkPixbuf * } } @@ -198,7 +198,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto /* Parser for fading background */ static void -@@ -1542,6 +1632,7 @@ handle_start_element (GMarkupParseContex +@@ -1667,6 +1758,7 @@ handle_start_element (GMarkupParseContex GError **err) { SlideShow *parser = user_data; @@ -206,7 +206,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto if (strcmp (name, "static") == 0 || strcmp (name, "transition") == 0) { Slide *slide = g_new0 (Slide, 1); -@@ -1551,7 +1642,25 @@ handle_start_element (GMarkupParseContex +@@ -1676,7 +1768,25 @@ handle_start_element (GMarkupParseContex g_queue_push_tail (parser->slides, slide); } @@ -233,7 +233,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto g_queue_push_tail (parser->stack, g_strdup (name)); } -@@ -1634,6 +1743,8 @@ handle_text (GMarkupParseContext *contex +@@ -1759,6 +1869,8 @@ handle_text (GMarkupParseContext *contex { SlideShow *parser = user_data; Slide *slide = parser->slides->tail? parser->slides->tail->data : NULL; @@ -242,7 +242,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto if (stack_is (parser, "year", "starttime", "background", NULL)) { parser->start_tm.tm_year = parse_int (text) - 1900; -@@ -1660,12 +1771,47 @@ handle_text (GMarkupParseContext *contex +@@ -1785,12 +1897,47 @@ handle_text (GMarkupParseContext *contex } else if (stack_is (parser, "file", "static", "background", NULL) || stack_is (parser, "from", "transition", "background", NULL)) { @@ -294,7 +294,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto } } -@@ -1673,12 +1819,25 @@ static void +@@ -1798,12 +1945,25 @@ static void slideshow_free (SlideShow *show) { GList *list; @@ -323,12 +323,9 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto g_free (slide); } -@@ -1698,17 +1857,28 @@ slideshow_free (SlideShow *show) - static void - dump_bg (SlideShow *show) +@@ -1825,15 +1985,26 @@ dump_bg (SlideShow *show) { --#if 0 -+#if 0 + #if 0 GList *list; + GSList *slist; @@ -356,7 +353,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto } #endif } -@@ -1771,8 +1941,8 @@ read_slideshow_file (const char *uri, +@@ -1896,8 +2067,8 @@ read_slideshow_file (const char *uri, show = NULL; } @@ -367,7 +364,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto slideshow_free (show); show = NULL; } -@@ -1863,3 +2033,10 @@ get_thumb_annotations (GdkPixbuf *thumb, +@@ -1988,3 +2159,10 @@ get_thumb_annotations (GdkPixbuf *thumb, return FALSE; } diff --git a/sources b/sources index caa656f..6338a2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f002437d7a98f03be0c509e605a5e4eb gnome-desktop-2.23.1.tar.bz2 +c0ae0f99df8e2e26753e0f91a67a0ba6 gnome-desktop-2.23.2.tar.bz2