Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-ruby/ruby-shout/files: ruby-shout-2.1+ruby-1.9.patch
Date: Fri, 29 Jan 2010 11:58:08
Message-Id: E1NapUD-0007WC-V0@stork.gentoo.org
1 flameeyes 10/01/29 11:58:05
2
3 Added: ruby-shout-2.1+ruby-1.9.patch
4 Log:
5 Import the Ruby 1.9 patch from overlay, and move to fakegem (with support for Ruby 1.9).
6 (Portage version: 2.2_rc61/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-ruby/ruby-shout/files/ruby-shout-2.1+ruby-1.9.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/ruby-shout/files/ruby-shout-2.1+ruby-1.9.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/ruby-shout/files/ruby-shout-2.1+ruby-1.9.patch?rev=1.1&content-type=text/plain
13
14 Index: ruby-shout-2.1+ruby-1.9.patch
15 ===================================================================
16 diff -ru a/ext/shout.c b/ext/shout.c
17 --- a/ext/shout.c 1970-01-01 01:00:00.000000000 +0100
18 +++ b/ext/shout.c 2008-10-06 12:28:08.000000000 +0200
19 @@ -40,6 +40,11 @@
20
21 #define DEFAULT_MOUNTPOINT "/default"
22
23 +#ifndef RSTRING_LEN
24 +#define RSTRING_LEN(str) RSTRING(str)->len
25 +#define RSTRING_PTR(str) RSTRING(str)->ptr
26 +#endif
27 +
28 /*
29 ----------------- ShoutError --------------------
30 */
31 @@ -233,8 +238,8 @@
32 GET_SC(self, s);
33
34 Check_SafeStr(to_send);
35 - err = shout_send(s->conn, (unsigned char *) (RSTRING(to_send)->ptr),
36 - RSTRING(to_send)->len);
37 + err = shout_send(s->conn, (unsigned char *) (RSTRING_PTR(to_send)),
38 + RSTRING_LEN(to_send));
39 if(err != SHOUTERR_SUCCESS) {
40 raise_shout_error(s->conn);
41 }
42 @@ -409,7 +414,7 @@
43 shout_connection *s; GET_SC(self, s);
44
45 Check_Type(value, T_STRING);
46 - err = shout_set_host(s->conn, RSTRING(value)->ptr);
47 + err = shout_set_host(s->conn, RSTRING_PTR(value));
48 if(err != SHOUTERR_SUCCESS) {
49 raise_shout_error(s->conn);
50 }
51 @@ -435,7 +440,7 @@
52 shout_connection *s; GET_SC(self, s);
53
54 Check_Type(value, T_STRING);
55 - err = shout_set_user(s->conn, RSTRING(value)->ptr);
56 + err = shout_set_user(s->conn, RSTRING_PTR(value));
57 if(err != SHOUTERR_SUCCESS) {
58 raise_shout_error(s->conn);
59 }
60 @@ -448,7 +453,7 @@
61 shout_connection *s; GET_SC(self, s);
62
63 Check_Type(value, T_STRING);
64 - err = shout_set_password(s->conn, RSTRING(value)->ptr);
65 + err = shout_set_password(s->conn, RSTRING_PTR(value));
66 if(err != SHOUTERR_SUCCESS) {
67 raise_shout_error(s->conn);
68 }
69 @@ -495,7 +500,7 @@
70 shout_connection *s; GET_SC(self, s);
71
72 Check_Type(value, T_STRING);
73 - err = shout_set_mount(s->conn, RSTRING(value)->ptr);
74 + err = shout_set_mount(s->conn, RSTRING_PTR(value));
75 if(err != SHOUTERR_SUCCESS) {
76 raise_shout_error(s->conn);
77 }
78 @@ -509,7 +514,7 @@
79 shout_connection *s; GET_SC(self, s);
80
81 Check_Type(value, T_STRING);
82 - err = shout_set_dumpfile(s->conn, RSTRING(value)->ptr);
83 + err = shout_set_dumpfile(s->conn, RSTRING_PTR(value));
84 if(err != SHOUTERR_SUCCESS) {
85 raise_shout_error(s->conn);
86 }
87 @@ -523,7 +528,7 @@
88 shout_connection *s; GET_SC(self, s);
89
90 Check_Type(value, T_STRING);
91 - err = shout_set_agent(s->conn, RSTRING(value)->ptr);
92 + err = shout_set_agent(s->conn, RSTRING_PTR(value));
93 if(err != SHOUTERR_SUCCESS) {
94 raise_shout_error(s->conn);
95 }
96 @@ -554,7 +559,7 @@
97 shout_connection *s; GET_SC(self, s);
98
99 Check_Type(value, T_STRING);
100 - err = shout_set_name(s->conn, RSTRING(value)->ptr);
101 + err = shout_set_name(s->conn, RSTRING_PTR(value));
102 if(err != SHOUTERR_SUCCESS) {
103 raise_shout_error(s->conn);
104 }
105 @@ -567,7 +572,7 @@
106 shout_connection *s; GET_SC(self, s);
107
108 Check_Type(value, T_STRING);
109 - err = shout_set_url(s->conn, RSTRING(value)->ptr);
110 + err = shout_set_url(s->conn, RSTRING_PTR(value));
111 if(err != SHOUTERR_SUCCESS) {
112 raise_shout_error(s->conn);
113 }
114 @@ -580,7 +585,7 @@
115 shout_connection *s; GET_SC(self, s);
116
117 Check_Type(value, T_STRING);
118 - err = shout_set_genre(s->conn, RSTRING(value)->ptr);
119 + err = shout_set_genre(s->conn, RSTRING_PTR(value));
120 if(err != SHOUTERR_SUCCESS) {
121 raise_shout_error(s->conn);
122 }
123 @@ -593,7 +598,7 @@
124 shout_connection *s; GET_SC(self, s);
125
126 Check_Type(value, T_STRING);
127 - err = shout_set_description(s->conn, RSTRING(value)->ptr);
128 + err = shout_set_description(s->conn, RSTRING_PTR(value));
129 if(err != SHOUTERR_SUCCESS) {
130 raise_shout_error(s->conn);
131 }