summaryrefslogtreecommitdiff
path: root/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss123next@list.ru>2016-11-16 16:17:00 +0300
committerGluzskiy Alexandr <sss123next@list.ru>2016-11-16 16:17:00 +0300
commit0e59ba2a077fefec1380b177edf3c1fa6ca69e80 (patch)
tree67effca017dff8da888ae4dfd7001d5971b933ac /x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
parentdd62b119b237dbb1e047186cec3a8b53c65b4db7 (diff)
wine: sync with gentoo upstream (looks like separated ebuild does not required anymore)
removed outdated eclasses
Diffstat (limited to 'x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch')
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
new file mode 100644
index 0000000..57c7349
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
@@ -0,0 +1,53 @@
+diff -u13 -r xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c xorg-server-1.12.3/hw/xfree86/loader/loadmod.c
+--- xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c 2012-09-05 18:26:42.000000000 +0200
++++ xorg-server-1.12.3/hw/xfree86/loader/loadmod.c 2012-09-05 18:28:54.000000000 +0200
+@@ -1109,39 +1109,38 @@
+ static void
+ RemoveChild(ModuleDescPtr child)
+ {
+ ModuleDescPtr mdp;
+ ModuleDescPtr prevsib;
+ ModuleDescPtr parent;
+
+ if (!child->parent)
+ return;
+
+ parent = child->parent;
+ if (parent->child == child) {
+ parent->child = child->sib;
+- return;
+- }
+-
+- prevsib = parent->child;
+- mdp = prevsib->sib;
+- while (mdp && mdp != child) {
+- prevsib = mdp;
+- mdp = mdp->sib;
++ }
++ else {
++ prevsib = parent->child;
++ mdp = prevsib->sib;
++ while (mdp && mdp != child) {
++ prevsib = mdp;
++ mdp = mdp->sib;
++ }
++ if (mdp == child)
++ prevsib->sib = child->sib;
+ }
+- if (mdp == child)
+- prevsib->sib = child->sib;
+ child->sib = NULL;
+- return;
+ }
+
+ void
+ LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
+ {
+ const char *msg;
+ MessageType type = X_ERROR;
+
+ switch (errmaj) {
+ case LDR_NOERROR:
+ msg = "no error";
+ break;
+ case LDR_NOMEM: