diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-11-01 15:31:16 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-11-01 15:31:16 +0100 |
| commit | e76f152bac5e5f5661644aef5d2ea6fed1116c9e (patch) | |
| tree | ea67da06e3f2f6878b8afdb1c417d340e79ed2a4 /patches/font-alias-1.0.3 | |
| parent | 0739441eb4651f7bc9e9ddfbe467b7b56c1c1874 (diff) | |
| download | ptxdist-e76f152bac5e5f5661644aef5d2ea6fed1116c9e.tar.gz ptxdist-e76f152bac5e5f5661644aef5d2ea6fed1116c9e.tar.xz | |
xorg-font-alias: clean up patches
Based on a patch by Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/font-alias-1.0.3')
| -rw-r--r-- | patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch (renamed from patches/font-alias-1.0.3/alias_variable_font_dir.diff) | 29 | ||||
| -rw-r--r-- | patches/font-alias-1.0.3/series | 5 |
2 files changed, 19 insertions, 15 deletions
diff --git a/patches/font-alias-1.0.3/alias_variable_font_dir.diff b/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch index f78811cc1..dd20525c3 100644 --- a/patches/font-alias-1.0.3/alias_variable_font_dir.diff +++ b/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch @@ -1,5 +1,6 @@ From: Luotao Fu <l.fu@pengutronix.de> -Subject: [patch] add 'variable' to 100dpi and 75dpi fonts.alias +Date: Sun, 30 Oct 2011 22:24:59 +0100 +Subject: [PATCH] add 'variable' to 100dpi and 75dpi fonts.alias The "variable" font point to helvectica, which only exists in 75dpi and 100dpi directories. Hence if an application queries for that variable it @@ -15,30 +16,30 @@ Signed-off-by: Luotao Fu <l.fu@pengutronix.de> 100dpi/fonts.alias | 1 + 75dpi/fonts.alias | 1 + misc/fonts.alias | 1 - - 3 files changed, 2 insertions(+), 1 deletion(-) + 3 files changed, 2 insertions(+), 1 deletions(-) -Index: font-alias-X11R7.0-1.0.1/100dpi/fonts.alias -=================================================================== ---- font-alias-X11R7.0-1.0.1.orig/100dpi/fonts.alias -+++ font-alias-X11R7.0-1.0.1/100dpi/fonts.alias +diff --git a/100dpi/fonts.alias b/100dpi/fonts.alias +index 9a4c461..9c5aa7b 100644 +--- a/100dpi/fonts.alias ++++ b/100dpi/fonts.alias @@ -1,3 +1,4 @@ +variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1 lucidasans-bolditalic-8 -b&h-lucida-bold-i-normal-sans-11-80-100-100-p-69-iso8859-1 lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-14-100-100-100-p-90-iso8859-1 lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-17-120-100-100-p-108-iso8859-1 -Index: font-alias-X11R7.0-1.0.1/75dpi/fonts.alias -=================================================================== ---- font-alias-X11R7.0-1.0.1.orig/75dpi/fonts.alias -+++ font-alias-X11R7.0-1.0.1/75dpi/fonts.alias +diff --git a/75dpi/fonts.alias b/75dpi/fonts.alias +index a3d464f..c3f9dd1 100644 +--- a/75dpi/fonts.alias ++++ b/75dpi/fonts.alias @@ -1,3 +1,4 @@ +variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1 lucidasans-bolditalic-8 -b&h-lucida-bold-i-normal-sans-8-80-75-75-p-49-iso8859-1 lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-10-100-75-75-p-67-iso8859-1 lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-12-120-75-75-p-79-iso8859-1 -Index: font-alias-X11R7.0-1.0.1/misc/fonts.alias -=================================================================== ---- font-alias-X11R7.0-1.0.1.orig/misc/fonts.alias -+++ font-alias-X11R7.0-1.0.1/misc/fonts.alias +diff --git a/misc/fonts.alias b/misc/fonts.alias +index 0398476..d4c49f2 100644 +--- a/misc/fonts.alias ++++ b/misc/fonts.alias @@ -1,6 +1,5 @@ ! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $ fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 diff --git a/patches/font-alias-1.0.3/series b/patches/font-alias-1.0.3/series index 23239fd15..35687bd3c 100644 --- a/patches/font-alias-1.0.3/series +++ b/patches/font-alias-1.0.3/series @@ -1 +1,4 @@ -alias_variable_font_dir.diff +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch +# 012ef328c65c9ff362f260b50e8a9835 - git-ptx-patches magic |