rpms/gnome-desktop/devel give-me-back-my-rotations.patch, NONE, 1.1 pnpids.patch, NONE, 1.1 you-never-find-a-haystack-in-a-needle.patch, NONE, 1.1 gnome-desktop.spec, 1.209, 1.210

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24083

Modified Files:
	gnome-desktop.spec 
Added Files:
	give-me-back-my-rotations.patch pnpids.patch 
	you-never-find-a-haystack-in-a-needle.patch 
Log Message:
Add accumulated fixes from the F11 branch


give-me-back-my-rotations.patch:

--- NEW FILE give-me-back-my-rotations.patch ---
--- gnome-desktop-2.26.1/libgnome-desktop/gnome-rr.c	2009-04-13 18:00:20.000000000 -0400
+++ hacked/libgnome-desktop/gnome-rr.c	2009-04-28 19:28:37.168474903 -0400
@@ -329,6 +329,11 @@
     }
     else
     {
+        gnome_rr_screen_get_ranges (info->screen, 
+					 &(info->min_width),
+					 &(info->max_width),
+					 &(info->min_height),
+					 &(info->max_height));
 	/* XRRGetScreenResourcesCurrent is less expensive than
 	 * XRRGetScreenResources, however it is available only
 	 * in RandR 1.3 or higher

pnpids.patch:

--- NEW FILE pnpids.patch ---
--- gnome-desktop-2.26.1/libgnome-desktop/display-name.c	2009-05-06 16:19:08.498375080 -0400
+++ hacked/libgnome-desktop/display-name.c	2009-05-06 16:17:08.483375623 -0400
@@ -182,15 +182,58 @@
     { "???", "Unknown" },
 };
 
+static GHashTable *hwdata = NULL;
+
+#define PNP_IDS "/usr/share/hwdata/pnp.ids"
+
+static void
+read_hwdata (void)
+{
+    gchar *contents;
+    gchar **lines;
+    gchar *line;
+    gchar *code, *name;
+    gint i;
+
+    if (hwdata)
+        return;
+
+    hwdata = g_hash_table_new (g_str_hash, g_str_equal);
+
+    if (g_file_get_contents (PNP_IDS, &contents, NULL, NULL)) {
+        lines = g_strsplit (contents, "\n", -1);
+        for (i = 0; lines[i]; i++) {
+             line = lines[i];
+             if (line[3] == '\t') {
+                 code = line;
+                 line[3] = '\0';
+                 name = line + 4;
+                 g_hash_table_insert (hwdata, code, name);
+             }
+        }
+        g_free (lines);
+    }
+    g_free (contents);
+}
+
+
 static const char *
 find_vendor (const char *code)
 {
     int i;
+    const char *vendor_name;
+
+    read_hwdata ();
+
+    vendor_name = g_hash_table_lookup (hwdata, code);
+
+    if (vendor_name)
+      return vendor_name;
 
     for (i = 0; i < sizeof (vendors) / sizeof (vendors[0]); ++i)
     {
 	const Vendor *v = &(vendors[i]);
-	
+
 	if (strcmp (v->vendor_id, code) == 0)
 	    return v->vendor_name;
     }

you-never-find-a-haystack-in-a-needle.patch:

--- NEW FILE you-never-find-a-haystack-in-a-needle.patch ---
diff -up gnome-desktop-2.26.1/libgnome-desktop/display-name.c.unknown-monitors gnome-desktop-2.26.1/libgnome-desktop/display-name.c
--- gnome-desktop-2.26.1/libgnome-desktop/display-name.c.unknown-monitors	2009-04-13 18:00:20.000000000 -0400
+++ gnome-desktop-2.26.1/libgnome-desktop/display-name.c	2009-04-29 11:10:38.600717893 -0400
@@ -206,9 +206,9 @@ make_display_name (const char *output_na
     int width_mm, height_mm, inches;
 
     if (output_name &&
-	(strstr ("lvds", output_name)	||
-	 strstr ("LVDS", output_name)	||
-	 strstr ("Lvds", output_name)))
+	(strstr (output_name, "lvds")	||
+	 strstr (output_name, "LVDS")	||
+	 strstr (output_name, "Lvds")))
     {
 	vendor = _("Laptop");
     }


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- gnome-desktop.spec	14 Apr 2009 00:51:49 -0000	1.209
+++ gnome-desktop.spec	7 May 2009 00:30:56 -0000	1.210
@@ -12,9 +12,15 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.26/%{name}-%{version}.tar.bz2
+# fixed upstream
+Patch0: give-me-back-my-rotations.patch
+# fixed upstream
+Patch1: you-never-find-a-haystack-in-a-needle.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=581621
+Patch2: pnpids.patch
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +78,9 @@ libgnomedesktop.
 
 %prep
 %setup -q
+%patch0 -p1 -b .rotations
+%patch1 -p1 -b .unknown-monitors
+%patch2 -p1 -b .pnpids.patch
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper
@@ -117,6 +126,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed May  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-5
+- Read vendor names from hwdata, when available
+- Fix needle/haystack confusion causing most monitors to be 'Unknown'
+- Fix a case of disappearing rotations (#497515)
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/gnome-desktop/2.26/gnome-desktop-2.26.1.news