summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2012-03-09 01:15:02 +0200
committerMart Raudsepp <leio@gentoo.org>2012-03-09 01:15:02 +0200
commitb450b8c162cd1957a9bb2d09f7073e597c6f7b17 (patch)
treed3e0d47c3c6dab77ead826fae07b50acdc46b44c /x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch
parentRemove ancient xorg-server-1.5 version (diff)
downloadloongson-b450b8c162cd1957a9bb2d09f7073e597c6f7b17.tar.gz
loongson-b450b8c162cd1957a9bb2d09f7073e597c6f7b17.tar.bz2
loongson-b450b8c162cd1957a9bb2d09f7073e597c6f7b17.zip
Remove ancient xorg-server-1.6 version
Diffstat (limited to 'x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch')
-rw-r--r--x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch102
1 files changed, 0 insertions, 102 deletions
diff --git a/x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch b/x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch
deleted file mode 100644
index eb3ec7d..0000000
--- a/x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From c6753b750d76564bee02b317d10a496d0ced4274 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Fri, 4 Sep 2009 23:05:29 +0200
-Subject: [PATCH] dix: append "built-ins" to the font path in SetDefaultFontPath
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on
-a "fixed" font go away but only Xorg could use the built-ins fonts by
-default.
-
-With this commit, all DDXs get "built-ins" appended to their FontPath, not
-just Xorg.
-
-Tested with Xorg, Xvfb and Xnest.
-
-Signed-off-by: RĂ©mi Cardona <remi@gentoo.org>
----
- dix/dixfonts.c | 20 ++++++++++++++++++--
- hw/xfree86/common/xf86Config.c | 16 ----------------
- 2 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/dix/dixfonts.c b/dix/dixfonts.c
-index 719bca4..4d69025 100644
---- a/dix/dixfonts.c
-+++ b/dix/dixfonts.c
-@@ -1818,6 +1818,9 @@ SetDefaultFontPath(char *path)
- unsigned char *cp,
- *pp,
- *nump,
-+ *temp_path,
-+ *start,
-+ *end,
- *newpath;
- int num = 1,
- len,
-@@ -1825,12 +1828,24 @@ SetDefaultFontPath(char *path)
- size = 0,
- bad;
-
-+ /* ensure temp_path contains "built-ins" */
-+ start = strstr(path, "built-ins");
-+ end = start + strlen("built-ins");
-+ if (start == NULL ||
-+ !((start == path || start[-1] == ',') && (!*end || *end == ','))) {
-+ temp_path = Xprintf("%s%sbuilt-ins", path, *path ? "," : "");
-+ } else {
-+ temp_path = Xstrdup(path);
-+ }
-+ if (!temp_path)
-+ return BadAlloc;
-+
- /* get enough for string, plus values -- use up commas */
-- len = strlen(path) + 1;
-+ len = strlen(temp_path) + 1;
- nump = cp = newpath = (unsigned char *) xalloc(len);
- if (!newpath)
- return BadAlloc;
-- pp = (unsigned char *) path;
-+ pp = (unsigned char *) temp_path;
- cp++;
- while (*pp) {
- if (*pp == ',') {
-@@ -1849,6 +1864,7 @@ SetDefaultFontPath(char *path)
- err = SetFontPathElements(num, newpath, &bad, TRUE);
-
- xfree(newpath);
-+ xfree(temp_path);
-
- return err;
- }
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 9376119..ddf4745 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -612,22 +612,6 @@ configFiles(XF86ConfFilesPtr fileconf)
- pathFrom = X_DEFAULT;
- temp_path = defaultFontPath ? defaultFontPath : "";
-
-- /* ensure defaultFontPath contains "built-ins" */
-- start = strstr(temp_path, "built-ins");
-- end = start + strlen("built-ins");
-- if (start == NULL ||
-- !((start == temp_path || start[-1] == ',') && (!*end || *end == ','))) {
-- defaultFontPath = Xprintf("%s%sbuilt-ins",
-- temp_path, *temp_path ? "," : "");
-- if (must_copy == TRUE) {
-- if (defaultFontPath != NULL) {
-- must_copy = FALSE;
-- }
-- } else {
-- /* already made a copy of the font path */
-- xfree(temp_path);
-- }
-- }
- /* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
- temp_path = must_copy ? XNFstrdup(defaultFontPath) : defaultFontPath;
- defaultFontPath = xf86ValidateFontPath(temp_path);
---
-1.6.4.2
-