xorg-server: Changes to 'debian-unstable'
debian/patches/94_use_default_font_path.diff | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
New commits:
commit f72c1b4144656e6bf4d560de5a15317e3c03fa41
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Apr 26 21:29:22 2007 -0400
Unfuck 94_use_default_font_path.diff
There was a stupid logic error previously. Now also explicitly log what
the default font path is when including it.
diff --git a/debian/patches/94_use_default_font_path.diff b/debian/patches/94_use_default_font_path.diff
index 47cf926..60aaff9 100644
--- a/debian/patches/94_use_default_font_path.diff
+++ b/debian/patches/94_use_default_font_path.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-04-24 21:39:54.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-04-24 21:39:54.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-04-24 23:43:28.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-04-26 21:22:35.000000000 -0400
@@ -637,16 +637,24 @@
char *log_buf;
@@ -14,18 +14,19 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
char *f = xf86ValidateFontPath(fileconf->file_fontpath);
pathFrom = X_CONFIG;
- if (*f)
+- defaultFontPath = f;
+- else {
+ if (*f) {
+ if (xf86Info.useDefaultFontPath) {
-+ xf86Msg(X_WARNING, "Including the default font path.\n");
-+ char *g = xnfalloc(strlen(defaultFontPath) + strlen(f) + 2);
++ xf86Msg(X_WARNING, "Including the default font path %s.\n", defaultFontPath);
++ char *g = xnfalloc(strlen(defaultFontPath) + strlen(f) + 3);
+ strcpy(g, f);
+ strcat(g, ",");
-+ strcat(g, defaultFontPath);
-+ defaultFontPath = g;
++ defaultFontPath = strcat(g, defaultFontPath);
+ xfree(f);
++ } else {
++ defaultFontPath = f;
+ }
- defaultFontPath = f;
-- else {
+ } else {
xf86Msg(X_WARNING,
"FontPath is completely invalid. Using compiled-in default.\n");
@@ -77,8 +78,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
|| !configDRI(xf86configptr->conf_dri)
Index: xorg-server/hw/xfree86/common/xf86Privstr.h
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Privstr.h 2007-04-24 21:33:59.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Privstr.h 2007-04-24 21:39:54.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Privstr.h 2007-04-24 23:43:28.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Privstr.h 2007-04-25 00:44:14.000000000 -0400
@@ -166,6 +166,8 @@
MessageType randRFrom;
Bool aiglx;
@@ -90,8 +91,8 @@ Index: xorg-server/hw/xfree86/common/xf86Privstr.h
Bool disabled; /* enable/disable deactivating
Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
===================================================================
---- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-24 21:40:36.000000000 -0400
-+++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-24 21:43:29.000000000 -0400
+--- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-24 23:43:28.000000000 -0400
++++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-25 00:44:14.000000000 -0400
@@ -664,6 +664,11 @@
.BI "Option \*qAIGLX\*q \*q" boolean \*q
enable or disable AIGLX. AIGLX is enabled by default.
Reply to: