rpms/aumix/F-12 aumix-2.8-utf8.patch,NONE,1.1 aumix.spec,1.11,1.12

Gabriel L. Somlo somlo at fedoraproject.org
Tue Oct 20 14:43:08 UTC 2009


Author: somlo

Update of /cvs/pkgs/rpms/aumix/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23116/F-12

Modified Files:
	aumix.spec 
Added Files:
	aumix-2.8-utf8.patch 
Log Message:
converted language files to utf-8
linking against libncursesw to fix display of utf-8 characters


aumix-2.8-utf8.patch:
 configure    |    8 +-
 configure.in |    4 -
 po/de.po     |   42 +++++++-------
 po/el.po     |   74 +++++++++++++-------------
 po/es.po     |   38 ++++++-------
 po/fr.po     |   46 ++++++++--------
 po/gl.po     |   72 ++++++++++++-------------
 po/ja.po     |  166 +++++++++++++++++++++++++++++------------------------------
 po/nl.po     |    2 
 po/pl.po     |   62 +++++++++++-----------
 po/pt_BR.po  |   60 ++++++++++-----------
 po/ru.po     |  128 ++++++++++++++++++++++-----------------------
 po/sv.po     |   62 +++++++++++-----------
 po/uk.po     |  138 ++++++++++++++++++++++++-------------------------
 po/zh_CN.po  |  156 +++++++++++++++++++++++++++----------------------------
 15 files changed, 529 insertions(+), 529 deletions(-)

--- NEW FILE aumix-2.8-utf8.patch ---
diff -NarU5 aumix-2.8.orig/configure aumix-2.8/configure
--- aumix-2.8.orig/configure	2009-10-20 10:03:31.000000000 -0400
+++ aumix-2.8/configure	2009-10-20 10:27:55.000000000 -0400
@@ -3544,17 +3544,17 @@
   withval="$with_ncurses"
   echo "$as_me:$LINENO: result: Compiling without ncurses support" >&5
 echo "${ECHO_T}Compiling without ncurses support" >&6
 else
 
-    echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
-echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
+    echo "$as_me:$LINENO: checking for initscr in -lncursesw" >&5
+echo $ECHO_N "checking for initscr in -lncursesw... $ECHO_C" >&6
 if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses  $LIBS"
+LIBS="-lncursesw  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -3615,11 +3615,11 @@
 else
   initscr=off
 fi
 
   if test $initscr = on; then
-    CURSLIB="ncurses"
+    CURSLIB="ncursesw"
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBNCURSES 1
 _ACEOF
 
diff -NarU5 aumix-2.8.orig/configure.in aumix-2.8/configure.in
--- aumix-2.8.orig/configure.in	2009-10-20 10:03:31.000000000 -0400
+++ aumix-2.8/configure.in	2009-10-20 10:26:56.000000000 -0400
@@ -34,13 +34,13 @@
 dnl Additional configure options
 AC_ARG_WITH(ncurses,
    [  --without-ncurses       compile with no ncurses or mouse support],
   AC_MSG_RESULT([Compiling without ncurses support]),[
   dnl Checks for ncurses library.
-  AC_CHECK_LIB(ncurses, initscr, initscr=on, initscr=off)
+  AC_CHECK_LIB(ncursesw, initscr, initscr=on, initscr=off)
   if test $initscr = on; then
-    CURSLIB="ncurses"
+    CURSLIB="ncursesw"
     AC_DEFINE(HAVE_LIBNCURSES, 1,
       [Define this if you have the ncurses library and want to use it.])
   else
     AC_CHECK_LIB(curses, initscr, initscr=on, initscr=off)
     if test $initscr = on; then
diff -NarU5 aumix-2.8.orig/po/de.po aumix-2.8/po/de.po
--- aumix-2.8.orig/po/de.po	2002-11-24 20:36:21.000000000 -0500
+++ aumix-2.8/po/de.po	2009-10-20 10:05:54.000000000 -0400
@@ -9,25 +9,25 @@
 "Project-Id-Version: aumix 2.6\n"
 "POT-Creation-Date: 2002-11-25 01:36+0000\n"
 "Last-Translator: Dominik Stadler <Dominik.Stadler at gmx.at>\n"
 "Language-Team: German <de at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: none\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
 #: src/common.c:76
 msgid "Volume  "
-msgstr "Lautstärke"
+msgstr "Lautstärke"
 
 #: src/common.c:77
 msgid "Bass    "
-msgstr "Bässe"
+msgstr "Bässe"
 
 #: src/common.c:78
 msgid "Treble  "
-msgstr "Höhen"
+msgstr "Höhen"
 
 #: src/common.c:79
 msgid "Synth   "
 msgstr ""
 
@@ -115,23 +115,23 @@
 msgid "Monitor "
 msgstr ""
 
 #: src/common.c:263
 msgid "aumix:  error opening mixer"
-msgstr "aumix:  Fehler beim Öffnen des Mixers"
+msgstr "aumix:  Fehler beim Öffnen des Mixers"
 
 #: src/common.c:263
 msgid "aumix:  no device found"
-msgstr "aumix:  Audiogerät nicht gefunden"
+msgstr "aumix:  Audiogerät nicht gefunden"
 
 #: src/common.c:263
 msgid "aumix:  mixer not open"
-msgstr "aumix:  Mixer nicht geöffnet"
+msgstr "aumix:  Mixer nicht geöffnet"
 
 #: src/common.c:263
 msgid "aumix:  unable to open settings file"
-msgstr "aumix:  Einstellungen konnten nicht geöffnet werden"
+msgstr "aumix:  Einstellungen konnten nicht geöffnet werden"
 
 #: src/common.c:271
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  Unbekannter Fehler %i"
@@ -188,15 +188,15 @@
 "  c:  CD\n"
 "\n"
 "other options:\n"
 msgstr ""
 "Kanaloptionen:\n"
-"  v:  Gesamtlautstärke      x:  Mixmonitor\n"
-"  b:  Bässe                 W:  PCM 2\n"
-"  t:  Höhen                 r:  Aufnahme\n"
-"  s:  Synthesizer           i:  Aufnahmeverstärkung\n"
-"  w:  PCM                   o:  Ausgabeverstärkung\n"
+"  v:  Gesamtlautstärke      x:  Mixmonitor\n"
+"  b:  Bässe                 W:  PCM 2\n"
+"  t:  Höhen                 r:  Aufnahme\n"
+"  s:  Synthesizer           i:  Aufnahmeverstärkung\n"
+"  w:  PCM                   o:  Ausgabeverstärkung\n"
 "  p:  PC-Lautsprecher       1:  Line 1\n"
 "  l:  Line                  2:  Line 2\n"
 "  m:  Mikrofon              3:  Line 3\n"
 "  c:  CD\n"
 "\n"
@@ -211,29 +211,29 @@
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
 "      ~/.aumixrc or /etc/aumixrc)\n"
 "  h:  this helpful message\n"
 msgstr ""
-"  d:  Anderes Gerät als /dev/mixer benutzen\n"
+"  d:  Anderes Gerät als /dev/mixer benutzen\n"
 "  f:  Spezifizieren Sie die Datei zum Speichern und Laden von Einstellungen\n"
 "      (Standard sind ~/.aumixrc oder /etc/aumixrc)\n"
-"  h:  Diese nützlichen Informationen\n"
+"  h:  Diese nützlichen Informationen\n"
 
 #: src/common.c:707
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
-"  I:  Start im interaktiven Modus nach Ausführen nicht-interaktiver "
+"  I:  Start im interaktiven Modus nach Ausführen nicht-interaktiver "
 "Funktionen\n"
 
 #: src/common.c:710
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
 "  L:  Einstellungen laden\n"
-"  q:  Alle Kanäle abfragen und Einstellungen ausgeben\n"
+"  q:  Alle Kanäle abfragen und Einstellungen ausgeben\n"
 "  S:  Einstellungen speichern\n"
 
 #: src/curses.c:37 src/gtk.c:191
 msgid "Quit"
 msgstr "Beenden  "
@@ -258,19 +258,19 @@
 msgid "Only"
 msgstr "Alleine  "
 
 #: src/curses.c:43
 msgid "Undo"
-msgstr "Rückgängig"
+msgstr "Rückgängig"
 
 #: src/curses.c:113 src/gtk.c:365
 msgid "0"
 msgstr "0"
 
 #: src/curses.c:114 src/gtk.c:337
 msgid "Level"
-msgstr "Lautstärke"
+msgstr "Lautstärke"
 
 #: src/curses.c:115 src/gtk.c:368
 msgid "100"
 msgstr "100"
 
@@ -310,11 +310,11 @@
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
 msgstr ""
[...3246 lines suppressed...]
 
 #: src/common.c:710
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
-"  L£ºÔØÈëÉèÖÃ\n"
-"  q£º²éѯËùÓÐͨµÀÉèÖò¢´òÓ¡\n"
-"  S£º±£´æÉèÖÃ\n"
+"  L:载入设置\n"
+"  q:查询所有通道设置并打印\n"
+"  S:保存设置\n"
 
 #: src/curses.c:37 src/gtk.c:191
 msgid "Quit"
-msgstr "Í˳ö"
+msgstr "退出"
 
 #: src/curses.c:38 src/gtk.c:191
 msgid "Load"
-msgstr "ÔØÈë"
+msgstr "载入"
 
 #: src/curses.c:39 src/gtk.c:191
 msgid "Save"
-msgstr "±£´æ"
+msgstr "保存"
 
 #: src/curses.c:40
 msgid "Keys"
-msgstr "¼üÅÌ"
+msgstr "键盘"
 
 #: src/curses.c:41 src/gtk.c:265
 msgid "Mute"
-msgstr "¾²Òô"
+msgstr "静音"
 
 #: src/curses.c:42
 msgid "Only"
-msgstr "½ö"
+msgstr "ä»…"
 
 #: src/curses.c:43
 msgid "Undo"
-msgstr "³·Ïû"
+msgstr "撤消"
 
 #: src/curses.c:113 src/gtk.c:365
 msgid "0"
 msgstr "0"
 
 #: src/curses.c:114 src/gtk.c:337
 msgid "Level"
-msgstr "¼¶±ð"
+msgstr "级别"
 
 #: src/curses.c:115 src/gtk.c:368
 msgid "100"
 msgstr "100"
 
@@ -274,31 +274,31 @@
 msgid "L"
 msgstr "L"
 
 #: src/curses.c:117 src/gtk.c:193 src/gtk.c:237 src/gtk.c:340
 msgid "Balance"
-msgstr "ƽºâ"
+msgstr "平衡"
 
 #: src/curses.c:118 src/gtk.c:362
 msgid "R"
 msgstr "R"
 
 #: src/curses.c:164
 msgid "page arrows\n"
-msgstr "·­Ò³¼ü\n"
+msgstr "翻页键\n"
 
 #: src/curses.c:165
 msgid "tab enter < > , .\n"
 msgstr "tab enter < > , .\n"
 
 #: src/curses.c:166
 msgid "+ - [ ] arrows digits\n"
-msgstr "+ - [ ] ¼ýÍ· Êý×Ö\n"
+msgstr "+ - [ ] 箭头 数字\n"
 
 #: src/curses.c:167
 msgid "space\n"
-msgstr "¿Õ¸ñ\n"
+msgstr "空格\n"
 
 #: src/curses.c:168
 msgid "|\n"
 msgstr "|\n"
 
@@ -306,51 +306,51 @@
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
 msgstr ""
 "\n"
-"°´ÈÎÒâ¼ü»òÊó±ê°´Å¥¼ÌÐø¡£"
+"按任意键或鼠标按钮继续。"
 
 #: src/curses.c:171
 msgid "Key                       Function\n"
-msgstr "¼ü                        ¹¦ÄÜ\n"
+msgstr "键                        功能\n"
 
 #: src/curses.c:172
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
 #: src/curses.c:173
 msgid "change channel\n"
-msgstr "¸Ä±äͨµÀ\n"
+msgstr "改变通道\n"
 
 #: src/curses.c:174
 msgid "toggle level/balance\n"
-msgstr "Çл»¼¶±ð/ƽºâ\n"
+msgstr "切换级别/平衡\n"
 
 #: src/curses.c:175
 msgid "adjust slider\n"
-msgstr "µ÷Õû»¬¶¯Ìõ\n"
+msgstr "调整滑动条\n"
 
 #: src/curses.c:176
 msgid "toggle record/play\n"
-msgstr "Çл»Â¼Òô/²¥·Å\n"
+msgstr "切换录音/播放\n"
 
 #: src/curses.c:177
 msgid "center balance\n"
-msgstr "Íêȫƽºâ\n"
+msgstr "完全平衡\n"
 
 #: src/curses.c:196
 msgid "     "
 msgstr "     "
 
 #: src/curses.c:199
 msgid "muted"
-msgstr "ÒѾ²Òô"
+msgstr "已静音"
 
 #: src/curses.c:202
 msgid "only "
-msgstr "½ö "
+msgstr "ä»… "
 
 #: src/interactive.c:399
 msgid "k"
 msgstr "k"
 
@@ -378,15 +378,15 @@
 msgid "u"
 msgstr "u"
 
 #: src/gtk.c:191
 msgid "Load From"
-msgstr "ÔØÈë×Ô"
+msgstr "载入自"
 
 #: src/gtk.c:191
 msgid "Save To"
-msgstr "±£´æµ½"
+msgstr "保存到"
 
 #: src/gtk.c:192
 msgid "f"
 msgstr "f"
 
@@ -414,18 +414,18 @@
 msgid "n"
 msgstr ""
 
 #: src/gtk.c:251
 msgid "Mute All"
-msgstr "È«²¿¾²Òô"
+msgstr "全部静音"
 
 #: src/gtk.c:257
 msgid "File"
-msgstr "Îļþ"
+msgstr "文件"
 
 #: src/gtk.c:261
 msgid "View"
-msgstr "²é¿´"
+msgstr "查看"
 
 #: src/gtk.c:334
 msgid "Rec"
-msgstr "¼Òô"
+msgstr "录音"


Index: aumix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-12/aumix.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- aumix.spec	24 Jul 2009 17:34:25 -0000	1.11
+++ aumix.spec	20 Oct 2009 14:43:07 -0000	1.12
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 20%{?dist}
+Release: 21%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPLv2+
 Group: Applications/Multimedia
@@ -12,6 +12,7 @@ Patch2:  aumix-fix-cursor-color-on-exit.
 Patch3:  aumix-fix-crackrock.patch
 Patch4:  aumix-2.8-bug-115869.patch
 Patch5:  curses-cleanup.patch
+Patch6:  aumix-2.8-utf8.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext ncurses-devel
 
@@ -26,6 +27,7 @@ An audio mixer with a compact visual lay
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure
@@ -50,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/aumix
 
 %changelog
+* Wed Oct 14 2009 Gabriel L. Somlo <somlo at cmu.edu> - 2.8-21
+- convert language files and fix ncurses setup for utf-8, (bugzilla # 528279)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list