Mercurial > mplayer.hg

changeset 20634:32b693286d0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove charset files (all of them are in UTF-8 now anyway) change build system accordingly
author kraymer
date Fri, 03 Nov 2006 21:52:35 +0000
parents 44ea011155d1
children 9ed557ae1383
files Makefile configure help/help_mp-bg.h.charset help/help_mp-cs.h.charset help/help_mp-de.h.charset help/help_mp-dk.h.charset help/help_mp-el.h.charset help/help_mp-en.h.charset help/help_mp-es.h.charset help/help_mp-fr.h.charset help/help_mp-hu.h.charset help/help_mp-it.h.charset help/help_mp-ja.h.charset help/help_mp-ko.h.charset help/help_mp-mk.h.charset help/help_mp-nb.h.charset help/help_mp-nl.h.charset help/help_mp-pl.h.charset help/help_mp-pt_BR.h.charset help/help_mp-ro.h.charset help/help_mp-ru.h.charset help/help_mp-sk.h.charset help/help_mp-sv.h.charset help/help_mp-tr.h.charset help/help_mp-uk.h.charset help/help_mp-zh_CN.h.charset help/help_mp-zh_TW.h.charset
diffstat 27 files changed, 4 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri Nov 03 21:40:13 2006 +0000
+++ b/Makefile	Fri Nov 03 21:52:35 2006 +0000
@@ -443,7 +443,7 @@
 ifeq ($(CHARSET),)
 	@echo '#include "$(HELP_FILE)"' >> help_mp.h
 else
-	iconv -f `cat $(HELP_FILE).charset` -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h
+	iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h
 endif
 
 ifneq ($(HELP_FILE),help/help_mp-en.h)
--- a/configure	Fri Nov 03 21:40:13 2006 +0000
+++ b/configure	Fri Nov 03 21:52:35 2006 +0000
@@ -7151,8 +7151,6 @@
   _charset=""
 elif test -z "$_charset" ; then
   if test "$_gtk1" = yes ; then
-    _charset=`cat ${_mp_help}.charset`
-  else
     _charset="UTF-8"
   fi
 fi
@@ -7162,18 +7160,18 @@
   _def_charset="#undef MSG_CHARSET"
 fi
 
-if test "$_charset" = `cat ${_mp_help}.charset` ; then
+if test "$_charset" = "UTF-8" ; then
   # hack to disable conversion in the Makefile
   _charset=""
 fi
 
 if test "$_charset" ; then
 echocheck "iconv program"
-iconv -f `cat ${_mp_help}.charset` -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG"
+iconv -f UTF-8 -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG"
 if test "$?" -ne 0 ; then
   echores "no"
     echo "No working iconv program found, use "
-    echo "--charset=`cat ${_mp_help}.charset` to continue anyway."
+    echo "--charset=UTF-8 to continue anyway."
     echo "If you also have problems with iconv library functions use --charset=noconv."
     echo "Messages in the GTK-2 interface will be broken then."
     exit 1
--- a/help/help_mp-bg.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-cs.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-de.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-dk.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-el.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-en.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-es.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-fr.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-hu.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-it.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-ja.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-ko.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-mk.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-nb.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-nl.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-pl.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-pt_BR.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-ro.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-ru.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-sk.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-sv.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-tr.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-uk.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-zh_CN.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8
--- a/help/help_mp-zh_TW.h.charset	Fri Nov 03 21:40:13 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-UTF-8