Репозиторий ALT Linux backports/2.4
Последнее обновление: 9 июля 2008 | Пакетов: 497 | Посещений: 1575246
 поиск   регистрация   авторизация 
 
Группа :: Графические оболочки/Прочее
Пакет: fluxbox

 Главная   Изменения   Спек   Патчи   Загрузить   Bugs and FR 

Патч: fluxbox-0.9.12-alt-makefile-configure-src-encoding.patch


diff -ru fluxbox-0.9.12.orig/configure.in fluxbox-0.9.12/configure.in
--- fluxbox-0.9.12.orig/configure.in	2005-01-18 02:37:39 +0600
+++ fluxbox-0.9.12/configure.in	2005-01-21 14:51:48 +0600
@@ -555,7 +555,9 @@
 nls/et_EE/Makefile
 nls/fr_FR/Makefile
 nls/pt_BR/Makefile
-nls/ru_RU/Makefile
+nls/ru_RU.CP1251/Makefile
+nls/ru_RU.KOI8-R/Makefile
+nls/ru_RU.UTF-8/Makefile
 nls/sv_SE/Makefile
 nls/tr_TR/Makefile
 nls/pt_PT/Makefile
diff -ru fluxbox-0.9.12.orig/nls/Makefile.am fluxbox-0.9.12/nls/Makefile.am
--- fluxbox-0.9.12.orig/nls/Makefile.am	2005-01-05 21:25:44 +0600
+++ fluxbox-0.9.12/nls/Makefile.am	2005-01-21 14:52:33 +0600
@@ -1,9 +1,9 @@
 # nls/Makefile.am for fluxbox - http://fluxbox.sf.net
 
 NLSTEST = @NLS@
-SUBDIRS = C da_DK es_ES et_EE fr_FR pt_BR ru_RU sv_SE \
+SUBDIRS = C da_DK es_ES et_EE fr_FR pt_BR sv_SE \
 	tr_TR it_IT pt_PT bg_BG ja_JP ko_KR lv_LV de_DE   \
-	nl_NL sl_SI pl_PL vi_VN
+	nl_NL sl_SI pl_PL vi_VN ru_RU.CP1251 ru_RU.KOI8-R ru_RU.UTF-8
 
 MAINTAINERCLEANFILES = Makefile.in fluxbox-nls.hh
 EXTRA_DIST=fluxbox-nls.hh nlsinfo
diff -ru fluxbox-0.9.12.orig/nls/Makefile.in fluxbox-0.9.12/nls/Makefile.in
--- fluxbox-0.9.12.orig/nls/Makefile.in	2005-01-18 03:51:04 +0600
+++ fluxbox-0.9.12/nls/Makefile.in	2005-01-21 14:53:09 +0600
@@ -101,9 +101,9 @@
 regex_cmd = @regex_cmd@
 
 NLSTEST = @NLS@
-SUBDIRS = C da_DK es_ES et_EE fr_FR pt_BR ru_RU sv_SE \
+SUBDIRS = C da_DK es_ES et_EE fr_FR pt_BR sv_SE \
 	tr_TR it_IT pt_PT bg_BG ja_JP ko_KR lv_LV de_DE   \
-	nl_NL sl_SI pl_PL vi_VN
+	nl_NL sl_SI pl_PL vi_VN ru_RU.CP1251 ru_RU.KOI8-R ru_RU.UTF-8
 
 
 MAINTAINERCLEANFILES = Makefile.in fluxbox-nls.hh
diff -ru fluxbox-0.9.12.orig/src/FbTk/I18n.cc fluxbox-0.9.12/src/FbTk/I18n.cc
--- fluxbox-0.9.12.orig/src/FbTk/I18n.cc	2004-11-19 18:01:38 +0600
+++ fluxbox-0.9.12/src/FbTk/I18n.cc	2005-01-21 14:58:01 +0600
@@ -94,6 +94,7 @@
         if (MB_CUR_MAX > 1)
             m_multibyte = true;
 		
+	if(! (strncmp(m_locale.c_str(), "ru_RU", 5) == 0)) {
         // truncate any encoding off the end of the locale
 				
         // remove everything after @
@@ -108,6 +109,7 @@
         index = m_locale.find('=');
         if (index != string::npos) 
             m_locale.erase(0,index+1); //erase all characters starting up to index 
+	}
     }
 #endif // HAVE_SETLOCALE
 }
 
design & coding: Vladimir Lettiev aka crux © 2004-2005