rpms/gnome-color-manager
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add upstream patch to build with latest gtk3

Browse Source
This commit is contained in:
Christopher Aillon 2011-01-10 19:33:20 -08:00
parent 551ca095b4
commit 03993c8646
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gnome-color-manager-2.91.3-xid.patch Normal file
View File

@ -0,0 +1,48 @@
From 1a6952a35984a4ea19664819a0fa4b8cf7b6bf15 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Tue, 14 Dec 2010 11:03:11 +0000
Subject: gtk3: gdk_x11_drawable_get_xid renamed to gdk_x11_window_get_xid
---
diff --git a/libcolor-glib/gcm-x11-screen.c b/libcolor-glib/gcm-x11-screen.c
index 3244721..641d651 100644
--- a/libcolor-glib/gcm-x11-screen.c
+++ b/libcolor-glib/gcm-x11-screen.c
@@ -225,7 +225,7 @@ gcm_x11_screen_assign (GcmX11Screen *screen, GdkScreen *gdk_screen, GError **err
}
priv->gdk_root = gdk_screen_get_root_window (priv->gdk_screen);
- priv->xroot = gdk_x11_drawable_get_xid (priv->gdk_root);
+ priv->xroot = gdk_x11_window_get_xid (priv->gdk_root);
priv->xdisplay = dpy;
priv->xscreen = gdk_x11_screen_get_xscreen (priv->gdk_screen);
priv->randr_event_base = event_base;
diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
index 5f54336..03f48ff 100644
--- a/src/cc-color-panel.c
+++ b/src/cc-color-panel.c
@@ -242,7 +242,7 @@ cc_color_panel_viewer_cb (GtkWidget *widget, CcColorPanel *panel)
gchar *command;
/* get xid */
- xid = gdk_x11_drawable_get_xid (gtk_widget_get_window (GTK_WIDGET (panel->priv->main_window)));
+ xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET (panel->priv->main_window)));
/* run with modal set */
command = g_strdup_printf ("%s/gcm-viewer --parent-window %u", BINDIR, xid);
diff --git a/src/gcm-utils.c b/src/gcm-utils.c
index 3f03264..c9440a7 100644
--- a/src/gcm-utils.c
+++ b/src/gcm-utils.c
@@ -156,7 +156,7 @@ gcm_utils_install_package (const gchar *package_name, GtkWindow *window)
/* get xid of this window */
if (window != NULL)
- xid = gdk_x11_drawable_get_xid (gtk_widget_get_window (GTK_WIDGET(window)));
+ xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET(window)));
/* we're expecting an array of packages */
packages = g_strsplit (package_name, "|", 1);
--
cgit v0.8.3.1

5
gnome-color-manager.spec
View File

@ -11,6 +11,8 @@ URL: http://projects.gnome.org/gnome-color-manager/
#Source0: http://download.gnome.org/sources/gnome-color-manager/2.91/%{name}-%{version}-%{?alphatag}.tar.bz2 #Source0: http://download.gnome.org/sources/gnome-color-manager/2.91/%{name}-%{version}-%{?alphatag}.tar.bz2
Source0: http://download.gnome.org/sources/gnome-color-manager/2.91/%{name}-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/gnome-color-manager/2.91/%{name}-%{version}.tar.bz2
Patch0: gnome-color-manager-2.91.3-xid.patch
Requires: color-filesystem >= 1-7 Requires: color-filesystem >= 1-7
Requires: gnome-icon-theme Requires: gnome-icon-theme
Requires: shared-mime-info Requires: shared-mime-info
@ -18,7 +20,7 @@ Requires: shared-color-profiles
Requires: dconf Requires: dconf
Requires: GConf2 >= 2.31.1 Requires: GConf2 >= 2.31.1
BuildRequires: gtk3-devel >= 2.91.3 BuildRequires: gtk3-devel >= 2.99.0
BuildRequires: scrollkeeper BuildRequires: scrollkeeper
BuildRequires: gnome-doc-utils >= 0.3.2 BuildRequires: gnome-doc-utils >= 0.3.2
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -61,6 +63,7 @@ Files for development with %{name}.
%prep %prep
#%setup -q -n %{name}-%{version}-%{?alphatag} #%setup -q -n %{name}-%{version}-%{?alphatag}
%setup -q %setup -q
%patch0 -p1 -b .xid
%build %build
%configure --disable-scrollkeeper --disable-schemas-install %configure --disable-scrollkeeper --disable-schemas-install