diff --git a/xfig.3.2.3d-international-std-fonts.dif b/xfig.3.2.3d-international-std-fonts.dif index 8c35ff7..dc79b10 100644 --- a/xfig.3.2.3d-international-std-fonts.dif +++ b/xfig.3.2.3d-international-std-fonts.dif @@ -6,35 +6,35 @@ XtOffset(appresPtr, fixed_fontset), XtRString, - (caddr_t) "-*-times-medium-r-normal--16-*-*-*-*-*-*-*," - "-*-*-medium-r-normal--16-*-*-*-*-*-*-*,*--16-*" }, -+ (caddr_t) "-URW-Nimbus Roman No9 L-medium-r-normal--34-*-*-*-*-*-*-*," -+ "-kochi-mincho-medium-r-normal--34-*-*-*-*-*-jisx0208.1983-0," -+ "-baekmukttf-batang-medium-r-normal--34-*-*-*-*-*-ksc5601.1987-0," -+ "-*-times-medium-r-normal--34-*-*-*-*-*-*-*," -+ "-*-*-medium-r-normal--34-*-*-*-*-*-*-*,*--34-*" -+ "-*-times-medium-r-normal--16-*-*-*-*-*-*-*," -+ "-*-*-medium-r-normal--16-*-*-*-*-*-*-*,*--16-*" ++ (caddr_t) "-urw-nimbus roman no9 l-medium-r-normal--34-*-*-*-*-*-*-*," ++ "-*-*-medium-r-normal--34-*-*-*-*-*-jisx0208.1983-0," ++ "-*-*-medium-r-normal--34-*-*-*-*-*-ksc5601.1987-0," ++ "-*-times-medium-r-normal--34-*-*-*-*-*-*-*," ++ "-*-*-medium-r-normal--34-*-*-*-*-*-*-*,*--34-*," ++ "-*-times-medium-r-normal--16-*-*-*-*-*-*-*," ++ "-*-*-medium-r-normal--16-*-*-*-*-*-*-*,*--16-*" + }, /* + {"normalFontSet", "NormalFontSet", XtRFontSet, sizeof(XFontSet), + XtOffset(appresPtr, normal_fontset), XtRString, -+ (caddr_t) "-URW-Nimbus Roman No9 L-medium-r-normal--34-*-*-*-*-*-*-*," -+ "-kochi-mincho-medium-r-normal--34-*-*-*-*-*-jisx0208.1983-0," -+ "-baekmukttf-batang-medium-r-normal--34-*-*-*-*-*-ksc5601.1987-0," -+ "-*-times-medium-r-normal--34-*-*-*-*-*-*-*," ++ (caddr_t) "-urw-nimbus roman no9 l-medium-r-normal--34-*-*-*-*-*-*-*," ++ "-*-*-medium-r-normal--34-*-*-*-*-*-jisx0208.1983-0," ++ "-*-*-medium-r-normal--34-*-*-*-*-*-ksc5601.1987-0," ++ "-*-times-medium-r-normal--34-*-*-*-*-*-*-*," + "-*-*-medium-r-normal--34-*-*-*-*-*-*-*," -+ "-*-*-*-r-*--34-*-*-*-*-*-*-*" -+ "-*-times-medium-r-normal--16-*-*-*-*-*-*-*," -+ "-*-*-medium-r-normal--16-*-*-*-*-*-*-*,*--16-*" ++ "-*-*-*-r-*--34-*-*-*-*-*-*-*," ++ "-*-times-medium-r-normal--16-*-*-*-*-*-*-*," ++ "-*-*-medium-r-normal--16-*-*-*-*-*-*-*,*--16-*" + }, + {"boldFontSet", "BoldFontSet", XtRFontSet, sizeof(XFontSet), + XtOffset(appresPtr, bold_fontset), XtRString, -+ (caddr_t) "-URW-Nimbus Roman No9 L-bold-r-normal--34-*-*-*-*-*-*-*," -+ "-kochi-gothic-medium-r-normal--34-*-*-*-*-*-jisx0208.1983-0," -+ "-baekmukttf-dotum-medium-r-normal--34-*-*-*-*-*-ksc5601.1987-0," -+ "-*-times-bold-r-normal--34-*-*-*-*-*-*-*," ++ (caddr_t) "-urw-nimbus roman no9 l-bold-r-normal--34-*-*-*-*-*-*-*," ++ "-*-*-bold-r-normal--34-*-*-*-*-*-jisx0208.1983-0," ++ "-*-*-bold-r-normal--34-*-*-*-*-*-ksc5601.1987-0," ++ "-*-times-bold-r-normal--34-*-*-*-*-*-*-*," + "-*-*-bold-r-normal--34-*-*-*-*-*-*-*," -+ "-*-*-*-r-*--34-*-*-*-*-*-*-*" -+ "-*-times-medium-r-normal--16-*-*-*-*-*-*-*," -+ "-*-*-medium-r-normal--16-*-*-*-*-*-*-*,*--16-*" ++ "-*-*-*-r-*--34-*-*-*-*-*-*-*," ++ "-*-times-medium-r-normal--16-*-*-*-*-*-*-*," ++ "-*-*-medium-r-normal--16-*-*-*-*-*-*-*,*--16-*" + }, */ {"fontSetSize", "FontSetSize", XtRInt, sizeof(int), XtOffset(appresPtr, fontset_size), XtRImmediate, (caddr_t)0 }, diff --git a/xfig.3.2.5b-locale.dif b/xfig.3.2.5b-locale.dif index 315e166..a47bb68 100644 --- a/xfig.3.2.5b-locale.dif +++ b/xfig.3.2.5b-locale.dif @@ -4,7 +4,7 @@ 2 files changed, 13 insertions(+), 6 deletions(-) --- src/main.c -+++ src/main.c 2018-05-07 07:27:07.684524349 +0000 ++++ src/main.c 2018-09-06 11:16:21.842867881 +0000 @@ -59,11 +59,13 @@ /* input extensions for an input tablet */ @@ -37,7 +37,7 @@ #ifdef I18N + if (NULL == strcasestr(nl_langinfo(CODESET),"ANSI") && -+ NULL == strcasestr(nl_langinfo(CODESET),"ISO-8859-1")) ++ NULL == strcasestr(nl_langinfo(CODESET),"ISO-8859-")) + appres.international = True; + /************************************************************/ @@ -56,7 +56,7 @@ tool_d = XtDisplay(tool); tool_s = XtScreen(tool); --- src/u_print.c -+++ src/u_print.c 2018-05-07 07:27:07.684524349 +0000 ++++ src/u_print.c 2018-09-06 09:47:09.839191953 +0000 @@ -16,6 +16,7 @@ * */ diff --git a/xfig.changes b/xfig.changes index ffb6437..36bf7f3 100644 --- a/xfig.changes +++ b/xfig.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Sep 10 10:31:03 UTC 2018 - sndirsch@suse.com + +- also require mkfontdir, so fonts-config can create the appropriate + fonts.dir/fonts.scale/encodings.dir files (boo#1106850) + +------------------------------------------------------------------- +Thu Sep 6 13:40:48 UTC 2018 - Dr. Werner Fink + +- Revert workaround from locale patch as it breaks UTF-8 text + in file and object handling + +------------------------------------------------------------------- +Thu Sep 6 11:32:18 UTC 2018 - Dr. Werner Fink + +- Add workaround in locale patch for systems with large endcoding.dir + below /usr/share/fonts/encodings (boo#1106850) + * With this fallback to "C" for LC_CTYPE is used for UTF-8 locales + to allow that Xt library will find a useful FontSet +- Require mkfontscale +- Modernize international-std-fonts patch to fit for more fonts + ------------------------------------------------------------------- Mon May 7 07:47:46 UTC 2018 - werner@suse.de diff --git a/xfig.spec b/xfig.spec index 9eee862..a39a878 100644 --- a/xfig.spec +++ b/xfig.spec @@ -38,6 +38,8 @@ Provides: xfig.3.2.3d Requires: efont-unicode Requires: ghostscript-fonts-std Requires: ifnteuro +Requires: mkfontdir +Requires: mkfontscale Requires: netpbm Requires: transfig Requires: xorg-x11-fonts