xorg-server: Changes to 'ubuntu'
Xext/panoramiXprocs.c | 2 +-
debian/changelog | 8 ++++++++
debian/patches/143_default_to_vesa.patch | 27 ---------------------------
debian/patches/158_raise_maxclients.patch | 12 ------------
debian/patches/series | 1 -
5 files changed, 9 insertions(+), 41 deletions(-)
New commits:
commit 983417484870620ecc29bb691158ee72b367ce2a
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Nov 22 16:58:46 2010 +1100
Remove 158_raise_maxclients.patch. This was never applied,
and it would have broken protocol if it had been
diff --git a/debian/patches/158_raise_maxclients.patch b/debian/patches/158_raise_maxclients.patch
deleted file mode 100644
index cc30d58..0000000
--- a/debian/patches/158_raise_maxclients.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nurp patched/include/misc.h working/include/misc.h
---- patched/include/misc.h 2009-02-05 01:09:03.000000000 -0800
-+++ working/include/misc.h 2009-02-05 02:12:57.000000000 -0800
-@@ -86,7 +86,7 @@ extern unsigned long serverGeneration;
- #ifndef MAXSCREENS
- #define MAXSCREENS 16
- #endif
--#define MAXCLIENTS 256
-+#define MAXCLIENTS 512
- #define MAXEXTENSIONS 128
- #define MAXFORMATS 8
- #define MAXDEVICES 20 /* input devices */
commit cecbfcb310b2a9caa5d0ef817496d3424a69a8d5
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Nov 22 16:48:58 2010 +1100
Remove 143_default_to_vesa.patch. It's obsolete with the proper
xorg.conf.d support, and is no longer applied
diff --git a/debian/patches/143_default_to_vesa.patch b/debian/patches/143_default_to_vesa.patch
deleted file mode 100644
index 086b644..0000000
--- a/debian/patches/143_default_to_vesa.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Binary files patched/.git/index and working/.git/index differ
-diff -Nurp patched/hw/xfree86/common/xf86AutoConfig.c working/hw/xfree86/common/xf86AutoConfig.c
---- patched/hw/xfree86/common/xf86AutoConfig.c 2008-10-21 09:49:35.000000000 -0700
-+++ working/hw/xfree86/common/xf86AutoConfig.c 2008-10-21 09:59:08.000000000 -0700
-@@ -422,6 +422,22 @@ matchDriverFromFiles (char** matches, ui
- }
- direntry = readdir(idsdir);
- }
-+ /* If we failed to find any driver, at least try 'vesa' (LP: #261977) */
-+ if (matches[0] == NULL) {
-+ xf86Msg(X_INFO, "No matches found for this device in %s\n", PCI_TXT_IDS_PATH);
-+
-+#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
-+ xf86Msg(X_DEFAULT, "Registering 'vesa' as fallback\n");
-+ matches[0] = xnfstrdup("vesa");
-+#elif defined(__sparc__) && !defined(sun)
-+ xf86Msg(X_DEFAULT, "Registering 'sunffb' as fallback\n");
-+ matches[0] = xnfstrdup("sunffb");
-+#else
-+ xf86Msg(X_DEFAULT, "Registering 'fbdev' as fallback\n");
-+ matches[0] = xnfstrdup("fbdev");
-+#endif
-+ }
-+
- end:
- xfree(line);
- closedir(idsdir);
diff --git a/debian/patches/series b/debian/patches/series
index 0efce13..b1b76b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,7 +13,6 @@
111_armel-drv-fallbacks.patch
121_only_switch_vt_when_active.diff
122_xext_fix_card32_overflow_in_xauth.patch
-#143_default_to_vesa.patch
157_check_null_modes.patch
162_null_crtc_in_rotation.patch
165_man_xorg_conf_no_device_ident.patch
commit 7b785c9e24d87a73941350c52c8e02e774c5c9ac
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Nov 22 13:16:04 2010 +1100
Document Xinerama-fixing cherry-pick
diff --git a/debian/changelog b/debian/changelog
index 251d35d..f0dca00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.9.0.902-1ubuntu2) UNRELEASED; urgency=low
+
+ * Cherry-pick 3effb61e from server-1.9 branch. Fixes a typo in Xinerama
+ support which caused Qt apps to crash X when using Xinerama multi-head
+ (LP: #650539)
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 22 Nov 2010 13:09:14 +1100
+
xorg-server (2:1.9.0.902-1ubuntu1) natty; urgency=low
* Merge from Debian experimental. Remaining Ubuntu changes:
commit 5869a75110a46340f2bd129413a9d5fe95513e1a
Author: Linus Arver <linusarver@gmail.com>
Date: Sun Oct 17 12:26:01 2010 -0700
Xext: panoramiXprocs: fix typo
This fixes a typo introduced in commit
80b5d3a3264d2c5167e5ac85a3b04af0f89cece1. The pointer pDst was changed
unintentionally to pWin from a copy/paste error. This resulted in all
QT-based apps and some tcl/tk ones (like fontforge) to crash X 1.9 on
starting up, when Xinerama was enabled.
Bug report: https://bbs.archlinux.org/viewtopic.php?id=106125
Signed-off-by: Elie Bleton <drozofil@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Tested-by: Linus Arver <linusarver@gmail.com>
(cherry picked from commit 78f94f19aab66a1e5331df0ce29f36e310b4195d)
(cherry picked from commit 3effb61e207478d92ebbcf5dfc75535cdd2dda12)
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 67b4030..d843168 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -634,7 +634,7 @@ int PanoramiXTranslateCoords(ClientPtr client)
rep.dstX = x - pDst->drawable.x;
rep.dstY = y - pDst->drawable.y;
if((pDst == screenInfo.screens[0]->root) ||
- (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid))
+ (pDst->drawable.id == screenInfo.screens[0]->screensaver.wid))
{
rep.dstX += screenInfo.screens[0]->x;
rep.dstY += screenInfo.screens[0]->y;
Reply to: