rpms/gnome-desktop/devel add-randr-12.patch, 1.16, 1.17 gnome-desktop.spec, 1.139, 1.140
Soren Sandmann Pedersen (ssp)
fedora-extras-commits at redhat.com
Wed Apr 9 03:51:09 UTC 2008
- Previous message (by thread): rpms/firefox/devel .cvsignore, 1.85, 1.86 firefox.spec, 1.300, 1.301 sources, 1.97, 1.98
- Next message (by thread): rpms/gdm/devel gdm.spec,1.367,1.368 sources,1.88,1.89
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ssp
Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23017
Modified Files:
add-randr-12.patch gnome-desktop.spec
Log Message:
Fix dpi miscalculation
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- add-randr-12.patch 5 Apr 2008 16:40:52 -0000 1.16
+++ add-randr-12.patch 9 Apr 2008 03:50:50 -0000 1.17
@@ -1,6 +1,6 @@
-diff -up /dev/null gnome-desktop-2.22.0/libgnome-desktop/randrwrap.c
+diff -up /dev/null gnome-desktop-2.22.1/libgnome-desktop/randrwrap.c
--- /dev/null 2008-03-16 00:14:46.954006998 -0400
-+++ gnome-desktop-2.22.0/libgnome-desktop/randrwrap.c 2008-04-05 12:33:34.000000000 -0400
++++ gnome-desktop-2.22.1/libgnome-desktop/randrwrap.c 2008-04-08 23:39:06.000000000 -0400
@@ -0,0 +1,1124 @@
+#define I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
+#include "libgnomeui/randrwrap.h"
@@ -1126,9 +1126,9 @@
+ return 0;
+}
+#endif
-diff -up /dev/null gnome-desktop-2.22.0/libgnome-desktop/display-name.c
+diff -up /dev/null gnome-desktop-2.22.1/libgnome-desktop/display-name.c
--- /dev/null 2008-03-16 00:14:46.954006998 -0400
-+++ gnome-desktop-2.22.0/libgnome-desktop/display-name.c 2008-04-05 12:33:34.000000000 -0400
++++ gnome-desktop-2.22.1/libgnome-desktop/display-name.c 2008-04-08 23:39:06.000000000 -0400
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2007 Red Hat, Inc.
@@ -1382,9 +1382,9 @@
+ else
+ return g_strdup_printf ("%s\n", vendor);
+}
-diff -up /dev/null gnome-desktop-2.22.0/libgnome-desktop/libgnomeui/monitor-db.h
+diff -up /dev/null gnome-desktop-2.22.1/libgnome-desktop/libgnomeui/monitor-db.h
--- /dev/null 2008-03-16 00:14:46.954006998 -0400
-+++ gnome-desktop-2.22.0/libgnome-desktop/libgnomeui/monitor-db.h 2008-04-05 12:33:34.000000000 -0400
++++ gnome-desktop-2.22.1/libgnome-desktop/libgnomeui/monitor-db.h 2008-04-08 23:39:06.000000000 -0400
@@ -0,0 +1,56 @@
+#ifndef I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
+#error This is not for general consumption yet.
@@ -1442,9 +1442,9 @@
+ RWScreen *screen);
+
+#endif
-diff -up /dev/null gnome-desktop-2.22.0/libgnome-desktop/libgnomeui/randrwrap.h
+diff -up /dev/null gnome-desktop-2.22.1/libgnome-desktop/libgnomeui/randrwrap.h
--- /dev/null 2008-03-16 00:14:46.954006998 -0400
-+++ gnome-desktop-2.22.0/libgnome-desktop/libgnomeui/randrwrap.h 2008-04-05 12:33:34.000000000 -0400
++++ gnome-desktop-2.22.1/libgnome-desktop/libgnomeui/randrwrap.h 2008-04-08 23:39:06.000000000 -0400
@@ -0,0 +1,100 @@
+#ifndef I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
+#error This is not yet for general consumption.
@@ -1546,9 +1546,9 @@
+ RWRotation rotation);
+
+#endif
-diff -up gnome-desktop-2.22.0/libgnome-desktop/libgnomeui/Makefile.am.add-randr-12 gnome-desktop-2.22.0/libgnome-desktop/libgnomeui/Makefile.am
---- gnome-desktop-2.22.0/libgnome-desktop/libgnomeui/Makefile.am.add-randr-12 2008-03-10 16:44:42.000000000 -0400
-+++ gnome-desktop-2.22.0/libgnome-desktop/libgnomeui/Makefile.am 2008-04-03 14:24:06.000000000 -0400
+diff -up gnome-desktop-2.22.1/libgnome-desktop/libgnomeui/Makefile.am.add-randr-12 gnome-desktop-2.22.1/libgnome-desktop/libgnomeui/Makefile.am
+--- gnome-desktop-2.22.1/libgnome-desktop/libgnomeui/Makefile.am.add-randr-12 2008-04-07 17:18:12.000000000 -0400
++++ gnome-desktop-2.22.1/libgnome-desktop/libgnomeui/Makefile.am 2008-04-08 23:39:06.000000000 -0400
@@ -2,4 +2,7 @@ libgnomeui_desktopdir = $(includedir)/gn
libgnomeui_desktop_HEADERS = \
gnome-ditem-edit.h \
@@ -1558,10 +1558,10 @@
+ randrwrap.h \
+ monitor-db.h
+
-diff -up /dev/null gnome-desktop-2.22.0/libgnome-desktop/monitor-db.c
+diff -up /dev/null gnome-desktop-2.22.1/libgnome-desktop/monitor-db.c
--- /dev/null 2008-03-16 00:14:46.954006998 -0400
-+++ gnome-desktop-2.22.0/libgnome-desktop/monitor-db.c 2008-04-05 12:33:34.000000000 -0400
-@@ -0,0 +1,1309 @@
++++ gnome-desktop-2.22.1/libgnome-desktop/monitor-db.c 2008-04-08 23:42:08.000000000 -0400
+@@ -0,0 +1,1308 @@
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
@@ -2765,11 +2765,10 @@
+ * can consist of many monitors. So just pick a size that make the
+ * dpi 96.
+ *
-+ * Firefox apparently believes what X tells it. It is a foolish
-+ * application.
++ * Firefox and evince apparently believe what X tells them.
+ */
-+ width_mm = (width * 96.0) * 25.4;
-+ height_mm = (height * 96.0) * 25.4;
++ width_mm = (width / 96.0) * 25.4 + 0.5;
++ height_mm = (height / 96.0) * 25.4 + 0.5;
+
+ rw_screen_set_size (assign->screen, width, height, width_mm, height_mm);
+
@@ -2871,9 +2870,9 @@
+ return NULL;
+ }
+}
-diff -up /dev/null gnome-desktop-2.22.0/libgnome-desktop/edid-parse.c
+diff -up /dev/null gnome-desktop-2.22.1/libgnome-desktop/edid-parse.c
--- /dev/null 2008-03-16 00:14:46.954006998 -0400
-+++ gnome-desktop-2.22.0/libgnome-desktop/edid-parse.c 2008-04-05 12:33:34.000000000 -0400
++++ gnome-desktop-2.22.1/libgnome-desktop/edid-parse.c 2008-04-08 23:39:06.000000000 -0400
@@ -0,0 +1,551 @@
+/*
+ * Copyright 2007 Red Hat, Inc.
@@ -3426,9 +3425,9 @@
+
+ return info;
+}
-diff -up gnome-desktop-2.22.0/libgnome-desktop/Makefile.am.add-randr-12 gnome-desktop-2.22.0/libgnome-desktop/Makefile.am
---- gnome-desktop-2.22.0/libgnome-desktop/Makefile.am.add-randr-12 2008-03-10 16:44:42.000000000 -0400
-+++ gnome-desktop-2.22.0/libgnome-desktop/Makefile.am 2008-04-03 14:24:06.000000000 -0400
+diff -up gnome-desktop-2.22.1/libgnome-desktop/Makefile.am.add-randr-12 gnome-desktop-2.22.1/libgnome-desktop/Makefile.am
+--- gnome-desktop-2.22.1/libgnome-desktop/Makefile.am.add-randr-12 2008-04-07 17:18:13.000000000 -0400
++++ gnome-desktop-2.22.1/libgnome-desktop/Makefile.am 2008-04-08 23:39:06.000000000 -0400
@@ -20,7 +20,12 @@ libgnome_desktop_2_la_SOURCES = \
gnome-desktop-item.c \
gnome-ditem-edit.c \
@@ -3443,9 +3442,9 @@
libgnome_desktop_2_la_LIBADD = \
$(XLIB_LIBS) \
-diff -up /dev/null gnome-desktop-2.22.0/libgnome-desktop/edid.h
+diff -up /dev/null gnome-desktop-2.22.1/libgnome-desktop/edid.h
--- /dev/null 2008-03-16 00:14:46.954006998 -0400
-+++ gnome-desktop-2.22.0/libgnome-desktop/edid.h 2008-04-05 12:33:34.000000000 -0400
++++ gnome-desktop-2.22.1/libgnome-desktop/edid.h 2008-04-08 23:39:06.000000000 -0400
@@ -0,0 +1,170 @@
+typedef unsigned char uchar;
+typedef struct MonitorInfo MonitorInfo;
@@ -3617,9 +3616,9 @@
+MonitorInfo *decode_edid (const uchar *data);
+char * make_display_name (const char *output_name,
+ const MonitorInfo *info);
-diff -up gnome-desktop-2.22.0/configure.in.add-randr-12 gnome-desktop-2.22.0/configure.in
---- gnome-desktop-2.22.0/configure.in.add-randr-12 2008-03-10 17:02:23.000000000 -0400
-+++ gnome-desktop-2.22.0/configure.in 2008-04-03 14:24:06.000000000 -0400
+diff -up gnome-desktop-2.22.1/configure.in.add-randr-12 gnome-desktop-2.22.1/configure.in
+--- gnome-desktop-2.22.1/configure.in.add-randr-12 2008-04-07 17:27:00.000000000 -0400
++++ gnome-desktop-2.22.1/configure.in 2008-04-08 23:39:06.000000000 -0400
@@ -51,10 +51,10 @@ AC_SUBST(GNOME_MICRO)
AC_SUBST(GNOME_DISTRIBUTOR)
AC_SUBST(GNOME_DATE)
Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gnome-desktop.spec 7 Apr 2008 23:03:32 -0000 1.139
+++ gnome-desktop.spec 9 Apr 2008 03:50:50 -0000 1.140
@@ -12,7 +12,7 @@
Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop
Version: 2.22.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/2.22/%{name}-%{version}.tar.bz2
License: GPLv2+ and LGPLv2+
@@ -126,6 +126,9 @@
%doc %{_datadir}/gtk-doc/html/gnome-desktop/
%changelog
+* Tue Apr 8 2008 Soren Sandmann <sandmann at redhat.com> - 2.22.1-2
+- Fix bug where the dpi of the screen got miscalculated
+
* Mon Apr 7 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.1-1
- Update to 2.22.1
- Previous message (by thread): rpms/firefox/devel .cvsignore, 1.85, 1.86 firefox.spec, 1.300, 1.301 sources, 1.97, 1.98
- Next message (by thread): rpms/gdm/devel gdm.spec,1.367,1.368 sources,1.88,1.89
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list