rpms/gnome-desktop3
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebuild

Browse Source
This commit is contained in:
Matthias Clasen 2010-09-22 00:24:33 -04:00
parent f42e615ce5
commit edbb99c8e7
3 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
cairo-drawing.patch Normal file
View File

@ -0,0 +1,46 @@
--- gnome-desktop-2.90.4/libgnome-desktop/gnome-bg.c 2010-06-21 21:49:06.000000000 -0400
+++ hacked/libgnome-desktop/gnome-bg.c 2010-09-22 00:18:03.030998000 -0400
@@ -209,8 +209,6 @@
if (!gdk_color_parse (string, colorp))
return;
-
- gdk_rgb_find_color (gdk_rgb_get_colormap(), colorp);
}
static char *
@@ -995,23 +993,24 @@
}
if (!bg->filename && bg->color_type == GNOME_BG_COLOR_SOLID) {
- GdkGC *gc = gdk_gc_new (pixmap);
- gdk_gc_set_rgb_fg_color (gc, &(bg->primary));
-
- gdk_draw_point (pixmap, gc, 0, 0);
-
- g_object_unref (gc);
+ cairo_t *cr;
+ cr = gdk_cairo_create (pixmap);
+ gdk_cairo_set_source_color (cr, &(bg->primary));
+ cairo_rectangle (cr, 0, 0, 1, 1);
+ cairo_fill (cr);
+ cairo_destroy (cr);
}
else {
GdkPixbuf *pixbuf;
+ cairo_t *cr;
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
width, height);
gnome_bg_draw (bg, pixbuf, gdk_drawable_get_screen (GDK_DRAWABLE (window)), is_root);
- gdk_draw_pixbuf (pixmap, NULL, pixbuf,
- 0, 0,
- 0, 0, width, height,
- GDK_RGB_DITHER_MAX, 0, 0);
+ cr = gdk_cairo_create (pixmap);
+ gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
+ cairo_paint (cr);
+ cairo_destroy (cr);
g_object_unref (pixbuf);
}

20
display-cleanup.patch Normal file
View File

@ -0,0 +1,20 @@
--- gnome-desktop-2.90.4/libgnome-desktop/gnome-desktop-item.c 2010-03-27 07:34:40.000000000 -0400
+++ hacked/libgnome-desktop/gnome-desktop-item.c 2010-09-22 00:08:51.173997995 -0400
@@ -1786,7 +1786,7 @@
arg_ptr = make_args (file_list);
#ifdef HAVE_STARTUP_NOTIFICATION
- sn_display = sn_display_new (gdk_display,
+ sn_display = sn_display_new (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
sn_error_trap_push,
sn_error_trap_pop);
@@ -1805,7 +1805,7 @@
sn_context = sn_launcher_context_new (sn_display,
screen ? gdk_screen_get_number (screen) :
- DefaultScreen (gdk_display));
+ DefaultScreen (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())));
name = gnome_desktop_item_get_localestring (item,
GNOME_DESKTOP_ITEM_NAME);

11
gnome-desktop3.spec
View File

@ -9,7 +9,7 @@
Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop3
Version: 2.90.4
Release: 2%{?dist}
Release: 3%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/2.90/gnome-desktop-%{version}.tar.bz2
License: GPLv2+ and LGPLv2+
@ -35,6 +35,9 @@ BuildRequires: gettext
BuildRequires: gtk-doc >= %{gtk_doc_version}
BuildRequires: automake autoconf libtool intltool
Patch0: display-cleanup.patch
Patch1: cairo-drawing.patch
%description
The gnome-desktop package contains an internal library
@ -62,6 +65,8 @@ libgnomedesktop.
%prep
%setup -q -n gnome-desktop-%{version}
%patch0 -p1 -b .display-cleanup
%patch1 -p1 -b .cairo-drawing
%build
%configure --with-gnome-distributor="Red Hat, Inc" \
@ -110,6 +115,10 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gnome-about*
%doc %{_datadir}/gtk-doc/html/gnome-desktop3/
%changelog
* Wed Sep 22 2010 Matthias Clasen <mclasen@redhat.com> 2.90.4-3
- Rebuild against newer gobject-introspection
- Rebuild against newer gtk
* Thu Aug 19 2010 Matthias Clasen <mclasen@redhat.com> 2.90.4-2
- Prevent file conflict with gnome-desktop