diff options
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch | 102 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.8.1.901.ebuild (renamed from x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild) | 2 |
3 files changed, 10 insertions, 104 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 73c7d9d53746..cef0e2d674a1 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.514 2010/06/04 13:57:09 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.515 2010/06/09 12:52:43 scarabeus Exp $ + +*xorg-server-1.8.1.901 (09 Jun 2010) + + 09 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.8.1-r1.ebuild, +xorg-server-1.8.1.901.ebuild, + -files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF + .patch: + Version bump. Drop old. 31 May 2010; Guy Martin <gmsoft@gentoo.org> xorg-server-1.7.6.ebuild: hppa stable, #308521 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 eb3ec7d6b181..000000000000 --- 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 - diff --git a/x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.8.1.901.ebuild index e8a1db2be5bb..697ce05407f2 100644 --- a/x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.8.1.901.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild,v 1.2 2010/05/20 14:28:12 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.1.901.ebuild,v 1.1 2010/06/09 12:52:43 scarabeus Exp $ EAPI=3 XORG_EAUTORECONF="yes" |