← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xorg-server-lts-xenial/trusty-updates

« back to all changes in this revision

Viewing changes to debian/patches/05_Revert-Unload-submodules.diff

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2016-05-03 14:02:21 UTC
  • Revision ID: package-import@ubuntu.com-20160503140221-p5jty1kzz5nzj107
Tags: 2:1.18.3-1ubuntu2.2~trusty1
* Backport for lts-xenial stack.
  - revert configurable maxclients, avoid depending on newer coreproto
  - rules: work around ftbfs on ppc64el

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05_Revert-Unload-submodules.diff
 
1
From 272537ae14a04911fcf2fec51492fa0f91c4a676 Mon Sep 17 00:00:00 2001
 
2
From: Julien Cristau <jcristau@debian.org>
 
3
Date: Wed, 29 Aug 2012 20:16:40 +0200
 
4
Subject: [PATCH] Revert "Unload submodules."
 
5
 
 
6
This reverts commit 0d4bb5442ceb8e8e4a8de6cfc4203cae469eee72.
 
7
 
 
8
This doesn't seem to work quite well.  See Debian bug#686152.
 
9
---
 
10
 hw/xfree86/common/xf86Helper.c |    6 ++++++
 
11
 1 file changed, 6 insertions(+)
 
12
 
 
13
Index: xorg-server/hw/xfree86/common/xf86Helper.c
 
14
===================================================================
 
15
--- xorg-server.orig/hw/xfree86/common/xf86Helper.c
 
16
+++ xorg-server/hw/xfree86/common/xf86Helper.c
 
17
@@ -1636,7 +1636,13 @@ xf86LoadOneModule(const char *name, void
 
18
 void
 
19
 xf86UnloadSubModule(void *mod)
 
20
 {
 
21
+    /*
 
22
+     * This is disabled for now.  The loader isn't smart enough yet to undo
 
23
+     * relocations.
 
24
+     */
 
25
+#if 0
 
26
     UnloadSubModule(mod);
 
27
+#endif
 
28
 }
 
29
 
 
30
 Bool