Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

2008-09-02 Ivan N. Zlatev <contact@i-nz.net>

	* deps/Mono.Design/patches/DesignerHost-designer-type-replacement.patch, 
	  deps/Mono.Design/patches/DesignerSerializationManager-serializer-type-replacement.patch:
	  Fix the hunk headers, so that the patches actually apply.
	* deps/Mono.Design/generate-mono-design.py: Report patching errors.
	[Fixes bug #418197]


svn path=/trunk/mwf-designer/; revision=112072
  • Loading branch information...
commit 77ed21697d4adca02fa02333a0e71481664de97b 1 parent f7fac5f
Ivan Zlatev ivanz authored
8 ChangeLog
... ... @@ -1,3 +1,11 @@
  1 +2008-09-02 Ivan N. Zlatev <contact@i-nz.net>
  2 +
  3 + * deps/Mono.Design/patches/DesignerHost-designer-type-replacement.patch,
  4 + deps/Mono.Design/patches/DesignerSerializationManager-serializer-type-replacement.patch:
  5 + Fix the hunk headers, so that the patches actually apply.
  6 + * deps/Mono.Design/generate-mono-design.py: Report patching errors.
  7 + [Fixes bug #418197]
  8 +
1 9 2008-09-01 Ivan N. Zlatev <contact@i-nz.net>
2 10
3 11 * deps/Mono.Design/patches/DesignerHost-designer-type-replacement.patch,
8 deps/Mono.Design/generate-mono-design.py
@@ -96,9 +96,13 @@ def apply_patches (patches):
96 96 for patch in patches:
97 97 if os.name == "nt":
98 98 file_lf_to_clrf (patch); # fix line endings just in case
99   - os.system ("patches\\patch.exe -p0 -i \"" + patch + "\"")
  99 + out, inn, err = os.popen3 ("patches\\patch.exe -p0 -i \"" + patch + "\"")
100 100 else:
101   - os.system ("patch -p0 -i \"" + patch + "\"")
  101 + out, inn, err = os.popen3 ("patch -p0 -i \"" + patch + "\"")
  102 +
  103 + error = err.read ()
  104 + if len (error) > 0:
  105 + print os.path.basename (patch) + ": " + error
102 106
103 107 if __name__ == "__main__":
104 108 main ()
2  deps/Mono.Design/patches/DesignerHost-designer-type-replacement.patch
@@ -24,7 +24,7 @@
24 24 break;
25 25 }
26 26 }
27   -@@ -353,6 +354,41 @@
  27 +@@ -353,6 +354,39 @@
28 28 return instance;
29 29 }
30 30
2  deps/Mono.Design/patches/DesignerSerializationManager-serializer-type-replacement.patch
@@ -12,7 +12,7 @@
12 12 BindingFlags.CreateInstance | BindingFlags.Instance |
13 13 BindingFlags.Public | BindingFlags.NonPublic,
14 14 null, null, null);
15   -@@ -283,6 +283,24 @@
  15 +@@ -283,6 +283,22 @@
16 16 return serializer;
17 17 }
18 18

0 comments on commit 77ed216

Please sign in to comment.
Something went wrong with that request. Please try again.