Author: daniel
Date: 2003-05-26 02:54:43 -0500 (Mon, 26 May 2003)
New Revision: 59
Modified:
branches/4.3.0/sid/debian/patches/910_Xserver_RTFF.diff
Log:
Update #910 per Branden's trunk update, which should get it building properly
with gcc3.3 again (get rid of multi-line string literals).
Modified: branches/4.3.0/sid/debian/patches/910_Xserver_RTFF.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/910_Xserver_RTFF.diff 2003-05-26
07:41:37 UTC (rev 58)
+++ branches/4.3.0/sid/debian/patches/910_Xserver_RTFF.diff 2003-05-26
07:54:43 UTC (rev 59)
@@ -1,11 +1,8 @@
-Give the user a far stronger clue as to what to do when their font
configuration
-is horribly screwed up; this patch by Branden Robinson.
-
--- xc/programs/Xserver/dix/Imakefile~ 2003-02-27 05:17:12.000000000 -0500
+++ xc/programs/Xserver/dix/Imakefile 2003-02-27 05:19:03.000000000 -0500
-@@ -77,9 +77,14 @@
+@@ -75,9 +75,14 @@
+ QUARTZ_DEFINES = -DDARWIN_WITH_QUARTZ
#endif
- #endif
+#if LinuxDistribution && (LinuxDistribution == LinuxDebian)
+ LINUX_DEFINES = -DDEBIAN
@@ -21,44 +18,44 @@
NormalLibraryTarget(dix,$(OBJS))
--- xc/programs/Xserver/dix/main.c~ 2003-02-27 05:13:14.000000000 -0500
+++ xc/programs/Xserver/dix/main.c 2003-02-27 05:31:45.000000000 -0500
-@@ -397,10 +397,44 @@
+@@ -416,10 +416,44 @@
defaultFontPath);
}
if (!SetDefaultFont(defaultTextFont))
+#ifdef DEBIAN
-+ FatalError("could not open default font '%s';
-+the X server's font paths might be misconfigured, remote font server(s)
-+may be unreachable, and/or local fonts may not be installed or are not
-+configured correctly.
-+
-+People inexperienced with the X Window System should have either the
-+\"x-window-system\" or \"x-window-system-core\" packages installed.
-+# apt-get install x-window-system-core
-+# apt-get install x-window-system
-+
-+Other useful commands to run include:
-+$ dpkg --status xserver-common
-+$ dpkg --status xfonts-base
-+$ zmore /usr/share/doc/xfree86-common/FAQ.gz", defaultTextFont);
++ FatalError("could not open default font '%s';\n"
++"the X server's font paths might be misconfigured, remote font server(s)\n"
++"may be unreachable, and/or local fonts may not be installed or are not\n"
++"configured correctly.\n"
++"\n"
++"People inexperienced with the X Window System should have either the\n"
++"\"x-window-system\" or \"x-window-system-core\" packages installed.\n"
++"# apt-get install x-window-system-core\n"
++"# apt-get install x-window-system\n"
++"\n"
++"Other useful commands to run include:\n"
++"$ dpkg --status xserver-common\n"
++"$ dpkg --status xfonts-base\n"
++"$ zmore /usr/share/doc/xfree86-common/FAQ.gz", defaultTextFont);
+#else
FatalError("could not open default font '%s'", defaultTextFont);
+#endif
if (!(rootCursor = CreateRootCursor(defaultCursorFont, 0)))
+#ifdef DEBIAN
-+ FatalError("could not open default cursor font '%s';
-+the X server's font paths might be misconfigured, remote font server(s)
-+may be unreachable, and/or local fonts may not be installed or are not
-+configured correctly.
-+
-+People inexperienced with the X Window System should have either the
-+\"x-window-system\" or \"x-window-system-core\" packages installed.
-+# apt-get install x-window-system-core
-+# apt-get install x-window-system
-+
-+Useful commands to run include:
-+$ dpkg --status xserver-common
-+$ dpkg --status xfonts-base
-+$ zmore /usr/share/doc/xfree86-common/FAQ.gz", defaultCursorFont);
++ FatalError("could not open default cursor font '%s';\n"
++"the X server's font paths might be misconfigured, remote font server(s)\n"
++"may be unreachable, and/or local fonts may not be installed or are not\n"
++"configured correctly.\n"
++"\n"
++"People inexperienced with the X Window System should have either the\n"
++"\"x-window-system\" or \"x-window-system-core\" packages installed.\n"
++"# apt-get install x-window-system-core\n"
++"# apt-get install x-window-system\n"
++"\n"
++"Useful commands to run include:\n"
++"$ dpkg --status xserver-common\n"
++"$ dpkg --status xfonts-base\n"
++"$ zmore /usr/share/doc/xfree86-common/FAQ.gz", defaultCursorFont);
+#else
FatalError("could not open default cursor font '%s'",
defaultCursorFont);
