[DRE-commits] r5271 - in trunk/libxml-parser-ruby/debian: . patches
Deepak Tripathi
deepak-guest at alioth.debian.org
Mon May 10 11:03:25 UTC 2010
Author: deepak-guest
Date: 2010-05-10 11:03:24 +0000 (Mon, 10 May 2010)
New Revision: 5271
Added:
trunk/libxml-parser-ruby/debian/patches/001-replaces_gt_symbol_by_enconded_version.patch
Removed:
trunk/libxml-parser-ruby/debian/patches/001-adds_return_statement_to_return_value.patch
trunk/libxml-parser-ruby/debian/patches/002-replaces_gt_symbol_by_enconded_version.patch
trunk/libxml-parser-ruby/debian/patches/003-port-to-ruby1.9.patch
Modified:
trunk/libxml-parser-ruby/debian/copyright
Log:
Deleted old patches, which is not required not. also added one for gt symbol,Ported to 1.9.1
Modified: trunk/libxml-parser-ruby/debian/copyright
===================================================================
--- trunk/libxml-parser-ruby/debian/copyright 2010-05-10 10:52:21 UTC (rev 5270)
+++ trunk/libxml-parser-ruby/debian/copyright 2010-05-10 11:03:24 UTC (rev 5271)
@@ -7,9 +7,8 @@
Yoshida Masato <yoshidam at yoshidam.net>
XPointer support is contributed by Masaki Fukushima <fukusima at goto.info.waseda.ac.jp>
encoding.h and the functions of encoding map are part of XML::Parser for Perl.
- Copyright (c) 1998 Larry Wall and Clark Cooper.
- All rights reserved.
- his program is free software; you can redistribute it and/or modify it under the same
+ Copyright (c) 1998 Larry Wall and Clark Cooper. All rights reserved.
+ His program is free software; you can redistribute it and/or modify it under the same
terms as Perl itself.
Copyright: Ruby's
Deleted: trunk/libxml-parser-ruby/debian/patches/001-adds_return_statement_to_return_value.patch
===================================================================
--- trunk/libxml-parser-ruby/debian/patches/001-adds_return_statement_to_return_value.patch 2010-05-10 10:52:21 UTC (rev 5270)
+++ trunk/libxml-parser-ruby/debian/patches/001-adds_return_statement_to_return_value.patch 2010-05-10 11:03:24 UTC (rev 5271)
@@ -1,11 +0,0 @@
---- lib/xml/saxdriver.rb-or 2008-06-27 20:44:58.878527643 -0300
-+++ lib/xml/saxdriver.rb 2008-06-27 20:46:09.577836925 -0300
-@@ -168,7 +168,7 @@
- ## open stream if it is not opened
- def openInputStream(stream)
- if stream.getByteStream
-- stream
-+ return stream
- else stream.getSystemId
- url = URL.new(stream.getSystemId)
- if url.scheme == 'file' && url.login == 'localhost'
Added: trunk/libxml-parser-ruby/debian/patches/001-replaces_gt_symbol_by_enconded_version.patch
===================================================================
--- trunk/libxml-parser-ruby/debian/patches/001-replaces_gt_symbol_by_enconded_version.patch (rev 0)
+++ trunk/libxml-parser-ruby/debian/patches/001-replaces_gt_symbol_by_enconded_version.patch 2010-05-10 11:03:24 UTC (rev 5271)
@@ -0,0 +1,44 @@
+--- samples/expat-1.2/exttest.rb-or 2008-06-27 21:01:14.048338043 -0300
++++ samples/expat-1.2/exttest.rb 2008-06-27 21:01:35.025317132 -0300
+@@ -24,6 +24,8 @@
+ ret << """
+ elsif c == "<"
+ ret << "<"
++ elsif c == ">"
++ ret << ">"
+ else
+ ret << c
+ end
+--- samples/expat-1.2/exttesti.rb-or 2008-06-27 21:01:54.846266663 -0300
++++ samples/expat-1.2/exttesti.rb 2008-06-27 21:02:11.107011550 -0300
+@@ -14,6 +14,8 @@
+ ret << """
+ elsif c == "<"
+ ret << "<"
++ elsif c == ">"
++ ret << ">"
+ else
+ ret << c
+ end
+--- lib/xml/dom/core.rb-or 2008-06-27 20:59:32.683571274 -0300
++++ lib/xml/dom/core.rb 2008-06-27 20:55:40.784674948 -0300
+@@ -1846,6 +1846,8 @@
+ value << """
+ when ?<
+ value << "<"
++ when ?>
++ value << ">"
+ else
+ value << code
+ end
+--- lib/xml/dom2/attr.rb-or 2008-06-27 20:57:36.750125082 -0300
++++ lib/xml/dom2/attr.rb 2008-06-27 20:58:40.725139931 -0300
+@@ -122,6 +122,8 @@
+ value << """
+ elsif c == "<"
+ value << "<"
++ elsif c == ">"
++ value << ">"
+ else
+ value << c
+ end
Deleted: trunk/libxml-parser-ruby/debian/patches/002-replaces_gt_symbol_by_enconded_version.patch
===================================================================
--- trunk/libxml-parser-ruby/debian/patches/002-replaces_gt_symbol_by_enconded_version.patch 2010-05-10 10:52:21 UTC (rev 5270)
+++ trunk/libxml-parser-ruby/debian/patches/002-replaces_gt_symbol_by_enconded_version.patch 2010-05-10 11:03:24 UTC (rev 5271)
@@ -1,44 +0,0 @@
---- samples/expat-1.2/exttest.rb-or 2008-06-27 21:01:14.048338043 -0300
-+++ samples/expat-1.2/exttest.rb 2008-06-27 21:01:35.025317132 -0300
-@@ -24,6 +24,8 @@
- ret << """
- elsif c == "<"
- ret << "<"
-+ elsif c == ">"
-+ ret << ">"
- else
- ret << c
- end
---- samples/expat-1.2/exttesti.rb-or 2008-06-27 21:01:54.846266663 -0300
-+++ samples/expat-1.2/exttesti.rb 2008-06-27 21:02:11.107011550 -0300
-@@ -14,6 +14,8 @@
- ret << """
- elsif c == "<"
- ret << "<"
-+ elsif c == ">"
-+ ret << ">"
- else
- ret << c
- end
---- lib/xml/dom/core.rb-or 2008-06-27 20:59:32.683571274 -0300
-+++ lib/xml/dom/core.rb 2008-06-27 20:55:40.784674948 -0300
-@@ -1846,6 +1846,8 @@
- value << """
- when ?<
- value << "<"
-+ when ?>
-+ value << ">"
- else
- value << code
- end
---- lib/xml/dom2/attr.rb-or 2008-06-27 20:57:36.750125082 -0300
-+++ lib/xml/dom2/attr.rb 2008-06-27 20:58:40.725139931 -0300
-@@ -122,6 +122,8 @@
- value << """
- elsif c == "<"
- value << "<"
-+ elsif c == ">"
-+ value << ">"
- else
- value << c
- end
Deleted: trunk/libxml-parser-ruby/debian/patches/003-port-to-ruby1.9.patch
===================================================================
--- trunk/libxml-parser-ruby/debian/patches/003-port-to-ruby1.9.patch 2010-05-10 10:52:21 UTC (rev 5270)
+++ trunk/libxml-parser-ruby/debian/patches/003-port-to-ruby1.9.patch 2010-05-10 11:03:24 UTC (rev 5271)
@@ -1,128 +0,0 @@
---- xmlparser.c-or 2004-04-20 09:04:24.000000000 -0700
-+++ xmlparser.c 2009-11-07 21:03:23.000000000 -0800
-@@ -1045,21 +1045,21 @@
- {
- VALUE v;
- int len;
-- int slen = RSTRING(rb_ivar_get((VALUE)data,
-- id_map))->ptr[*(unsigned char*)s];
-+ int slen = RSTRING_PTR(rb_ivar_get((VALUE)data,
-+ id_map))[*(unsigned char*)s];
-
- v = rb_funcall((VALUE)data, id_convert, 1, rb_str_new((char*)s, -slen));
- switch (TYPE(v)) {
- case T_FIXNUM:
- return FIX2INT(v);
- case T_STRING:
-- len = RSTRING(v)->len;
-+ len = RSTRING_LEN(v);
- if (len == 1) {
-- return (unsigned char)*(RSTRING(v)->ptr);
-+ return (unsigned char)*(RSTRING_PTR(v));
- }
- else if (len >= 2) {
-- return (unsigned char)*(RSTRING(v)->ptr) |
-- (unsigned char)*(RSTRING(v)->ptr + 1) << 8;
-+ return (unsigned char)*(RSTRING_PTR(v)) |
-+ (unsigned char)*(RSTRING_PTR(v) + 1) << 8;
- }
- }
- return 0;
-@@ -1088,7 +1088,7 @@
-
- for (i = 0; i < 256; i++) {
- VALUE m = rb_funcall(ret, mid, 1, INT2FIX(i));
-- RSTRING(cmap)->ptr[i] = info->map[i] = FIX2INT(m);
-+ RSTRING_PTR(cmap)[i] = info->map[i] = FIX2INT(m);
- }
- /* protect object form GC */
- rb_ivar_set(recv, rb_intern("_encoding"), ret);
-@@ -1308,7 +1308,7 @@
-
- for (i = 0; i < 256; i++) {
- VALUE m = rb_funcall(ret, mid, 1, INT2FIX(i));
-- RSTRING(cmap)->ptr[i] = info->map[i] = FIX2INT(m);
-+ RSTRING_PTR(cmap)[i] = info->map[i] = FIX2INT(m);
- }
- /* protect object form GC */
- rb_ivar_set((VALUE)recv, rb_intern("_encoding"), ret);
-@@ -1359,7 +1359,7 @@
- /* new(encoding) */
- if (TYPE(arg1) != T_NIL) {
- Check_Type(arg1, T_STRING); /* encoding */
-- encoding = RSTRING(arg1)->ptr;
-+ encoding = RSTRING_PTR(arg1);
- }
- }
- else if (count == 2) {
-@@ -1369,10 +1369,10 @@
- if (TYPE(arg1) != T_DATA) {
- if (TYPE(arg1) != T_NIL) {
- Check_Type(arg1, T_STRING); /* encoding */
-- encoding = RSTRING(arg1)->ptr;
-+ encoding = RSTRING_PTR(arg1);
- }
- Check_Type(arg2, T_STRING); /* nschar */
-- nssep = RSTRING(arg2)->ptr;
-+ nssep = RSTRING_PTR(arg2);
- }
- else {
- #endif
-@@ -1380,7 +1380,7 @@
- GET_PARSER(arg1, rootparser);
- if (!NIL_P(arg2)) {
- Check_Type(arg2, T_STRING); /* context */
-- context = RSTRING(arg2)->ptr;
-+ context = RSTRING_PTR(arg2);
- }
- parent = arg1;
- #ifdef NEW_EXPAT
-@@ -1393,10 +1393,10 @@
- GET_PARSER(arg1, rootparser);
- if (!NIL_P(arg2)) {
- Check_Type(arg2, T_STRING); /* context */
-- context = RSTRING(arg2)->ptr;
-+ context = RSTRING_PTR(arg2);
- }
- Check_Type(arg3, T_STRING); /* encoding */
-- encoding = RSTRING(arg3)->ptr;
-+ encoding = RSTRING_PTR(arg3);
- parent = arg1;
- }
-
-@@ -1491,7 +1491,7 @@
- GET_PARSER(obj, parser);
- if (count > 0 && TYPE(vencoding) != T_NIL) {
- Check_Type(vencoding, T_STRING);
-- encoding = RSTRING(vencoding)->ptr;
-+ encoding = RSTRING_PTR(vencoding);
- }
- XML_ParserReset(parser->parser, encoding);
- /* setting up internal data */
-@@ -1740,7 +1740,7 @@
- taintParser(parser);
- rb_ivar_set(obj, linebuf, buf); /* protect buf from GC (reasonable?)*/
- ret = XML_Parse(parser->parser,
-- RSTRING(buf)->ptr, RSTRING(buf)->len, 0);
-+ RSTRING_PTR(buf), RSTRING_LEN(buf), 0);
- }
- else {
- ret = XML_Parse(parser->parser, NULL, 0, 1);
-@@ -1759,7 +1759,7 @@
- if (OBJ_TAINTED(str))
- taintParser(parser);
- ret = XML_Parse(parser->parser,
-- RSTRING(str)->ptr, RSTRING(str)->len, final);
-+ RSTRING_PTR(str), RSTRING_LEN(str), final);
- }
- else
- ret = XML_Parse(parser->parser, NULL, 0, final);
-@@ -1852,7 +1852,7 @@
- GET_PARSER(obj, parser);
- if (OBJ_TAINTED(base))
- taintParser(parser);
-- ret = XML_SetBase(parser->parser, RSTRING(base)->ptr);
-+ ret = XML_SetBase(parser->parser, RSTRING_PTR(base));
-
- return INT2FIX(ret);
- }
More information about the Pkg-ruby-extras-commits
mailing list