debian/changelog |
6 ++
debian/patches/40_default_dpi_96.patch |
8 +-
debian/patches/42_dont_break_grab_and_focus_for_window_when_redirecting.diff |
8 +-
debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff |
28 +++-------
debian/patches/51_xkb-and-loathing.diff |
10 +--
debian/patches/series |
2
6 files changed, 29 insertions(+), 33 deletions(-)
New commits:
commit 143ee91c09e1be56dedb8b76a8e92804e7e49b64
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Feb 25 14:37:33 2008 +0100
Re-enable patch 51_xkb-and-loathing.diff
Ignore SIGALRM around calls to Popen()/Pclose() to fix a hang when opening
menus in OpenOffice.org (once again closes: #433131)
Also refresh all patches to make patch-audit happy.
diff --git a/debian/changelog b/debian/changelog
index c58dd10..5af71a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,12 @@ xorg-server (2:1.4.1~git20080131-2) UNRELEASED; urgency=low
94_xprint_XSERVER_LIBS when we upgrade to xserver 1.5.
Closes: #448970.
+ [ Julien Cristau ]
+ * Re-enable patch 51_xkb-and-loathing.diff: ignore SIGALRM around calls to
+ Popen()/Pclose() to fix a hang when opening menus in OpenOffice.org
+ (once again closes: #433131)
+ * Refresh all patches to make patch-audit happy.
+
-- Drew Parsons <[EMAIL PROTECTED]> Mon, 25 Feb 2008 03:25:53 +1100
xorg-server (2:1.4.1~git20080131-1) unstable; urgency=low
diff --git a/debian/patches/40_default_dpi_96.patch
b/debian/patches/40_default_dpi_96.patch
index 5abd3e3..cfbe33c 100644
--- a/debian/patches/40_default_dpi_96.patch
+++ b/debian/patches/40_default_dpi_96.patch
@@ -6,11 +6,9 @@ Date: Sun Nov 18 11:57:01 2007 -0500
75 is just nonsense.
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 3da102f..4723f5a 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -120,7 +120,7 @@ extern RootWinPropPtr *xf86RegisteredPropertiesTable;
+--- xorg-server.orig/hw/xfree86/common/xf86Priv.h
++++ xorg-server/hw/xfree86/common/xf86Priv.h
+@@ -119,7 +119,7 @@
#define DEFAULT_LOG_VERBOSE 3
#endif
#ifndef DEFAULT_DPI
diff --git
a/debian/patches/42_dont_break_grab_and_focus_for_window_when_redirecting.diff
b/debian/patches/42_dont_break_grab_and_focus_for_window_when_redirecting.diff
index 38a7725..35951e0 100644
---
a/debian/patches/42_dont_break_grab_and_focus_for_window_when_redirecting.diff
+++
b/debian/patches/42_dont_break_grab_and_focus_for_window_when_redirecting.diff
@@ -19,11 +19,9 @@ Date: Wed Jan 16 20:24:11 2008 -0500
where compiz would cause gnome-screensaver to lose its grab when
compiz unredirects the fullscreen lock window.
-diff --git a/dix/window.c b/dix/window.c
-index 33cf76b..1ccf126 100644
---- a/dix/window.c
-+++ b/dix/window.c
-@@ -2993,7 +2993,8 @@ UnrealizeTree(
+--- xorg-server.orig/dix/window.c
++++ xorg-server/dix/window.c
+@@ -3023,7 +3023,8 @@
}
#endif
(* Unrealize)(pChild);
diff --git a/debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff
b/debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff
index b084669..f312fd5 100644
--- a/debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff
+++ b/debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff
@@ -8,11 +8,9 @@ It should cause the config file to override the EDID/BIOS
detected preferred mod
# modified: hw/xfree86/modes/xf86Crtc.c
# modified: hw/xfree86/modes/xf86Crtc.h
#
-diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
-index 086d2bf..31b6343 100644
---- a/hw/xfree86/common/xf86str.h
-+++ b/hw/xfree86/common/xf86str.h
-@@ -132,6 +132,7 @@ typedef enum {
+--- xorg-server.orig/hw/xfree86/common/xf86str.h
++++ xorg-server/hw/xfree86/common/xf86str.h
+@@ -132,6 +132,7 @@
# define M_T_DEFAULT 0x10 /* (VESA) default modes */
# define M_T_USERDEF 0x20 /* One of the modes from the config file */
# define M_T_DRIVER 0x40 /* Supplied by the driver (EDID, etc) */
@@ -20,11 +18,9 @@ index 086d2bf..31b6343 100644
/* Video mode */
typedef struct _DisplayModeRec {
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index d375da8..7196a2e 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -711,7 +711,8 @@ xf86DefaultMode (xf86OutputPtr output, int width, int
height)
+--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c
++++ xorg-server/hw/xfree86/modes/xf86Crtc.c
+@@ -711,7 +711,8 @@
for (mode = output->probed_modes; mode; mode = mode->next)
{
int dpi;
@@ -34,7 +30,7 @@ index d375da8..7196a2e 100644
int diff;
if (xf86ModeWidth (mode, output->initial_rotation) > width ||
-@@ -1415,7 +1416,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int
maxY)
+@@ -1415,7 +1416,7 @@
mode->prev = NULL;
output->probed_modes = mode;
}
@@ -43,7 +39,7 @@ index d375da8..7196a2e 100644
}
else
mode->type &= ~M_T_PREFERRED;
-@@ -1532,6 +1533,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
+@@ -1532,6 +1533,7 @@
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
int o, c;
DisplayModePtr target_mode = NULL;
@@ -51,7 +47,7 @@ index d375da8..7196a2e 100644
Rotation target_rotation = RR_Rotate_0;
xf86CrtcPtr *crtcs;
DisplayModePtr *modes;
-@@ -1572,43 +1574,34 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool
canGrow)
+@@ -1572,43 +1574,34 @@
}
/*
@@ -115,10 +111,8 @@ index d375da8..7196a2e 100644
for (o = 0; o < config->num_output; o++)
{
xf86OutputPtr output = config->output[o];
-diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
-index 9693e12..4c843cd 100644
---- a/hw/xfree86/modes/xf86Crtc.h
-+++ b/hw/xfree86/modes/xf86Crtc.h
+--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h
++++ xorg-server/hw/xfree86/modes/xf86Crtc.h
@@ -39,6 +39,9 @@
#ifndef M_T_DRIVER
#define M_T_DRIVER 0x40
diff --git a/debian/patches/51_xkb-and-loathing.diff
b/debian/patches/51_xkb-and-loathing.diff
index 704062a..fafbf14 100644
--- a/debian/patches/51_xkb-and-loathing.diff
+++ b/debian/patches/51_xkb-and-loathing.diff
@@ -8,9 +8,9 @@ https://bugs.freedesktop.org/show_bug.cgi?id=10525
Fixes #433131
---- xorg-server-1.3.0.0/os/utils.c.jx 2007-04-25 13:28:05.000000000 -0400
-+++ xorg-server-1.3.0.0/os/utils.c 2007-04-30 14:33:04.000000000 -0400
-@@ -1726,6 +1726,8 @@
+--- xorg-server.orig/os/utils.c
++++ xorg-server/os/utils.c
+@@ -1703,6 +1703,8 @@
int pid;
} *pidlist;
@@ -19,7 +19,7 @@ Fixes #433131
pointer
Popen(char *command, char *type)
{
-@@ -1747,11 +1749,15 @@
+@@ -1724,11 +1726,15 @@
return NULL;
}
@@ -35,7 +35,7 @@ Fixes #433131
return NULL;
case 0: /* child */
if (setgid(getgid()) == -1)
-@@ -1927,6 +1933,8 @@
+@@ -1904,6 +1910,8 @@
/* allow EINTR again */
OsReleaseSignals ();
diff --git a/debian/patches/series b/debian/patches/series
index e7e21ed..a90ab4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,7 +18,7 @@
45_only_XF86_APM_CAPABILITY_CHANGED_for_video_change_acpi_events.diff
46_reduce_wakeups_from_smart_scheduler.patch
#47_fbdevhw_magic_numbers.diff
-#51_xkb-and-loathing.diff
+51_xkb-and-loathing.diff
91_ttf2pt1
91_ttf2pt1_updates
92_xprint-security-holes-fix.patch
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
