Signed-off-by: Robert Schwebel <[email protected]> --- ...-variable-to-100dpi-and-75dpi-fonts.alias.patch | 53 ++++++++++++++++++++ .../font-alias-1.0.3/alias_variable_font_dir.diff | 48 ------------------ patches/font-alias-1.0.3/series | 1 - 3 files changed, 53 insertions(+), 49 deletions(-) create mode 100644 patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch delete mode 100644 patches/font-alias-1.0.3/alias_variable_font_dir.diff delete mode 100644 patches/font-alias-1.0.3/series
diff --git a/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch b/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch new file mode 100644 index 0000000..488ec02 --- /dev/null +++ b/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch @@ -0,0 +1,53 @@ +From d2d0e26f3e6e84db4527d35ca53cfbb0781d1333 Mon Sep 17 00:00:00 2001 +From: Luotao Fu <[email protected]> +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 +may fail. + +The font package mechanism is complicated, since directory structure on +the installation target is often not synchronic with the order of the font +packages. Various distributions solve this problem differently. Question +to mainline has yet received no answer. + +Signed-off-by: Luotao Fu <[email protected]> +--- + 100dpi/fonts.alias | 1 + + 75dpi/fonts.alias | 1 + + misc/fonts.alias | 1 - + 3 files changed, 2 insertions(+), 1 deletions(-) + +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 +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 +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 +-variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1 + 5x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1 + 5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1 + 6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1 +-- +1.7.7 + diff --git a/patches/font-alias-1.0.3/alias_variable_font_dir.diff b/patches/font-alias-1.0.3/alias_variable_font_dir.diff deleted file mode 100644 index f78811c..0000000 --- a/patches/font-alias-1.0.3/alias_variable_font_dir.diff +++ /dev/null @@ -1,48 +0,0 @@ -From: Luotao Fu <[email protected]> -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 -may fail. - -The font package mechanism is complicated, since directory structure on -the installation target is often not synchronic with the order of the font -packages. Various distributions solve this problem differently. Question -to mainline has yet received no answer. - -Signed-off-by: Luotao Fu <[email protected]> ---- - 100dpi/fonts.alias | 1 + - 75dpi/fonts.alias | 1 + - misc/fonts.alias | 1 - - 3 files changed, 2 insertions(+), 1 deletion(-) - -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 -@@ -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 -@@ -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 -@@ -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 --variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1 - 5x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1 - 5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1 - 6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1 diff --git a/patches/font-alias-1.0.3/series b/patches/font-alias-1.0.3/series deleted file mode 100644 index 23239fd..0000000 --- a/patches/font-alias-1.0.3/series +++ /dev/null @@ -1 +0,0 @@ -alias_variable_font_dir.diff -- 1.7.7 -- ptxdist mailing list [email protected]
