boo#1106850
OBS-URL: https://build.opensuse.org/package/show/graphics/xfig?expand=0&rev=65
This commit is contained in:
parent
fef7d39412
commit
105ad5af85
@ -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 },
|
||||
|
@ -1,10 +1,10 @@
|
||||
---
|
||||
src/main.c | 18 ++++++++++++------
|
||||
src/main.c | 20 ++++++++++++++------
|
||||
src/u_print.c | 1 +
|
||||
2 files changed, 13 insertions(+), 6 deletions(-)
|
||||
2 files changed, 15 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,26 +37,28 @@
|
||||
|
||||
#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;
|
||||
+
|
||||
/************************************************************/
|
||||
/* if the international option has been set, set the locale */
|
||||
/************************************************************/
|
||||
@@ -1612,6 +1613,11 @@ setup_visual(int *argc_p, char **argv, A
|
||||
@@ -1612,6 +1613,13 @@ setup_visual(int *argc_p, char **argv, A
|
||||
*/
|
||||
tool = XtAppInitialize (&tool_app, "Fig", options, XtNumber (options), argc_p, argv,
|
||||
(String *) NULL, args, 0);
|
||||
+#ifdef I18N
|
||||
+ setlocale(LC_ALL, "");
|
||||
+ setlocale(LC_NUMERIC, "C");
|
||||
+ if (strcasestr(nl_langinfo(CODESET),"UTF-8"))
|
||||
+ setlocale(LC_CTYPE, "C");
|
||||
+ XtSetLanguageProc(tool_app, NULL, NULL);
|
||||
+#endif /* I18N */
|
||||
/* save important info */
|
||||
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 @@
|
||||
*
|
||||
*/
|
||||
|
10
xfig.changes
10
xfig.changes
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 6 11:32:18 UTC 2018 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- 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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user