X Strike Force X.Org X11 SVN commit: r1941 - in trunk/xserver/xorg-server-1.0.2/debian: . patches
Author: dnusinow
Date: 2006-04-22 16:44:39 -0400 (Sat, 22 Apr 2006)
New Revision: 1941
Added:
trunk/xserver/xorg-server-1.0.2/debian/patches/14_debian_always_look_in_our_module_path.diff
Modified:
trunk/xserver/xorg-server-1.0.2/debian/changelog
trunk/xserver/xorg-server-1.0.2/debian/patches/series
Log:
* Add 014_debian_always_look_in_our_module_path.diff. This will cause the
server to always look in the default module path even if they've specified
an alternate path in their xorg.conf file via the ModulePath option. A
note to users: you should remove this part of your xorg.conf unless you
need it, as the server will look in the right place for modules if you
don't specify a location.
Modified: trunk/xserver/xorg-server-1.0.2/debian/changelog
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-04-22 20:42:03 UTC (rev 1940)
+++ trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-04-22 20:44:39 UTC (rev 1941)
@@ -5,12 +5,18 @@
(closes: #362641)
* Re-add xvfb-run and manpage to xvfb package. Thanks Josselin Mouette and
Jamie Wilkinson. (closes: #363494)
+ * Add 014_debian_always_look_in_our_module_path.diff. This will cause the
+ server to always look in the default module path even if they've specified
+ an alternate path in their xorg.conf file via the ModulePath option. A
+ note to users: you should remove this part of your xorg.conf unless you
+ need it, as the server will look in the right place for modules if you
+ don't specify a location.
[ Denis Barbier ]
* Add 13_debian_add_xkbpath_env_variable.diff so that the server takes
the XKBPATH environment variable into account. (closes: #363229)
- -- David Nusinow <dnusinow@debian.org> Sat, 22 Apr 2006 11:21:19 -0400
+ -- David Nusinow <dnusinow@debian.org> Sat, 22 Apr 2006 16:43:35 -0400
xorg-server (1:1.0.2-5) unstable; urgency=low
Added: trunk/xserver/xorg-server-1.0.2/debian/patches/14_debian_always_look_in_our_module_path.diff
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/patches/14_debian_always_look_in_our_module_path.diff 2006-04-22 20:42:03 UTC (rev 1940)
+++ trunk/xserver/xorg-server-1.0.2/debian/patches/14_debian_always_look_in_our_module_path.diff 2006-04-22 20:44:39 UTC (rev 1941)
@@ -0,0 +1,15 @@
+Index: xorg-server-1.0.2/hw/xfree86/common/xf86Config.c
+===================================================================
+--- xorg-server-1.0.2.orig/hw/xfree86/common/xf86Config.c 2006-04-22 12:24:18.000000000 -0400
++++ xorg-server-1.0.2/hw/xfree86/common/xf86Config.c 2006-04-22 12:29:21.000000000 -0400
+@@ -696,7 +696,9 @@
+
+ if (fileconf) {
+ if (xf86ModPathFrom != X_CMDLINE && fileconf->file_modulepath) {
+- xf86ModulePath = fileconf->file_modulepath;
++ char *mpath = xnfalloc(strlen(DEFAULT_MODULE_PATH) + strlen(fileconf->file_modulepath) + 2);
++ sprintf(mpath, "%s,%s", fileconf->file_modulepath, DEFAULT_MODULE_PATH);
++ xf86ModulePath = mpath;
+ xf86ModPathFrom = X_CONFIG;
+ }
+ }
Modified: trunk/xserver/xorg-server-1.0.2/debian/patches/series
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/patches/series 2006-04-22 20:42:03 UTC (rev 1940)
+++ trunk/xserver/xorg-server-1.0.2/debian/patches/series 2006-04-22 20:44:39 UTC (rev 1941)
@@ -11,3 +11,4 @@
11_debian_always_use_default_font_path.diff -p1
12_security_policy_in_etc.diff -p1
13_debian_add_xkbpath_env_variable.diff
+14_debian_always_look_in_our_module_path.diff
Reply to: