X Strike Force X.Org X11 SVN commit: r1807 - in trunk/xserver/xorg-server-1.0.2/debian: . patches
Author: dnusinow
Date: 2006-04-15 19:01:03 -0400 (Sat, 15 Apr 2006)
New Revision: 1807
Added:
trunk/xserver/xorg-server-1.0.2/debian/patches/11_debian_always_use_default_font_path.diff
Modified:
trunk/xserver/xorg-server-1.0.2/debian/changelog
trunk/xserver/xorg-server-1.0.2/debian/patches/series
Log:
* Add 11_debian_always_use_default_font_path.diff from Eugene Konev. This
patch causes the server to add the default font path to whatever the user
has specified. Right now, that's /usr/share/fonts/X11, as defined on
configure in debian/rules. Thanks Eugene, this will definitely go a long
way.
Modified: trunk/xserver/xorg-server-1.0.2/debian/changelog
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-04-15 23:00:12 UTC (rev 1806)
+++ trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-04-15 23:01:03 UTC (rev 1807)
@@ -1,3 +1,13 @@
+xorg-server (1:1.0.2-5) unstable; urgency=low
+
+ * Add 11_debian_always_use_default_font_path.diff from Eugene Konev. This
+ patch causes the server to add the default font path to whatever the user
+ has specified. Right now, that's /usr/share/fonts/X11, as defined on
+ configure in debian/rules. Thanks Eugene, this will definitely go a long
+ way.
+
+ -- David Nusinow <dnusinow@debian.org> Sat, 15 Apr 2006 13:56:16 -0400
+
xorg-server (1:1.0.2-4) unstable; urgency=low
* Document the need to update paths in xserver-xorg-core's NEWS file.
Added: trunk/xserver/xorg-server-1.0.2/debian/patches/11_debian_always_use_default_font_path.diff
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/patches/11_debian_always_use_default_font_path.diff 2006-04-15 23:00:12 UTC (rev 1806)
+++ trunk/xserver/xorg-server-1.0.2/debian/patches/11_debian_always_use_default_font_path.diff 2006-04-15 23:01:03 UTC (rev 1807)
@@ -0,0 +1,19 @@
+Index: xorg-server-1.0.2/hw/xfree86/common/xf86Config.c
+===================================================================
+--- xorg-server-1.0.2.orig/hw/xfree86/common/xf86Config.c 2006-04-15 17:01:15.000000000 +0800
++++ xorg-server-1.0.2/hw/xfree86/common/xf86Config.c 2006-04-15 17:02:43.000000000 +0800
+@@ -616,9 +616,11 @@
+ if (fileconf->file_fontpath) {
+ char *f = xf86ValidateFontPath(fileconf->file_fontpath);
+ pathFrom = X_CONFIG;
+- if (*f)
+- defaultFontPath = f;
+- else {
++ if (*f) {
++ char *fp = xnfalloc(strlen(defaultFontPath) + strlen(f) + 2);
++ sprintf(fp, "%s,%s", f, defaultFontPath);
++ defaultFontPath = fp;
++ } else {
+ xf86Msg(X_WARNING,
+ "FontPath is completely invalid. Using compiled-in default.\n");
+ fontPath = NULL;
Modified: trunk/xserver/xorg-server-1.0.2/debian/patches/series
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/patches/series 2006-04-15 23:00:12 UTC (rev 1806)
+++ trunk/xserver/xorg-server-1.0.2/debian/patches/series 2006-04-15 23:01:03 UTC (rev 1807)
@@ -8,3 +8,4 @@
08_s390_servermd.diff -p3
09_debian_xserver_rtff.diff -p0
10_dont_look_in_home_for_config.diff -p0
+11_debian_always_use_default_font_path.diff -p1
Reply to: