diff --git a/mpage-restricted-fonts.patch b/mpage-restricted-fonts.patch new file mode 100644 index 0000000..2f49c2a --- /dev/null +++ b/mpage-restricted-fonts.patch @@ -0,0 +1,44 @@ +--- mpage-2.5.4/mpage.c.resticted-fonts 2004-05-31 04:41:25.000000000 +0900 ++++ mpage-2.5.4/mpage.c 2006-05-12 16:00:56.000000000 +0900 +@@ -326,23 +326,32 @@ + HSIZE - 2); + fprintf(outfd, "textfont setfont\n"); + fprintf(outfd, "(a) stringwidth pop /mp_a_x exch def\n"); ++ ++ if (current_locale){ ++ if (!strncmp (current_locale, "ja_JP", 5)){ + #ifdef KANJI + #ifdef GOTHIC +- fprintf(outfd, "/kanj /GothicBBB-Medium-H findfont %d scalefont def\n", fsize - 1); +- fprintf(outfd, "/han /GothicBBB-Medium.Hankaku findfont %d scalefont def\n", fsize - 1); ++ fprintf(outfd, "/kanj /GothicBBB-Medium-H findfont %d scalefont def\n", fsize - 1); ++ fprintf(outfd, "/han /GothicBBB-Medium.Hankaku findfont %d scalefont def\n", fsize - 1); + #else +- fprintf(outfd, "/kanj /Ryumin-Light-H findfont %d scalefont def\n", fsize - 1); +- fprintf(outfd, "/han /Ryumin-Light.Hankaku findfont %d scalefont def\n", fsize - 1); ++ fprintf(outfd, "/kanj /Ryumin-Light-H findfont %d scalefont def\n", fsize - 1); ++ fprintf(outfd, "/han /Ryumin-Light.Hankaku findfont %d scalefont def\n", fsize - 1); + #endif + #endif + #ifdef GOTHIC +- fprintf(outfd, "/unijis /GothicBBB-Medium-UniJIS-UTF8-H findfont %d scalefont def\n", fsize - 1); ++ fprintf(outfd, "/unijis /GothicBBB-Medium-UniJIS-UTF8-H findfont %d scalefont def\n", fsize - 1); + #else +- fprintf(outfd, "/unijis /Ryumin-Light-UniJIS-UTF8-H findfont %d scalefont def\n", fsize - 1); ++ fprintf(outfd, "/unijis /Ryumin-Light-UniJIS-UTF8-H findfont %d scalefont def\n", fsize - 1); + #endif +- fprintf(outfd, "/uniks /Baekmuk-Batang-UniKS-UTF8-H findfont %d scalefont def\n", fsize - 1); +- fprintf(outfd, "/unigb /BousungEG-Light-GB-UniGB-UTF8-H findfont %d scalefont def\n", fsize - 1); +- fprintf(outfd, "/unicns /ShanHeiSun-Light-UniCNS-UTF8-H findfont %d scalefont def\n", fsize - 1); ++ } ++ else if (!strncmp (current_locale, "ko_KR", 5)) ++ fprintf(outfd, "/uniks /Baekmuk-Batang-UniKS-UTF8-H findfont %d scalefont def\n", fsize - 1); ++ else if (!strncmp (current_locale, "zh_CN", 5)) ++ fprintf(outfd, "/unigb /BousungEG-Light-GB-UniGB-UTF8-H findfont %d scalefont def\n", fsize - 1); ++ else if (!strncmp (current_locale, "zh_TW", 5)) ++ fprintf(outfd, "/unicns /ShanHeiSun-Light-UniCNS-UTF8-H findfont %d scalefont def\n", fsize - 1); ++ } ++ + # ifdef DEBUG + if (Debug_flag & DB_PSMPAGE) + fprintf(outfd, "(\\t'a' length ) print mp_a_x ==\nflush\n"); diff --git a/mpage.spec b/mpage.spec index 9531135..c88fd00 100644 --- a/mpage.spec +++ b/mpage.spec @@ -1,13 +1,14 @@ Summary: A tool for printing multiple pages of text on each printed page. Name: mpage Version: 2.5.4 -Release: 6.1 +Release: 7 License: GPL Group: Applications/Publishing Source: ftp://ftp.mesa.nl/pub/mpage/mpage-%{version}.tgz Patch0: mpage25-config.patch Patch1: mpage-gcc4.patch Patch2: mpage-margins-scale.patch +Patch3: mpage-restricted-fonts.patch BuildRoot: /var/tmp/mpage-root %description @@ -23,6 +24,7 @@ pages. %patch0 -p1 -b .config %patch1 -p1 -b .gcc4 %patch2 -p1 -b .margins-scale +%patch3 -p1 -b .restricted-fonts %build make BINDIR=%{_bindir} LIBDIR=%{_datadir} MANDIR=%{_mandir}/man1 @@ -47,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/mpage %changelog +* Fri May 12 2006 Jitka Kudrnacova - 2.5.4-7 +- Applied patch for font-restriction to avoid problems with gs (bug #191459) + * Fri Feb 10 2006 Jesse Keating - 2.5.4-6.1 - bump again for double-long bug on ppc(64)