- New upstream version.
This commit is contained in:
parent
03993c8646
commit
b858fb5d48
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ gnome-color-manager-2.31.4.tar.bz2
|
|||||||
/gnome-color-manager-2.91.2-20101102.tar.bz2
|
/gnome-color-manager-2.91.2-20101102.tar.bz2
|
||||||
/gnome-color-manager-2.91.2.tar.bz2
|
/gnome-color-manager-2.91.2.tar.bz2
|
||||||
/gnome-color-manager-2.91.3.tar.bz2
|
/gnome-color-manager-2.91.3.tar.bz2
|
||||||
|
/gnome-color-manager-2.91.5.tar.bz2
|
||||||
|
@ -1,48 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
@ -2,17 +2,13 @@
|
|||||||
|
|
||||||
Summary: Color management tools for GNOME
|
Summary: Color management tools for GNOME
|
||||||
Name: gnome-color-manager
|
Name: gnome-color-manager
|
||||||
Version: 2.91.3
|
Version: 2.91.5
|
||||||
#Release: 0.3.%{?alphatag}%{?dist}
|
Release: 1%{?dist}
|
||||||
Release: 4%{?dist}
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: http://projects.gnome.org/gnome-color-manager/
|
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}.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
|
||||||
@ -61,9 +57,7 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
Files for development with %{name}.
|
Files for development with %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
#%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
|
||||||
@ -137,6 +131,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
|
|||||||
%{_datadir}/gtk-doc/html/libcolor-glib
|
%{_datadir}/gtk-doc/html/libcolor-glib
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 11 2011 Richard Hughes <rhughes@redhat.com> - 2.91.5-1
|
||||||
|
- New upstream version.
|
||||||
|
|
||||||
* Sun Jan 9 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.3-4
|
* Sun Jan 9 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.3-4
|
||||||
- Rebuild against newer gtk3
|
- Rebuild against newer gtk3
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user