rpms/gnome-desktop/devel add-randr-12.patch, 1.3, 1.4 gnome-desktop.spec, 1.114, 1.115
Soren Sandmann Pedersen (ssp)
fedora-extras-commits at redhat.com
Thu Jan 31 19:41:47 UTC 2008
Author: ssp
Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9880
Modified Files:
add-randr-12.patch gnome-desktop.spec
Log Message:
Update randrwrap
add-randr-12.patch:
Index: add-randr-12.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/add-randr-12.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- add-randr-12.patch 29 Jan 2008 08:36:48 -0000 1.3
+++ add-randr-12.patch 31 Jan 2008 19:41:37 -0000 1.4
@@ -1,6 +1,6 @@
diff -up gnome-desktop-2.21.90/configure.in.add-randr-12 gnome-desktop-2.21.90/configure.in
---- gnome-desktop-2.21.90/configure.in.add-randr-12 2008-01-29 03:26:12.000000000 -0500
-+++ gnome-desktop-2.21.90/configure.in 2008-01-29 03:26:23.000000000 -0500
+--- gnome-desktop-2.21.90/configure.in.add-randr-12 2008-01-27 18:48:13.000000000 -0500
++++ gnome-desktop-2.21.90/configure.in 2008-01-29 03:27:34.000000000 -0500
@@ -51,10 +51,10 @@ AC_SUBST(GNOME_MICRO)
AC_SUBST(GNOME_DISTRIBUTOR)
AC_SUBST(GNOME_DATE)
@@ -18,7 +18,7 @@
diff -up gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am.add-randr-12 gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am
--- gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am.add-randr-12 2008-01-27 18:44:20.000000000 -0500
-+++ gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am 2008-01-29 03:11:09.000000000 -0500
++++ gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/Makefile.am 2008-01-29 03:27:34.000000000 -0500
@@ -2,4 +2,5 @@ libgnomeui_desktopdir = $(includedir)/gn
libgnomeui_desktop_HEADERS = \
gnome-ditem-edit.h \
@@ -27,14 +27,9 @@
+ gnome-bg.h \
+ randrwrap.h
diff -up /dev/null gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/randrwrap.h
---- /dev/null 2008-01-26 11:28:38.229690233 -0500
-+++ gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/randrwrap.h 2008-01-29 03:11:09.000000000 -0500
-@@ -0,0 +1,94 @@
-+#ifndef I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
-+#error This code is not for general consumption yet.
-+#endif
-+
-+
+--- /dev/null 2008-01-30 11:34:25.225700292 -0500
++++ gnome-desktop-2.21.90/libgnome-desktop/libgnomeui/randrwrap.h 2008-01-31 14:34:04.000000000 -0500
+@@ -0,0 +1,89 @@
+#ifndef RANDR_WRAP_H
+#define RANDR_WRAP_H
+
@@ -75,7 +70,7 @@
+ guint32 id);
+RWOutput * rw_screen_get_output_by_name (RWScreen *screen,
+ const char *name);
-+void rw_screen_get_range (RWScreen *screen,
++void rw_screen_get_ranges (RWScreen *screen,
+ int *min_width,
+ int *max_width,
+ int *min_height,
@@ -125,12 +120,10 @@
+
+#endif
diff -up /dev/null gnome-desktop-2.21.90/libgnome-desktop/randrwrap.c
---- /dev/null 2008-01-26 11:28:38.229690233 -0500
-+++ gnome-desktop-2.21.90/libgnome-desktop/randrwrap.c 2008-01-29 03:11:09.000000000 -0500
+--- /dev/null 2008-01-30 11:34:25.225700292 -0500
++++ gnome-desktop-2.21.90/libgnome-desktop/randrwrap.c 2008-01-31 14:34:04.000000000 -0500
@@ -0,0 +1,967 @@
-+#define I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
-+
-+#include <libgnomeui/randrwrap.h>
++#include "randrwrap.h"
+#include <string.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/Xrandr.h>
@@ -319,9 +312,11 @@
+ &(screen->max_width),
+ &(screen->max_height));
+
++#if 0
+ g_print ("ranges: %d - %d; %d - %d\n",
+ screen->min_width, screen->max_width,
+ screen->min_height, screen->max_height);
++#endif
+
+ resources = XRRGetScreenResources (screen->xdisplay, screen->xroot);
+
@@ -1097,7 +1092,7 @@
+#endif
diff -up gnome-desktop-2.21.90/libgnome-desktop/Makefile.am.add-randr-12 gnome-desktop-2.21.90/libgnome-desktop/Makefile.am
--- gnome-desktop-2.21.90/libgnome-desktop/Makefile.am.add-randr-12 2008-01-27 18:44:20.000000000 -0500
-+++ gnome-desktop-2.21.90/libgnome-desktop/Makefile.am 2008-01-29 03:11:09.000000000 -0500
++++ gnome-desktop-2.21.90/libgnome-desktop/Makefile.am 2008-01-29 03:27:34.000000000 -0500
@@ -20,7 +20,8 @@ libgnome_desktop_2_la_SOURCES = \
gnome-desktop-item.c \
gnome-ditem-edit.c \
Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- gnome-desktop.spec 29 Jan 2008 08:36:48 -0000 1.114
+++ gnome-desktop.spec 31 Jan 2008 19:41:37 -0000 1.115
@@ -13,7 +13,7 @@
Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop
Version: 2.21.90
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/2.21/%{name}-%{version}.tar.bz2
License: GPLv2+ and LGPLv2+
@@ -122,6 +122,9 @@
%doc %{_datadir}/gtk-doc/html/gnome-desktop/
%changelog
+* Thu Jan 29 2008 Soren Sandmann <sandmann at redhat.com> - 2.21.90-3
+- Update randrwrap.
+
* Tue Jan 29 2008 Soren Sandmann <sandmann at redhat.com> - 2.21.5-2
- uncomment stuff from gnome-common in configure.in
More information about the fedora-extras-commits
mailing list