X-Git-Url: https://git.piment-noir.org/?p=deb_xorg-server.git;a=blobdiff_plain;f=debian%2Fpatches%2F05_Revert-Unload-submodules.diff;fp=debian%2Fpatches%2F05_Revert-Unload-submodules.diff;h=1cc8ff865c8fd9bc7347d77a3c297f0cf0ae7718;hp=0000000000000000000000000000000000000000;hb=7217e0ca50bba73dad94782e67980aeeb24ab693;hpb=a09e091a5c996d46a398abb27b06fe504591673f

diff --git a/debian/patches/05_Revert-Unload-submodules.diff b/debian/patches/05_Revert-Unload-submodules.diff
new file mode 100644
index 0000000..1cc8ff8
--- /dev/null
+++ b/debian/patches/05_Revert-Unload-submodules.diff
@@ -0,0 +1,28 @@
+From 272537ae14a04911fcf2fec51492fa0f91c4a676 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Wed, 29 Aug 2012 20:16:40 +0200
+Subject: [PATCH] Revert "Unload submodules."
+
+This reverts commit 0d4bb5442ceb8e8e4a8de6cfc4203cae469eee72.
+
+This doesn't seem to work quite well.  See Debian bug#686152.
+---
+ hw/xfree86/common/xf86Helper.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/hw/xfree86/common/xf86Helper.c
++++ b/hw/xfree86/common/xf86Helper.c
+@@ -1596,7 +1596,13 @@ xf86LoadOneModule(char *name, pointer op
+ void
+ xf86UnloadSubModule(pointer mod)
+ {
++    /*
++     * This is disabled for now.  The loader isn't smart enough yet to undo
++     * relocations.
++     */
++#if 0
+     UnloadSubModule(mod);
++#endif
+ }
+ 
+ Bool