Author: witekfl Date: Sat Jan 16 17:46:49 2010 GMT Module: packages Tag: HEAD ---- Log message: - added the font-lang.patch with the font-lang option - rel 3
---- Files affected: packages/fbterm: fbterm.spec (1.14 -> 1.15) , fbterm-font-lang.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/fbterm/fbterm.spec diff -u packages/fbterm/fbterm.spec:1.14 packages/fbterm/fbterm.spec:1.15 --- packages/fbterm/fbterm.spec:1.14 Sat Jan 16 17:34:44 2010 +++ packages/fbterm/fbterm.spec Sat Jan 16 18:46:43 2010 @@ -3,13 +3,13 @@ Summary(pl.UTF-8): Emulator terminala dla framebuffera Name: fbterm Version: 1.6 -Release: 2 +Release: 3 License: GPL v2 Group: Applications/Graphics Source0: http://fbterm.googlecode.com/files/%{name}-%{version}.tar.gz # Source0-md5: 531ea0984836b58fd123e6a97a4228c6 Patch0: %{name}-install.patch -Patch1: %{name}-fonts-pl.patch +Patch1: %{name}-font-lang.patch URL: http://code.google.com/p/fbterm/ BuildRequires: autoconf BuildRequires: automake @@ -80,6 +80,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.15 2010/01/16 17:46:43 witekfl +- added the font-lang.patch with the font-lang option +- rel 3 + Revision 1.14 2010/01/16 16:34:44 witekfl - added the fonts-pl.patch - rel 2 ================================================================ Index: packages/fbterm/fbterm-font-lang.patch diff -u /dev/null packages/fbterm/fbterm-font-lang.patch:1.1 --- /dev/null Sat Jan 16 18:46:49 2010 +++ packages/fbterm/fbterm-font-lang.patch Sat Jan 16 18:46:43 2010 @@ -0,0 +1,57 @@ +--- fbterm-1.6/src/fbconfig.cpp.old 2010-01-16 18:38:19.000000000 +0100 ++++ fbterm-1.6/src/fbconfig.cpp 2010-01-16 18:40:26.000000000 +0100 +@@ -172,6 +172,8 @@ void Config::checkConfigFile(const s8 *n + "# and using a fixed width font as the first is strongly recommended\n" + "font-names=mono\n" + "font-size=12\n" ++ "# default language for fontconfig\n" ++ "font-lang=en\n" + "\n" + "# force font width, usually for non-fixed width fonts\n" + "# legal value format: n (fw_new = n), +n (fw_new = fw_old + n), -n (fw_new = fw_old - n)\n" +@@ -223,6 +225,7 @@ bool Config::parseArgs(s32 argc, s8 **ar + { "verbose", no_argument, 0, 'v' }, + { "font-names", required_argument, 0, 'n' }, + { "font-size", required_argument, 0, 's' }, ++ { "font-lang", required_argument, 0, 'l' }, + { "color-foreground", required_argument, 0, 'f' }, + { "color-background", required_argument, 0, 'b' }, + { "text-encodings", required_argument, 0, 'e' }, +@@ -238,7 +241,7 @@ bool Config::parseArgs(s32 argc, s8 **ar + }; + + s32 index; +- while ((index = getopt_long(argc, argv, "Vvhn:s:f:b:e:r:i:", options, 0)) != -1) { ++ while ((index = getopt_long(argc, argv, "Vvhn:s:l:f:b:e:r:i:", options, 0)) != -1) { + switch (index) { + case 'V': + printf("FbTerm version " VERSION "\n"); +@@ -256,6 +259,7 @@ bool Config::parseArgs(s32 argc, s8 **ar + " -n, --font-names=TEXT specify font family names\n" + " -s, --font-size=NUM specify font pixel size\n" + " --font-width=NUM force font width\n" ++ " -l, --font-lang=TEXT default language used by fontconfig\n" + " -f, --color-foreground=NUM specify foreground color\n" + " -b, --color-background=NUM specify background color\n" + " -e, --text-encodings=TEXT specify additional text encodings\n" +--- fbterm-1.6/src/font.cpp.old 2010-01-16 18:38:30.000000000 +0100 ++++ fbterm-1.6/src/font.cpp 2010-01-16 18:38:48.000000000 +0100 +@@ -48,7 +48,9 @@ Font *Font::createInstance() + FcInit(); + + s8 buf[64]; ++ s8 lang[8]; + Config::instance()->getOption("font-names", buf, sizeof(buf)); ++ Config::instance()->getOption("font-lang", lang, sizeof(lang)); + + FcPattern *pat = FcNameParse((FcChar8 *)(*buf ? buf : "mono")); + +@@ -56,7 +58,7 @@ Font *Font::createInstance() + Config::instance()->getOption("font-size", pixel_size); + FcPatternAddDouble(pat, FC_PIXEL_SIZE, (double)pixel_size); + +- FcPatternAddString(pat, FC_LANG, (FcChar8 *)"en"); ++ FcPatternAddString(pat, FC_LANG, (FcChar8 *)(*lang ? lang : "en")); + + FcConfigSubstitute(NULL, pat, FcMatchPattern); + FcDefaultSubstitute(pat); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fbterm/fbterm.spec?r1=1.14&r2=1.15&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
