[Pkg-mc-commits] r12 - trunk/debian/patches
winnie at alioth.debian.org
winnie at alioth.debian.org
Fri Jan 25 07:35:37 UTC 2008
Author: winnie
Date: 2008-01-25 07:35:37 +0000 (Fri, 25 Jan 2008)
New Revision: 12
Removed:
trunk/debian/patches/36_developer_mode.patch
Modified:
trunk/debian/patches/28_mc-ctype.patch
trunk/debian/patches/28_mc-dontrewrite.patch
trunk/debian/patches/32_c-vs-cxx.patch
trunk/debian/patches/37_mcedit-segv.patch
Log:
Work further on patches
Modified: trunk/debian/patches/28_mc-ctype.patch
===================================================================
--- trunk/debian/patches/28_mc-ctype.patch 2008-01-24 23:47:13 UTC (rev 11)
+++ trunk/debian/patches/28_mc-ctype.patch 2008-01-25 07:35:37 UTC (rev 12)
@@ -1,9 +1,9 @@
---- edit/editcmd.c 2005-03-17 22:18:23.000000000 +0100
-+++ edit/editcmd.c 2005-03-30 10:05:48.983156480 +0200
-@@ -24,7 +24,6 @@
- /* #define PIPE_BLOCKS_SO_READ_BYTE_BY_BYTE */
+--- ./edit/editcmd.c.orig 2007-05-02 13:22:01.000000000 +0200
++++ ./edit/editcmd.c 2008-01-25 07:44:38.000000000 +0100
+@@ -26,7 +26,6 @@
+ #include <config.h>
- #include <config.h>
+ #include <assert.h>
-#include <ctype.h>
#include <stdio.h>
Modified: trunk/debian/patches/28_mc-dontrewrite.patch
===================================================================
--- trunk/debian/patches/28_mc-dontrewrite.patch 2008-01-24 23:47:13 UTC (rev 11)
+++ trunk/debian/patches/28_mc-dontrewrite.patch 2008-01-25 07:35:37 UTC (rev 12)
@@ -1,11 +1,22 @@
---- edit/editcmd.c 2005-03-17 22:18:23.000000000 +0100
-+++ edit/editcmd.c 2005-03-30 09:28:25.076282176 +0200
-@@ -240,7 +240,7 @@ edit_save_file (WEdit *edit, const char
- }
+diff -Nurwd mc-4.6.2~pre1/edit/editcmd.c mc-4.6.2~pre1.patched/edit/editcmd.c
+--- mc-4.6.2~pre1/edit/editcmd.c 2007-05-02 13:22:01.000000000 +0200
++++ mc-4.6.2~pre1.patched/edit/editcmd.c 2008-01-25 08:15:57.000000000 +0100
+@@ -26,7 +26,6 @@
+ #include <config.h>
- if (!vfs_file_is_local (filename) ||
-- (fd = mc_open (filename, O_WRONLY | O_BINARY)) == -1) {
-+ (fd = mc_open (filename, O_RDONLY | O_BINARY)) == -1) {
- /*
- * The file does not exists yet, so no safe save or
- * backup are necessary.
+ #include <assert.h>
+-#include <ctype.h>
+
+ #include <stdio.h>
+ #include <stdarg.h>
+@@ -244,7 +243,8 @@
+ this_save_mode = option_save_mode;
+ if (this_save_mode != EDIT_QUICK_SAVE) {
+ if (!vfs_file_is_local (filename) ||
+- (fd = mc_open (filename, O_WRONLY | O_BINARY)) == -1) {
++ (fd = mc_open (filename, O_RDONLY | O_BINARY)) == -1) {
++
+ /*
+ * The file does not exists yet, so no safe save or
+ * backup are necessary.
+Binärdateien mc-4.6.2~pre1/.swp and mc-4.6.2~pre1.patched/.swp sind verschieden.
Modified: trunk/debian/patches/32_c-vs-cxx.patch
===================================================================
--- trunk/debian/patches/32_c-vs-cxx.patch 2008-01-24 23:47:13 UTC (rev 11)
+++ trunk/debian/patches/32_c-vs-cxx.patch 2008-01-25 07:35:37 UTC (rev 12)
@@ -1,28 +1,8 @@
---- syntax/Makefile.am 6 Dec 2004 23:14:43 -0000 1.22
-+++ syntax/Makefile.am 20 Feb 2005 09:42:01 -0000
-@@ -4,4 +4,5 @@
- aspx.syntax \
- c.syntax \
-+ cxx.syntax \
- cs.syntax \
- changelog.syntax \
---- syntax/Syntax 3 Nov 2004 20:16:48 -0000 1.27
-+++ syntax/Syntax 20 Feb 2005 09:42:01 -0000
-@@ -69,7 +69,10 @@
- include texinfo.syntax
-
--file ..\*\\.([chC]|CC|cxx|cc|cpp|CPP|CXX|hxx|h\.in)$ C/C\+\+\sProgram
-+file ..\*\\.c$ C\sProgram
- include c.syntax
-
-+file ..\*\\.([hC]|CC|cxx|cc|cpp|CPP|CXX|hxx|h\.in)$ C/C\+\+\sProgram
-+include cxx.syntax
-+
- file ..\*\\.[fF]$ Fortran\sProgram
- include fortran.syntax
---- syntax/c.syntax 15 Mar 2003 04:41:20 -0000 1.15
-+++ syntax/c.syntax 20 Feb 2005 09:42:01 -0000
-@@ -33,32 +33,5 @@
+diff -Nurwd mc-4.6.2~pre1/syntax/c.syntax mc-4.6.2~pre1.patched/syntax/c.syntax
+--- mc-4.6.2~pre1/syntax/c.syntax 2006-06-22 14:49:24.000000000 +0200
++++ mc-4.6.2~pre1.patched/syntax/c.syntax 2008-01-25 08:19:52.000000000 +0100
+@@ -33,34 +33,7 @@
+ keyword whole volatile yellow
keyword whole while yellow
keyword whole asm yellow
- keyword whole catch yellow
@@ -55,3 +35,32 @@
- keyword whole using yellow
keyword whole wchar_t yellow
keyword whole ... yellow
+ keyword whole linestart \{\s\t\}\[\s\t\]#*\n brightmagenta
+diff -Nurwd mc-4.6.2~pre1/syntax/Makefile.am mc-4.6.2~pre1.patched/syntax/Makefile.am
+--- mc-4.6.2~pre1/syntax/Makefile.am 2007-08-27 08:56:47.000000000 +0200
++++ mc-4.6.2~pre1.patched/syntax/Makefile.am 2008-01-25 08:19:52.000000000 +0100
+@@ -3,6 +3,7 @@
+ ada95.syntax \
+ aspx.syntax \
+ assembler.syntax \
++ cxx.syntax \
+ c.syntax \
+ changelog.syntax \
+ cs.syntax \
+diff -Nurwd mc-4.6.2~pre1/syntax/Syntax mc-4.6.2~pre1.patched/syntax/Syntax
+--- mc-4.6.2~pre1/syntax/Syntax 2007-08-27 08:56:47.000000000 +0200
++++ mc-4.6.2~pre1.patched/syntax/Syntax 2008-01-25 08:19:52.000000000 +0100
+@@ -76,9 +76,12 @@
+ file ..\*\.(texi|texinfo|TEXI|TEXINFO)$ Texinfo\sDocument
+ include texinfo.syntax
+
+-file ..\*\\.([chC]|CC|cxx|cc|cpp|CPP|CXX|hxx|h\.in)$ C/C\+\+\sProgram
++file ..\*\\.c$ C\sProgram
+ include c.syntax
+
++file ..\*\\.([hC]|CC|cxx|cc|cpp|CPP|CXX|hxx|h\.in)$ C/C\+\+\sProgram
++include cxx.syntax
++
+ file ..\*\\.d$ D\sProgram
+ include d.syntax
+
Deleted: trunk/debian/patches/36_developer_mode.patch
===================================================================
--- trunk/debian/patches/36_developer_mode.patch 2008-01-24 23:47:13 UTC (rev 11)
+++ trunk/debian/patches/36_developer_mode.patch 2008-01-25 07:35:37 UTC (rev 12)
@@ -1,42 +0,0 @@
---- configure.ac 2005-04-19 23:12:27.000000000 +0200
-+++ configure.ac 2005-04-19 23:14:32.000000000 +0200
-@@ -556,15 +556,7 @@
- AC_DEFINE(USE_INCLUDED_SLANG, 1, [Use the S-Lang included here])
- fi
-
--if test x"$USE_MAINTAINER_MODE" = x"yes"; then
-- if test x"${enable_gcc_warnings+set}" != x"set"; then
-- if test x"${GCC}" = x"yes"; then
-- CFLAGS="-Wall $CFLAGS"
-- fi
-- fi
--fi
--
--ri_GCC_WARNINGS
-+MC_ARG_ENABLE_DEVELOPER_MODE()
-
- AC_SUBST(CFLAGS)
- AC_SUBST(CPPFLAGS)
---- acinclude.m4 2005-01-11 10:15:33.000000000 +0100
-+++ acinclude.m4 2005-04-19 23:12:27.000000000 +0200
-@@ -898,3 +898,20 @@
- [Define if functions cannot be renamed by asm labels])
- fi
- ])
-+
-+AC_DEFUN([MC_ARG_ENABLE_DEVELOPER_MODE],
-+[AC_ARG_ENABLE([developer-mode],
-+ AS_HELP_STRING([--enable-developer-mode], [Enable debugging help]))
-+AM_CONDITIONAL([DEVELOPER], [test x"$enable_developer_mode" = x"yes"])
-+if test x"$enable_developer_mode" = x"yes"; then
-+ AC_DEFINE([MC_ENABLE_DEBUGGING_CODE], [1], [Enable debugging code])
-+ if test x"$GCC" = x"yes"; then
-+dnl Developers get some useful warnings and debugging support.
-+dnl This will make the backtrace output more readable.
-+ CFLAGS="-W -Wall -ggdb ${CFLAGS}"
-+ fi
-+elif test x"$GCC" = x"yes"; then
-+dnl Some warnings cannot hurt at all
-+ CFLAGS="-Wall"
-+fi
-+])
Modified: trunk/debian/patches/37_mcedit-segv.patch
===================================================================
--- trunk/debian/patches/37_mcedit-segv.patch 2008-01-24 23:47:13 UTC (rev 11)
+++ trunk/debian/patches/37_mcedit-segv.patch 2008-01-25 07:35:37 UTC (rev 12)
@@ -1,6 +1,7 @@
---- edit/edit-widget.h 3 Dec 2004 17:09:27 -0000 1.24
-+++ edit/edit-widget.h 15 Apr 2005 21:33:35 -0000
-@@ -93,6 +93,7 @@ struct WEdit {
+diff -Nurwd mc-4.6.2~pre1/edit/edit-widget.h mc-4.6.2~pre1.patched/edit/edit-widget.h
+--- mc-4.6.2~pre1/edit/edit-widget.h 2007-02-03 02:03:53.000000000 +0100
++++ mc-4.6.2~pre1.patched/edit/edit-widget.h 2008-01-25 08:29:57.000000000 +0100
+@@ -99,6 +99,7 @@
/* syntax higlighting */
struct _syntax_marker *syntax_marker;
struct context_rule **rules;
@@ -8,17 +9,10 @@
long last_get_rule;
struct syntax_rule rule;
char *syntax_type; /* description of syntax highlighting type being used */
---- edit/syntax.c 22 Feb 2005 17:00:38 -0000 1.73
-+++ edit/syntax.c 15 Apr 2005 21:33:35 -0000
-@@ -678,6 +678,7 @@ edit_read_syntax_rules (WEdit *edit, FIL
- strcpy (whole_right, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_01234567890");
-
- r = edit->rules = g_malloc (alloc_contexts * sizeof (struct context_rule *));
-+ edit->rules_count = 0;
-
- if (!edit->defines)
- edit->defines = g_tree_new ((GCompareFunc) strcmp);
-@@ -908,6 +909,7 @@ edit_read_syntax_rules (WEdit *edit, FIL
+diff -Nurwd mc-4.6.2~pre1/edit/syntax.c mc-4.6.2~pre1.patched/edit/syntax.c
+--- mc-4.6.2~pre1/edit/syntax.c 2006-08-02 17:18:22.000000000 +0200
++++ mc-4.6.2~pre1.patched/edit/syntax.c 2008-01-25 08:29:57.000000000 +0100
+@@ -941,6 +941,7 @@
if (num_contexts == -1) {
return line;
}
@@ -26,25 +20,3 @@
{
char *first_chars, *p;
-@@ -932,17 +934,18 @@ edit_read_syntax_rules (WEdit *edit, FIL
-
- void edit_free_syntax_rules (WEdit * edit)
- {
-- int i, j;
-+ size_t i, j;
- if (!edit)
- return;
- if (edit->defines)
- destroy_defines (&edit->defines);
- if (!edit->rules)
- return;
-- edit_get_rule (edit, -1);
-+ if (edit->rules_count > 0)
-+ edit_get_rule (edit, -1);
- syntax_g_free (edit->syntax_type);
- edit->syntax_type = 0;
-- for (i = 0; edit->rules[i]; i++) {
-+ for (i = 0; i < edit->rules_count; i++) {
- if (edit->rules[i]->keyword) {
- for (j = 0; edit->rules[i]->keyword[j]; j++) {
- syntax_g_free (edit->rules[i]->keyword[j]->keyword);
More information about the Pkg-mc-commits
mailing list