debian/changelog | 11 +++
debian/patches/94_use_default_font_path.diff | 90 +++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 102 insertions(+)
New commits:
commit 4a2907fdaf132b9abacd705de6d4dbaeca3504dd
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Tue Apr 24 00:20:04 2007 -0400
Include 94_use_default_font_path.diff
This patch is like Eugene's patch to always look in the default font path
from the past, but now we provide an option to disable looking in the
default font path at runtime. This will allow people to specify additional
font paths in their xorg.conf without losing their current paths. This
will also help avoid people having ye olde "fixed font" problem.
diff --git a/debian/changelog b/debian/changelog
index c4b1b20..f365393 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg-server (2:1.3.0.0.dfsg-3) UNRElEASED; urgency=low
+
+ * Include 94_use_default_font_path.diff. This patch is like Eugene's patch
+ to always look in the default font path from the past, but now we provide
+ an option to disable looking in the default font path at runtime. This
+ will allow people to specify additional font paths in their xorg.conf
+ without losing their current paths. This will also help avoid people
+ having ye olde "fixed font" problem.
+
+ -- David Nusinow <[EMAIL PROTECTED]> Tue, 24 Apr 2007 00:18:04 -0400
+
xorg-server (2:1.3.0.0.dfsg-2) unstable; urgency=low
* Add Brice Goglin's fix for 05_module_defaults.diff, so that it also works
diff --git a/debian/patches/94_use_default_font_path.diff
b/debian/patches/94_use_default_font_path.diff
new file mode 100644
index 0000000..b548aee
--- /dev/null
+++ b/debian/patches/94_use_default_font_path.diff
@@ -0,0 +1,90 @@
+Index: xorg-server/hw/xfree86/common/xf86Config.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-04-24
00:16:32.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-04-24 00:17:32.000000000
-0400
+@@ -637,16 +637,24 @@
+ char *log_buf;
+
+ /* FontPath */
+-
+ /* Try XF86Config FontPath first */
+ if (!xf86fpFlag) {
+ if (fileconf) {
+ if (fileconf->file_fontpath) {
+ char *f = xf86ValidateFontPath(fileconf->file_fontpath);
+ pathFrom = X_CONFIG;
+- if (*f)
++ if (*f) {
++ if (xf86Info.useDefaultFontPath) {
++ xf86Msg(X_WARNING, "Including the default font path.\n");
++ char *g = xnfalloc(strlen(defaultFontPath) + strlen(f) + 2);
++ strcpy(g, f);
++ strcat(g, ",");
++ strcat(g, defaultFontPath);
++ defaultFontPath = g;
++ xfree(f);
++ }
+ defaultFontPath = f;
+- else {
++ } else {
+ xf86Msg(X_WARNING,
+ "FontPath is completely invalid. Using compiled-in default.\n");
+ fontPath = NULL;
+@@ -812,7 +820,8 @@
+ FLAG_HANDLE_SPECIAL_KEYS,
+ FLAG_RANDR,
+ FLAG_AIGLX,
+- FLAG_IGNORE_ABI
++ FLAG_IGNORE_ABI,
++ FLAG_USE_DEFAULT_FONT_PATH
+ } FlagValues;
+
+ static OptionInfoRec FlagOptions[] = {
+@@ -886,6 +895,8 @@
+ {0}, FALSE },
+ { FLAG_IGNORE_ABI, "IgnoreABI",
OPTV_BOOLEAN,
+ {0}, FALSE },
++ { FLAG_USE_DEFAULT_FONT_PATH, "UseDefaultFontPath",
OPTV_BOOLEAN,
++ {0}, FALSE },
+ { -1, NULL,
OPTV_NONE,
+ {0}, FALSE },
+ };
+@@ -1081,6 +1092,13 @@
+ xf86Info.aiglxFrom = X_CONFIG;
+ }
+
++ xf86Info.useDefaultFontPath = TRUE;
++ xf86Info.useDefaultFontPathFrom = X_DEFAULT;
++ if (xf86GetOptValBool(FlagOptions, FLAG_USE_DEFAULT_FONT_PATH, &value)) {
++ xf86Info.useDefaultFontPath = value;
++ xf86Info.useDefaultFontPathFrom = X_CONFIG;
++ }
++
+ /* Make sure that timers don't overflow CARD32's after multiplying */
+ #define MAX_TIME_IN_MIN (0x7fffffff / MILLI_PER_MIN)
+
+@@ -2814,9 +2832,9 @@
+
+ /* Now process everything else */
+
+- if (!configFiles(xf86configptr->conf_files) ||
+- !configServerFlags(xf86configptr->conf_flags,
++ if (!configServerFlags(xf86configptr->conf_flags,
+ xf86ConfigLayout.options) ||
++ !configFiles(xf86configptr->conf_files) ||
+ !configExtensions(xf86configptr->conf_extensions)
+ #ifdef XF86DRI
+ || !configDRI(xf86configptr->conf_dri)
+Index: xorg-server/hw/xfree86/common/xf86Privstr.h
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Privstr.h 2007-04-21
09:31:59.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Privstr.h 2007-04-24
00:17:32.000000000 -0400
+@@ -166,6 +166,8 @@
+ MessageType randRFrom;
+ Bool aiglx;
+ MessageType aiglxFrom;
++ Bool useDefaultFontPath;
++ MessageType useDefaultFontPathFrom;
+ Bool ignoreABI;
+ struct {
+ Bool disabled; /* enable/disable deactivating
diff --git a/debian/patches/series b/debian/patches/series
index cd19784..12f3434 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@
92_xprint-security-holes-fix.patch
93_spooltodir_check_file_exists
93_xprint_fonts_fix
+94_use_default_font_path.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
