pool/gnome-desktop
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 55901 from home:dimstar:branches:GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/55901
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=94
This commit is contained in:
Vincent Untz 2010-12-14 18:41:07 +00:00 committed by Git OBS Bridge
parent 23fde89da8
commit 1cb003de25
3 changed files with 86 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
gnome-desktop-gdk_functions.patch Normal file
View File

@ -0,0 +1,77 @@
From 260f6d2431088c5cd0ad1eb8d57f0ec994240f08 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 30 Nov 2010 21:25:03 +0000
Subject: Remove unnecessary cast
The symbol will be removed soon, so better get rid of it.
---
diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
index 27aea30..76c61a8 100644
--- a/libgnome-desktop/gnome-bg.c
+++ b/libgnome-desktop/gnome-bg.c
@@ -1094,7 +1094,7 @@ gnome_bg_create_surface (GnomeBG *bg,
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
width, height);
- gnome_bg_draw (bg, pixbuf, gdk_window_get_screen (GDK_DRAWABLE (window)), is_root);
+ gnome_bg_draw (bg, pixbuf, gdk_window_get_screen (window), is_root);
gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
g_object_unref (pixbuf);
}
--
cgit v0.8.3.1
From ff299bbed74e9603ea7c780de8805110d88dec28 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Wed, 01 Dec 2010 11:37:59 +0000
Subject: Replace GDK macro usage with proper function name
---
diff --git a/libgnome-desktop/gnome-bg-crossfade.c b/libgnome-desktop/gnome-bg-crossfade.c
index df6a285..02a120e 100644
--- a/libgnome-desktop/gnome-bg-crossfade.c
+++ b/libgnome-desktop/gnome-bg-crossfade.c
@@ -373,7 +373,7 @@ animations_are_disabled (GnomeBGCrossfade *fade)
static void
draw_background (GnomeBGCrossfade *fade)
{
- if (GDK_WINDOW_TYPE (fade->priv->window) == GDK_WINDOW_ROOT) {
+ if (gdk_window_get_window_type (fade->priv->window) == GDK_WINDOW_ROOT) {
XClearArea (GDK_WINDOW_XDISPLAY (fade->priv->window),
GDK_WINDOW_XID (fade->priv->window),
0, 0,
@@ -494,7 +494,7 @@ gnome_bg_crossfade_start (GnomeBGCrossfade *fade,
g_return_if_fail (fade->priv->fading_surface != NULL);
g_return_if_fail (fade->priv->end_surface != NULL);
g_return_if_fail (!gnome_bg_crossfade_is_started (fade));
- g_return_if_fail (GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN);
+ g_return_if_fail (gdk_window_get_window_type (window) != GDK_WINDOW_FOREIGN);
source = g_timeout_source_new (1000 / 60.0);
g_source_set_callback (source,
--
cgit v0.8.3.1
From 24863ae9ea04dec397e41892cff21ae5ce9cef38 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 02 Dec 2010 21:02:16 +0000
Subject: rr: Use gdk_x11_window_get_xid()
... instead of removed gdk_x11_drawable_get_xid()
---
diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
index 7e8bc22..6b8379b 100644
--- a/libgnome-desktop/gnome-rr.c
+++ b/libgnome-desktop/gnome-rr.c
@@ -668,7 +668,7 @@ gnome_rr_screen_new (GdkScreen *gdk_screen,
screen->gdk_screen = gdk_screen;
screen->gdk_root = gdk_screen_get_root_window (gdk_screen);
- screen->xroot = gdk_x11_drawable_get_xid (screen->gdk_root);
+ screen->xroot = gdk_x11_window_get_xid (screen->gdk_root);
screen->xdisplay = dpy;
screen->xscreen = gdk_x11_screen_get_xscreen (screen->gdk_screen);
screen->connector_type_atom = XInternAtom (dpy, "ConnectorType", FALSE);
--
cgit v0.8.3.1

6
gnome-desktop.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 14 08:31:03 UTC 2010 - dimstar@opensuse.org
- Add gnome-desktop-gdk_functions.patch to fix build with latest
gtk3. Patch from upstream git, commit 260f6d, 24863a & ff299b.
-------------------------------------------------------------------
Sat Dec 11 11:40:50 CET 2010 - vuntz@opensuse.org

3
gnome-desktop.spec
View File

@ -28,6 +28,8 @@ Url: http://www.gnome.org
Group: System/GUI/GNOME
Source: %{name}-%{version}.tar.bz2
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM gnome-desktop-gdk_functions.patch dimstar@opensuse.org -- Replace GDK macro usage with proper function name, taken from git.
Patch0: gnome-desktop-gdk_functions.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
Patch2: gnome-desktop-desktop.patch
BuildRequires: fdupes
@ -102,6 +104,7 @@ gtk-doc.
%lang_package
%prep
%setup -q
%patch0 -p1
translation-update-upstream
%patch2 -p0