diff --git a/indent-2.2.9-cdw.patch b/indent-2.2.9-cdw.patch index e2cc998..e3256d1 100644 --- a/indent-2.2.9-cdw.patch +++ b/indent-2.2.9-cdw.patch @@ -38,15 +38,15 @@ diff -burp indent-2.2.9/src/indent.h indent-2.2.9-cdw/src/indent.h --- indent-2.2.9/src/indent.h 2006-01-18 18:22:36.000000000 +0100 +++ indent-2.2.9-cdw/src/indent.h 2006-01-27 17:20:14.000000000 +0100 @@ -357,6 +357,9 @@ typedef struct parser_state - BOOLEAN in_decl; /* set to true when we are in a declaration + BOOLEAN in_decl; /*!< set to true when we are in a declaration * statement. The processing of braces is then * slightly different */ -+ BOOLEAN in_closing_br_while; /* set to true when we are parsing ++ BOOLEAN in_closing_br_while; /*!< set to true when we are parsing + * closing while of do {} while + * statement*/ - int in_stmt; /* set to 1 while in a stmt */ + int in_stmt; /*!< set to 1 while in a stmt */ int in_parameter_declaration; - int ind_level; /* the current indentation level in spaces */ + int ind_level; /*!< the current indentation level in spaces */ diff -burp indent-2.2.9/src/parse.c indent-2.2.9-cdw/src/parse.c --- indent-2.2.9/src/parse.c 2002-08-04 19:08:41.000000000 +0200 +++ indent-2.2.9-cdw/src/parse.c 2006-01-27 17:18:52.000000000 +0100 diff --git a/indent-2.2.9-explicits.patch b/indent-2.2.9-explicits.patch index 629e910..c69f540 100644 --- a/indent-2.2.9-explicits.patch +++ b/indent-2.2.9-explicits.patch @@ -9,65 +9,3 @@ diff -Burp indent-2.2.9/man/texinfo2man.c indent-2.2.9-explicits/man/texinfo2man process_texi (FILE * in) { char buf[1024]; -diff -Burp indent-2.2.9/src/indent.c indent-2.2.9-explicits/src/indent.c ---- indent-2.2.9/src/indent.c 2006-01-18 18:17:57.000000000 +0100 -+++ indent-2.2.9-explicits/src/indent.c 2006-01-18 18:16:50.000000000 +0100 -@@ -373,8 +373,6 @@ static void handle_token_lparen( - BOOLEAN * sp_sw, - int * dec_ind) - { -- char lparen = *token; -- - /* Braces in initializer lists should be put on new lines. This is - * necessary so that -gnu does not cause things like char - * *this_is_a_string_array[] = { "foo", "this_string_does_not_fit", -@@ -3058,7 +3056,6 @@ int main ( - int argc, - char ** argv) - { -- int i; - char *profile_pathname = 0; - BOOLEAN using_stdin = false; - exit_values_ty exit_status; -diff -Burp indent-2.2.9/src/io.h indent-2.2.9-explicits/src/io.h ---- indent-2.2.9/src/io.h 2002-08-04 19:08:41.000000000 +0200 -+++ indent-2.2.9-explicits/src/io.h 2006-01-18 18:12:56.000000000 +0100 -@@ -73,5 +73,6 @@ extern void fill_buffer (void); - extern int compute_code_target (int paren_targ); - extern int compute_label_target (void); - extern void skip_buffered_space(void); -+extern void dump_line (int force_nl, int *paren_targ); - - #endif /* INDENT_IO_H */ -diff -Burp indent-2.2.9/src/output.c indent-2.2.9-explicits/src/output.c ---- indent-2.2.9/src/output.c 2006-01-18 18:18:00.000000000 +0100 -+++ indent-2.2.9-explicits/src/output.c 2006-01-18 18:14:02.000000000 +0100 -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - - #include "indent.h" -@@ -1207,7 +1208,7 @@ extern void close_output( - } - } - --extern inhibit_indenting( -+extern void inhibit_indenting( - BOOLEAN flag) - { - inhibited = flag; -diff -Burp indent-2.2.9/src/output.h indent-2.2.9-explicits/src/output.h ---- indent-2.2.9/src/output.h 2002-08-04 19:08:41.000000000 +0200 -+++ indent-2.2.9-explicits/src/output.h 2006-01-18 17:55:07.000000000 +0100 -@@ -47,7 +47,7 @@ extern void close_output( - struct stat * file_stats, - const char * filename); - --extern inhibit_indenting( -+extern void inhibit_indenting( - BOOLEAN flag); - - diff --git a/indent-2.2.9-fix.patch b/indent-2.2.9-fix.patch deleted file mode 100644 index 55a60fd..0000000 --- a/indent-2.2.9-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- indent-2.2.9/src/indent.c -+++ indent-2.2.9/src/indent.c -@@ -875,6 +875,7 @@ - * imply we are in a stmt */ - for (t_ptr = s_code; *t_ptr; ++t_ptr) - { -+ check_lab_size(); - *e_lab++ = *t_ptr; /* turn everything so far into a label */ - } - diff --git a/indent-2.2.9-gcc4.patch b/indent-2.2.9-gcc4.patch deleted file mode 100644 index 02d2c1d..0000000 --- a/indent-2.2.9-gcc4.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- indent-2.2.9/man/texinfo2man.c.jj 2002-01-17 14:28:51.000000000 -0500 -+++ indent-2.2.9/man/texinfo2man.c 2005-04-10 08:37:22.283581780 -0400 -@@ -1,4 +1,5 @@ - #include -+#include - #include - #include - #include ---- indent-2.2.9/src/indent.h.jj 2002-11-10 16:02:48.000000000 -0500 -+++ indent-2.2.9/src/indent.h 2005-04-10 08:35:06.395429529 -0400 -@@ -96,11 +96,6 @@ extern char *cur_line; - /* Size of the input program, not including the ' \n\0' we add at the end */ - extern unsigned long in_prog_size; - --/* The output file. */ --extern FILE *output; -- -- -- - extern char *labbuf; /* buffer for label */ - extern char *s_lab; /* start ... */ - extern char *e_lab; /* .. and end of stored label */ ---- indent-2.2.9/src/output.c.jj 2002-12-12 12:36:49.000000000 -0500 -+++ indent-2.2.9/src/output.c 2005-04-10 08:35:54.511631253 -0400 -@@ -12,6 +12,7 @@ - */ - - #include -+#include - #include - #include - #include diff --git a/indent-2.2.9-lcall.patch b/indent-2.2.9-lcall.patch index 5a68286..3fb5aca 100644 --- a/indent-2.2.9-lcall.patch +++ b/indent-2.2.9-lcall.patch @@ -4,9 +4,9 @@ diff -burp indent-2.2.9/src/indent.c indent-2.2.9-lcall/src/indent.c @@ -3070,7 +3070,7 @@ int main ( exit_values_ty exit_status; - #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) -- setlocale (LC_MESSAGES, ""); -+ setlocale (LC_ALL, ""); + #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) && defined (HAVE_LCCTYPES) +- setlocale(LC_MESSAGES, ""); ++ setlocale(LC_ALL, ""); #endif - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); diff --git a/indent-2.2.9-man.patch b/indent-2.2.9-man.patch index c74a97b..2fdab5d 100644 --- a/indent-2.2.9-man.patch +++ b/indent-2.2.9-man.patch @@ -35,23 +35,17 @@ diff -Bburpd indent-2.2.9-orig/doc/indent.texinfo indent-2.2.9/doc/indent.texinf @item -prs @itemx --space-after-parentheses Put a space after every '(' and before every ')'.@* -@@ -1979,8 +1989,10 @@ the corresponding short option. - \line{ --original \leaderfill -orig} - \line{ --parameter-indentation \leaderfill -ip@var{n}\ } - \line{ --paren-indentation \leaderfill -pi@var{n}\ } -+\line{ --preprocessor-indentation@var{n} \leaderfill -ppi@var{n}\ } +@@ -1979,6 +1989,7 @@ the corresponding short option. + \line{ --preprocessor-indentation \leaderfill -ppi@var{n}\ } \line{ --preserve-mtime \leaderfill -pmt\ } \line{ --procnames-start-lines \leaderfill -psl\ } +\line{ --remove-preprocessor-space \leaderfill -nlps\ } \line{ --space-after-cast \leaderfill -cs\ \ } \line{ --space-after-for \leaderfill -saf\ } \line{ --space-after-if \leaderfill -sai\ } -@@ -2063,8 +2075,10 @@ the corresponding short option. - --original -orig - --parameter-indentation -ip@var{n} - --paren-indentation -pi@var{n} -+--preprocessor-indentation@var{n} -ppi@var{n} +@@ -2063,6 +2075,7 @@ the corresponding short option. --preserve-mtime -pmt + --preprocessor-indentation -ppi@var{n} --procnames-start-lines -psl +--remove-preprocessor-space -nlps --space-after-cast -cs diff --git a/indent-2.2.9-zh_TW.patch b/indent-2.2.9-zh_TW.patch deleted file mode 100644 index f26daeb..0000000 --- a/indent-2.2.9-zh_TW.patch +++ /dev/null @@ -1,580 +0,0 @@ -diff -burpN indent-2.2.9/po/LINGUAS indent-2.2.9-po/po/LINGUAS ---- indent-2.2.9/po/LINGUAS 2002-12-16 17:03:13.000000000 +0100 -+++ indent-2.2.9-po/po/LINGUAS 2006-02-03 15:18:28.000000000 +0100 -@@ -1 +1 @@ --ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW.Big5 -+ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW -diff -burpN indent-2.2.9/po/zh_TW.Big5.po indent-2.2.9-po/po/zh_TW.Big5.po ---- indent-2.2.9/po/zh_TW.Big5.po 2002-12-16 17:14:37.000000000 +0100 -+++ indent-2.2.9-po/po/zh_TW.Big5.po 1970-01-01 01:00:00.000000000 +0100 -@@ -1,283 +0,0 @@ --# Language file for GNU indent (use indent.pot as template). --# Copyright (C) 2001 Free Software Foundation, Inc. --# Carlo Wood , 2001. --# --msgid "" --msgstr "" --"Project-Id-Version: indent 2.2.7\n" --"POT-Creation-Date: 2002-12-16 16:12+0000\n" --"PO-Revision-Date: 2001-09-05 08:38+0800\n" --"Last-Translator: Franklin W. \n" --"Language-Team: zh_TW.Big5 \n" --"MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=big5\n" --"Content-Transfer-Encoding: 8bit\n" -- --#: src/args.c:543 --msgid "usage: indent file [-o outfile ] [ options ]\n" --msgstr "用法：indent <輸入檔> [-o 輸出檔] [選項]\n" -- --#: src/args.c:544 --msgid " indent file1 file2 ... fileN [ options ]\n" --msgstr " indent <輸入檔1> <輸入檔2> ... [ 選項 ]\n" -- --#: src/args.c:609 --#, c-format --msgid "indent: missing argument to parameter %s\n" --msgstr "indent: 找不到 %s 的參數\n" -- --#: src/args.c:717 --#, c-format --msgid "indent: unknown option \"%s\"\n" --msgstr "indent: 未知的選項 \"%s\"\n" -- --#: src/args.c:728 --#, c-format --msgid "option: %s\n" --msgstr "選項：%s\n" -- --#: src/args.c:744 --#, c-format --msgid "GNU indent %s\n" --msgstr "" -- --#: src/args.c:827 --#, c-format --msgid "indent: option ``%s'' requires a numeric parameter\n" --msgstr "indent: ``%s'' 選項需要一個數字做為參數\n" -- --#: src/args.c:836 --#, c-format --msgid "indent: set_option: internal error: p_type %d\n" --msgstr "indent: 內部錯誤：set_option 函式中出現錯誤的 proto type %d\n" -- --#: src/args.c:892 --#, fuzzy --msgid "Profile contains an unterminated comment" --msgstr "設定檔中含有錯誤的字元" -- --#: src/args.c:929 --msgid "Profile contains unpalatable characters" --msgstr "設定檔中含有錯誤的字元" -- --#: src/backup.c:404 --msgid "indent: Strange version-control value\n" --msgstr "indent: 版本控制資訊有錯誤\n" -- --#: src/backup.c:405 --msgid "indent: Using numbered-existing\n" --msgstr "indent: 將改採現存的版本號\n" -- --#: src/backup.c:434 --#, c-format --msgid "indent: Can't make backup filename of %s\n" --msgstr "indent: 無法產生 %s 的備份檔\n" -- --#: src/backup.c:442 --#, c-format --msgid "Can't open backup file %s" --msgstr "無法開啟備份檔 %s" -- --#: src/backup.c:449 --#, c-format --msgid "Can't write to backup file %s" --msgstr "無法寫入備份檔 %s" -- --#: src/backup.c:463 --#, c-format --msgid "Can't preserve modification time on backup file %s" --msgstr "無法在備份檔 %s 中保留最後變更日期" -- --#: src/globs.c:41 src/globs.c:64 --msgid "indent: Virtual memory exhausted.\n" --msgstr "indent: 虛擬記憶體已用完\n" -- --#: src/globs.c:79 --#, c-format --msgid "indent: %s:%d: %s:" --msgstr "" -- --#: src/globs.c:93 --msgid "indent: Fatal Error: " --msgstr "indent: 嚴重錯誤：" -- --#: src/globs.c:103 --msgid "indent: System Error: " --msgstr "indent: 系統錯誤：" -- --#: src/globs.h:25 --msgid "Warning" --msgstr "" -- --#: src/globs.h:29 --msgid "Error" --msgstr "" -- --#: src/indent.c:156 --msgid "Ran out of memory" --msgstr "記憶體已用完" -- --#: src/indent.c:588 src/indent.c:1248 --#, c-format --msgid "Extra %c" --msgstr "多的字元 %c" -- --#: src/indent.c:1352 src/indent.c:1378 src/indent.c:2438 --msgid "Line broken" --msgstr "有一至數行被分割，請確認" -- --#: src/indent.c:1969 --msgid "Unmatched #else" --msgstr "#else 找不到相對應的關鍵字" -- --#: src/indent.c:1970 --msgid "Unmatched #elif" --msgstr "#elif 找不到相對應的關鍵字" -- --#: src/indent.c:1997 --msgid "Unmatched #endif" --msgstr "#endif 找不到相對應的關鍵字" -- --#: src/indent.c:2381 --msgid "EOF encountered in comment" --msgstr "在註解中碰到檔案結尾" -- --#: src/indent.c:2610 --msgid "Unexpected end of file" --msgstr "檔案結尾有問題" -- --#: src/indent.c:2616 --#, c-format --msgid "There were %d non-blank output lines and %d comments\n" --msgstr "已編排 %d 個非空白行與 %d 個註解\n" -- --#: src/indent.c:2620 --#, c-format --msgid "(Lines with comments)/(Lines with code): %6.3f\n" --msgstr "註解行與程式碼行的比例為：%6.3f\n" -- --#: src/indent.c:2644 --#, fuzzy --msgid "Line broken 2" --msgstr "有一至數行被分割，請確認" -- --#: src/indent.c:2846 --#, c-format --msgid "indent: only one output file (2nd was %s)\n" --msgstr "indent: 只能有一個輸出檔 (您指定了第二個輸出檔為 %s)\n" -- --#: src/indent.c:2855 src/indent.c:2881 --msgid "indent: only one input file when output file is specified\n" --msgstr "indent: 指定輸出檔時，只能有一個輸入檔\n" -- --#: src/indent.c:2869 src/indent.c:2916 --msgid "indent: can't have filenames when specifying standard input\n" --msgstr "indent: 指定使用標準輸入時，不能附帶輸入檔名\n" -- --#: src/indent.c:2889 --msgid "indent: only one input file when stdout is used\n" --msgstr "indent: 使用標準輸出時，只能有一個輸入檔\n" -- --#: src/indent.c:3103 --#, c-format --msgid "Read profile %s\n" --msgstr "讀取設定檔 %s\n" -- --#: src/io.c:187 --msgid "Internal buffering error" --msgstr "內部暫存器出現錯誤" -- --#: src/io.c:349 --#, c-format --msgid "Can't open input file %s" --msgstr "無法開啟輸入檔 %s" -- --#: src/io.c:354 --#, c-format --msgid "Can't stat input file %s" --msgstr "無法找到輸入檔 %s 的資訊" -- --#: src/io.c:359 --#, c-format --msgid "Warning: Zero-length file %s" --msgstr "警告：檔案 %s 沒有內容" -- --#: src/io.c:367 --#, c-format --msgid "File %s is too big to read" --msgstr "檔案 %s 太大，無法讀取" -- --#: src/io.c:375 --#, c-format --msgid "System problem reading file %s" --msgstr "讀取檔案 %s 時發生系統問題" -- --#: src/io.c:399 --#, c-format --msgid "Error reading input file %s" --msgstr "讀取輸入檔 %s 時發生錯誤" -- --#: src/io.c:404 --#, c-format --msgid "Error closeing input file %s" --msgstr "關閉輸入檔 %s 時發生問題" -- --#: src/io.c:588 --#, c-format --msgid "Warning: File %s contains NULL-characters\n" --msgstr "警告：檔案 %s 包含空字元（NULL-char）\n" -- --#: src/lexi.c:756 --msgid "Unterminated character constant" --msgstr "可能少掉一個字元單引號" -- --#: src/lexi.c:757 --msgid "Unterminated string constant" --msgstr "可能少掉一個字串雙引號" -- --#: src/lexi.c:999 --#, c-format --msgid "old style assignment ambiguity in \"=%c\". Assuming \"= %c\"\n" --msgstr "" --"有疑義的指定敘述 \"=%c\"，可能為舊式的寫法。indent 將假設它為 \"= %c\"\n" -- --#: src/output.c:1148 --#, c-format --msgid "indent: can't create %s\n" --msgstr "indent: 無法產生 %s\n" -- --#: src/output.c:1187 --#, c-format --msgid "Can't close output file %s" --msgstr "無法關閉輸出檔 %s" -- --#: src/output.c:1200 --#, c-format --msgid "Can't preserve modification time on output file %s" --msgstr "無法在輸出檔 %s 保留最後變更日期" -- --#: src/parse.c:399 --msgid "Unmatched 'else'" --msgstr "else 找不到相對應的 if" -- --#: src/parse.c:425 --msgid "Stmt nesting error." --msgstr "巢狀敘述有錯誤。" -- --#: src/parse.c:467 --msgid "Unknown code to parser" --msgstr "無法剖析的程式碼" -- --#: src/parse.c:477 --#, c-format --msgid "ParseStack [%d]:\n" --msgstr "" -- --#: src/parse.c:481 --#, c-format --msgid " stack[%d] => stack: %d ind_level: %d\n" --msgstr "" -- --#: src/wildexp.c:90 --msgid "CANNOT FIND '@' FILE!" --msgstr "無法找到 '@' 檔案。" -diff -burpN indent-2.2.9/po/zh_TW.po indent-2.2.9-po/po/zh_TW.po ---- indent-2.2.9/po/zh_TW.po 1970-01-01 01:00:00.000000000 +0100 -+++ indent-2.2.9-po/po/zh_TW.po 2006-02-03 15:18:19.000000000 +0100 -@@ -0,0 +1,283 @@ -+# Language file for GNU indent (use indent.pot as template). -+# Copyright (C) 2001 Free Software Foundation, Inc. -+# Carlo Wood , 2001. -+# Franklin W. , 2002 -+# Wei-Lun Chao , 2004 -+msgid "" -+msgstr "" -+"Project-Id-Version: indent 2.2.9\n" -+"POT-Creation-Date: 2002-12-16 16:12+0000\n" -+"PO-Revision-Date: 2006-02-03 15:18+0100\n" -+"Last-Translator: Wei-Lun Chao \n" -+"Language-Team: zh_TW \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#: src/args.c:543 -+msgid "usage: indent file [-o outfile ] [ options ]\n" -+msgstr "冽嚗indent <頛詨交> [-o 頛詨箸] [賊]\n" -+ -+#: src/args.c:544 -+msgid " indent file1 file2 ... fileN [ options ]\n" -+msgstr " indent <頛詨交1> <頛詨交2> ... [ 賊 ]\n" -+ -+#: src/args.c:609 -+#, c-format -+msgid "indent: missing argument to parameter %s\n" -+msgstr "indent: 曆 %s 稞n" -+ -+#: src/args.c:717 -+#, c-format -+msgid "indent: unknown option \"%s\"\n" -+msgstr "indent: 芰亦賊 \"%s\"\n" -+ -+#: src/args.c:728 -+#, c-format -+msgid "option: %s\n" -+msgstr "賊嚗%s\n" -+ -+#: src/args.c:744 -+#, c-format -+msgid "GNU indent %s\n" -+msgstr "GNU indent %s\n" -+ -+#: src/args.c:827 -+#, c-format -+msgid "indent: option ``%s'' requires a numeric parameter\n" -+msgstr "indent: ``%s'' 賊閬銝詨箏稞n" -+ -+#: src/args.c:836 -+#, c-format -+msgid "indent: set_option: internal error: p_type %d\n" -+msgstr "indent: 折券航炊嚗set_option 賢銝剖箇暸航炊 proto type %d\n" -+ -+#: src/args.c:892 -+#, fuzzy -+msgid "Profile contains an unterminated comment" -+msgstr "閮剖瑼銝剖急航炊摮" -+ -+#: src/args.c:929 -+msgid "Profile contains unpalatable characters" -+msgstr "閮剖瑼銝剖急航炊摮" -+ -+#: src/backup.c:404 -+msgid "indent: Strange version-control value\n" -+msgstr "indent: 祆批嗉閮航炊\n" -+ -+#: src/backup.c:405 -+msgid "indent: Using numbered-existing\n" -+msgstr "indent: 撠寞∠曉祈\n" -+ -+#: src/backup.c:434 -+#, c-format -+msgid "indent: Can't make backup filename of %s\n" -+msgstr "indent: ⊥Ｙ %s 隞賣\n" -+ -+#: src/backup.c:442 -+#, c-format -+msgid "Can't open backup file %s" -+msgstr "⊥隞賣 %s" -+ -+#: src/backup.c:449 -+#, c-format -+msgid "Can't write to backup file %s" -+msgstr "⊥撖怠亙隞賣 %s" -+ -+#: src/backup.c:463 -+#, c-format -+msgid "Can't preserve modification time on backup file %s" -+msgstr "⊥典隞賣 %s 銝凋敺霈湔交" -+ -+#: src/globs.c:41 src/globs.c:64 -+msgid "indent: Virtual memory exhausted.\n" -+msgstr "indent: 祈園撌脩典\n" -+ -+#: src/globs.c:79 -+#, c-format -+msgid "indent: %s:%d: %s:" -+msgstr "indent: %s:%d: %s:" -+ -+#: src/globs.c:93 -+msgid "indent: Fatal Error: " -+msgstr "indent: 湧航炊嚗" -+ -+#: src/globs.c:103 -+msgid "indent: System Error: " -+msgstr "indent: 蝟餌絞航炊嚗" -+ -+#: src/globs.h:25 -+msgid "Warning" -+msgstr "霅血" -+ -+#: src/globs.h:29 -+msgid "Error" -+msgstr "航炊" -+ -+#: src/indent.c:156 -+msgid "Ran out of memory" -+msgstr "閮園撌脩典" -+ -+#: src/indent.c:588 src/indent.c:1248 -+#, c-format -+msgid "Extra %c" -+msgstr "憭摮 %c" -+ -+#: src/indent.c:1352 src/indent.c:1378 src/indent.c:2438 -+msgid "Line broken" -+msgstr "銝單詨鋡怠莎隢蝣箄" -+ -+#: src/indent.c:1969 -+msgid "Unmatched #else" -+msgstr "#else 曆啁詨萄" -+ -+#: src/indent.c:1970 -+msgid "Unmatched #elif" -+msgstr "#elif 曆啁詨萄" -+ -+#: src/indent.c:1997 -+msgid "Unmatched #endif" -+msgstr "#endif 曆啁詨萄" -+ -+#: src/indent.c:2381 -+msgid "EOF encountered in comment" -+msgstr "刻酉閫銝剔１唳獢蝯撠" -+ -+#: src/indent.c:2610 -+msgid "Unexpected end of file" -+msgstr "瑼獢蝯撠暹憿" -+ -+#: src/indent.c:2616 -+#, c-format -+msgid "There were %d non-blank output lines and %d comments\n" -+msgstr "撌脩楊 %d 蝛箇賢 %d 閮餉圾\n" -+ -+#: src/indent.c:2620 -+#, c-format -+msgid "(Lines with comments)/(Lines with code): %6.3f\n" -+msgstr "閮餉圾蝔撘蝣澆瘥靘綽%6.3f\n" -+ -+#: src/indent.c:2644 -+#, fuzzy -+msgid "Line broken 2" -+msgstr "銝單詨鋡怠莎隢蝣箄" -+ -+#: src/indent.c:2846 -+#, c-format -+msgid "indent: only one output file (2nd was %s)\n" -+msgstr "indent: 芾賣銝頛詨箸 (冽摰鈭蝚砌頛詨箸 %s)\n" -+ -+#: src/indent.c:2855 src/indent.c:2881 -+msgid "indent: only one input file when output file is specified\n" -+msgstr "indent: 摰頛詨箸嚗芾賣銝頛詨交\n" -+ -+#: src/indent.c:2869 src/indent.c:2916 -+msgid "indent: can't have filenames when specifying standard input\n" -+msgstr "indent: 摰雿輻冽皞頛詨交嚗銝賡撣嗉撓交\n" -+ -+#: src/indent.c:2889 -+msgid "indent: only one input file when stdout is used\n" -+msgstr "indent: 雿輻冽皞頛詨箸嚗芾賣銝頛詨交\n" -+ -+#: src/indent.c:3103 -+#, c-format -+msgid "Read profile %s\n" -+msgstr "霈閮剖瑼 %s\n" -+ -+#: src/io.c:187 -+msgid "Internal buffering error" -+msgstr "折冽怠典箇暸航炊" -+ -+#: src/io.c:349 -+#, c-format -+msgid "Can't open input file %s" -+msgstr "⊥頛詨交 %s" -+ -+#: src/io.c:354 -+#, c-format -+msgid "Can't stat input file %s" -+msgstr "⊥曉啗撓交 %s 鞈閮" -+ -+#: src/io.c:359 -+#, c-format -+msgid "Warning: Zero-length file %s" -+msgstr "霅血嚗瑼獢 %s 瘝批捆" -+ -+#: src/io.c:367 -+#, c-format -+msgid "File %s is too big to read" -+msgstr "瑼獢 %s 憭芸之嚗⊥霈" -+ -+#: src/io.c:375 -+#, c-format -+msgid "System problem reading file %s" -+msgstr "霈瑼獢 %s 潛蝟餌絞憿" -+ -+#: src/io.c:399 -+#, c-format -+msgid "Error reading input file %s" -+msgstr "霈頛詨交 %s 潛航炊" -+ -+#: src/io.c:404 -+#, c-format -+msgid "Error closeing input file %s" -+msgstr "頛詨交 %s 潛憿" -+ -+#: src/io.c:588 -+#, c-format -+msgid "Warning: File %s contains NULL-characters\n" -+msgstr "霅血嚗瑼獢 %s 怎征摮嚗NULL-char嚗\n" -+ -+#: src/lexi.c:756 -+msgid "Unterminated character constant" -+msgstr "航賢銝摮桀" -+ -+#: src/lexi.c:757 -+msgid "Unterminated string constant" -+msgstr "航賢銝摮銝脤撘" -+ -+#: src/lexi.c:999 -+#, c-format -+msgid "old style assignment ambiguity in \"=%c\". Assuming \"= %c\"\n" -+msgstr "蝢拍摰餈 \"=%c\"嚗航賜箄撘撖急indent 撠閮剖 \"= %c\"\n" -+ -+#: src/output.c:1148 -+#, c-format -+msgid "indent: can't create %s\n" -+msgstr "indent: ⊥Ｙ %s\n" -+ -+#: src/output.c:1187 -+#, c-format -+msgid "Can't close output file %s" -+msgstr "⊥頛詨箸 %s" -+ -+#: src/output.c:1200 -+#, c-format -+msgid "Can't preserve modification time on output file %s" -+msgstr "⊥刻撓箸 %s 靽敺霈湔交" -+ -+#: src/parse.c:399 -+msgid "Unmatched 'else'" -+msgstr "else 曆啁詨 if" -+ -+#: src/parse.c:425 -+msgid "Stmt nesting error." -+msgstr "撌Ｙ餈唳航炊" -+ -+#: src/parse.c:467 -+msgid "Unknown code to parser" -+msgstr "⊥蝔撘蝣" -+ -+#: src/parse.c:477 -+#, c-format -+msgid "ParseStack [%d]:\n" -+msgstr " [%d]:\n" -+ -+#: src/parse.c:481 -+#, c-format -+msgid " stack[%d] => stack: %d ind_level: %d\n" -+msgstr " [%d] => : %d 撅斤: %d\n" -+ -+#: src/wildexp.c:90 -+msgid "CANNOT FIND '@' FILE!" -+msgstr "⊥曉 '@' 瑼獢" diff --git a/indent.spec b/indent.spec index 5309460..1e69276 100644 --- a/indent.spec +++ b/indent.spec @@ -1,21 +1,18 @@ # -*- coding: utf-8 -*- Summary: A GNU program for formatting C code Name: indent -Version: 2.2.9 -Release: 19%{?dist} -License: GPLv2+ +Version: 2.2.10 +Release: 1%{?dist} +License: GPLv3+ Group: Applications/Text -URL: http://www.gnu.org/software/indent/ -Source: ftp://ftp.gnu.org/pub/gnu/indent/indent-%{version}.tar.gz -Patch: indent-2.2.9-fix.patch -Patch2: indent-2.2.9-gcc4.patch +URL: http://indent.isidore-it.eu/beautify.html +Source: http://indent.isidore-it.eu/%{name}-%{version}.tar.gz Patch3: indent-2.2.9-explicits.patch Patch4: indent-2.2.9-cdw.patch Patch5: indent-2.2.9-lcall.patch -Patch6: indent-2.2.9-zh_TW.patch Patch7: indent-2.2.9-man.patch BuildRequires: gettext texinfo -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -30,22 +27,19 @@ you want a program to format your code. %prep %setup -q -%patch -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 %build %configure -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT/%{_infodir}/dir $RPM_BUILD_ROOT/usr/bin/texinfo2man \ +rm -f $RPM_BUILD_ROOT/%{_infodir}/dir $RPM_BUILD_ROOT/%{_bindir}/texinfo2man \ $RPM_BUILD_ROOT/usr/doc/indent/indent.html %find_lang %name @@ -67,13 +61,20 @@ if [ "$1" = 0 ]; then fi %files -f %{name}.lang +%doc AUTHORS COPYING NEWS README %defattr(-,root,root) -/usr/bin/indent -%{_mandir}/*/* -%{_infodir}/* +%{_bindir}/indent +%{_mandir}/man1/indent.* +%{_infodir}/indent.info* %changelog +* Wed Mar 12 2008 Petr Machata - 2.2.10-1 +- Rebase to 2.2.10 + - Dropped three patches + - Fix Source and URL + - Clean up spec + * Tue Feb 19 2008 Fedora Release Engineering - 2.2.9-19 - Autorebuild for GCC 4.3