- added the font-lang.patch with the font-lang option

- rel 3

Changed files:
    fbterm-font-lang.patch -> 1.1
    fbterm.spec -> 1.15

diff --git a/fbterm-font-lang.patch b/fbterm-font-lang.patch
new file mode 100644 (file)
index 0000000..dcc3ae6
--- /dev/null
+++ b/fbterm-font-lang.patch
@@ -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);

diff --git a/fbterm.spec b/fbterm.spec
index 6fce8abeed9e6c7394796463d7eace7093151f2d..72ab31bd886564167886fc08df88f3120efd8028 100644 (file)
--- a/fbterm.spec
+++ b/fbterm.spec
@@ -2,13 +2,13 @@ Summary:      Terminal emulator for framebuffer
 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