wok view kazehakase/stuff/kazehakase-0.5.8-svn3873_trunk-ruby19.patch @ rev 21919
updated smake (1.2a49 -> 1.2.5)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Sat Oct 05 11:16:38 2019 +0100 (2019-10-05) |
| parents | |
| children |
line source
1 --- kazehakase-0.5.8-svn3873_trunk/configure.ac.ruby19 2010-05-04 00:38:45.000000000 +0900
2 +++ kazehakase-0.5.8-svn3873_trunk/configure.ac 2012-04-04 14:00:45.795119865 +0900
3 @@ -421,14 +421,21 @@
4 rbconfig="$RUBY -rrbconfig -e "
6 changequote(<<, >>)
7 - for var_name in archdir sitearchdir CFLAGS LIBRUBYARG LIBS libdir; do
8 + for var_name in archdir sitearchdir vendorarchdir CFLAGS LIBRUBYARG LIBS libdir; do
9 rbconfig_tmp=`$rbconfig "print Config::CONFIG['$var_name']"`
10 eval "rbconfig_$var_name=\"$rbconfig_tmp\""
11 done
12 changequote([, ])
14 + changequote(<<, >>)
15 + RUBY_CONFIGH_DIR=`$rbconfig "print Config::CONFIG['includedir']"`
16 + RUBY_CONFIGH_DIR=${RUBY_CONFIGH_DIR}/`$rbconfig "print Config::CONFIG['arch']"`
17 + changequote([, ])
18 +
19 RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_archdir "
20 RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_sitearchdir "
21 + RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_vendorarchdir "
22 + RUBY_CFLAGS="$RUBY_CFLAGS -I$RUBY_CONFIGH_DIR"
23 RUBY_CFLAGS="$RUBY_CFLAGS $rbconfig_CFLAGS "
24 RUBY_LIBS="$rbconfig_LIBRUBYARG $rbconfig_LIBS"
25 RUBY_LDFLAGS="-L$rbconfig_libdir"
26 @@ -602,8 +609,8 @@
27 GENHTML_OPTIONS="--title 'Kazehakase Code Coverage'"
29 KAZEHAKASE_CFLAGS="$GTK_CFLAGS $LIBGNUTLS_CFLAGS $GIO_CFLAGS $DBUS_GLIB_CFLAGS"
30 -KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
31 -KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DG_DISABLE_DEPRECATED"
32 +KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DGDK_NOTDISABLE_DEPRECATED -DGTK_NOTDISABLE_DEPRECATED"
33 +KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DG_NOTDISABLE_DEPRECATED"
34 KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DSYSDATADIR=\\\"\"\$(datadir)\"\\\""
35 KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DLOCALEDIR=\\\"\"\$(localedir)\"\\\""
36 KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DKZ_DATADIR=\\\"\"\$(datadir)/\$(PACKAGE)\"\\\""
37 --- kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-embed.c.ruby19 2009-09-27 22:18:07.000000000 +0900
38 +++ kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-embed.c 2012-04-04 14:00:45.605121458 +0900
39 @@ -112,7 +112,7 @@
40 rb_kz_embed_find(VALUE self, VALUE keyword, VALUE backward)
41 {
42 gboolean find;
43 - find = kz_embed_find(_SELF(self), STR2CSTR(keyword), RVAL2CBOOL(backward));
44 + find = kz_embed_find(_SELF(self), StringValuePtr(keyword), RVAL2CBOOL(backward));
45 return CBOOL2RVAL(find);
46 }
48 @@ -120,7 +120,7 @@
49 rb_kz_embed_incremental_search(VALUE self, VALUE keyword, VALUE backward)
50 {
51 gboolean search;
52 - search = kz_embed_incremental_search(_SELF(self), STR2CSTR(keyword),
53 + search = kz_embed_incremental_search(_SELF(self), StringValuePtr(keyword),
54 RVAL2CBOOL(backward));
55 return CBOOL2RVAL(search);
56 }
57 @@ -330,7 +330,7 @@
58 static VALUE
59 rb_kz_embed_set_encoding(VALUE self, VALUE encoding)
60 {
61 - kz_embed_set_encoding(_SELF(self), STR2CSTR(encoding));
62 + kz_embed_set_encoding(_SELF(self), StringValuePtr(encoding));
63 return self;
64 }
66 @@ -384,7 +384,7 @@
67 rb_kz_embed_save_with_content(VALUE self, VALUE rawfilename)
68 {
69 gboolean save;
70 - save = kz_embed_save_with_content(_SELF(self), STR2CSTR(rawfilename));
71 + save = kz_embed_save_with_content(_SELF(self), StringValuePtr(rawfilename));
72 return RVAL2CBOOL(save);
73 }
75 --- kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-sidebar.c.ruby19 2009-01-28 04:25:13.000000000 +0900
76 +++ kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-sidebar.c 2012-04-04 14:00:45.605121458 +0900
77 @@ -69,16 +69,16 @@
79 entries = rb_funcall(mKzSidebarFactory, rb_intern("entries"), 0);
81 - len = RARRAY(entries)->len;
82 + len = RARRAY_LEN(entries);
83 for (i = 0; i < len; i++) {
84 VALUE entry_info;
85 KzSidebarEntry *entry;
87 - entry_info = RARRAY(entries)->ptr[i];
88 + entry_info = (RARRAY_PTR(entries))[i];
89 entry = g_new0(KzSidebarEntry, 1);
90 - entry->priority_hint = NUM2INT(RARRAY(entry_info)->ptr[0]);
91 - entry->label = RVAL2CSTR(RARRAY(entry_info)->ptr[1]);
92 - entry->icon = RVAL2CSTR2(RARRAY(entry_info)->ptr[2]);
93 + entry->priority_hint = NUM2INT((RARRAY_PTR(entry_info))[0]);
94 + entry->label = RVAL2CSTR((RARRAY_PTR(entry_info))[1]);
95 + entry->icon = RVAL2CSTR2((RARRAY_PTR(entry_info))[2]);
96 entry->create = rb_kz_sidebar_entry_create;
97 kz_sidebar_append_entry(entry);
98 }
99 --- kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-web.c.ruby19 2009-09-27 22:18:07.000000000 +0900
100 +++ kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-web.c 2012-04-04 14:05:41.973991342 +0900
101 @@ -161,7 +161,7 @@
102 rb_kz_web_find(VALUE self, VALUE keyword, VALUE backward)
103 {
104 gboolean find;
105 - find = kz_web_find(_SELF(self), STR2CSTR(keyword), RVAL2CBOOL(backward));
106 + find = kz_web_find(_SELF(self), StringValuePtr(keyword), RVAL2CBOOL(backward));
107 return CBOOL2RVAL(find);
108 }
110 @@ -169,7 +169,7 @@
111 rb_kz_web_incremental_search(VALUE self, VALUE keyword, VALUE backward)
112 {
113 gboolean search;
114 - search = kz_web_incremental_search(_SELF(self), STR2CSTR(keyword),
115 + search = kz_web_incremental_search(_SELF(self), StringValuePtr(keyword),
116 RVAL2CBOOL(backward));
117 return CBOOL2RVAL(search);
118 }
119 @@ -409,7 +409,7 @@
120 static VALUE
121 rb_kz_web_set_encoding(VALUE self, VALUE encoding)
122 {
123 - kz_web_set_encoding(_SELF(self), STR2CSTR(encoding));
124 + kz_web_set_encoding(_SELF(self), StringValuePtr(encoding));
125 return self;
126 }
128 @@ -463,7 +463,7 @@
129 rb_kz_web_save_with_content(VALUE self, VALUE rawfilename)
130 {
131 gboolean save;
132 - save = kz_web_save_with_content(_SELF(self), STR2CSTR(rawfilename));
133 + save = kz_web_save_with_content(_SELF(self), StringValuePtr(rawfilename));
134 return RVAL2CBOOL(save);
135 }
137 --- kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-window.c.ruby19 2009-09-27 22:18:07.000000000 +0900
138 +++ kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-window.c 2012-04-04 14:00:45.605121458 +0900
139 @@ -44,7 +44,7 @@
140 static VALUE
141 rb_kz_window_set_default(VALUE self, VALUE window)
142 {
143 - rb_cvar_set(self, id_default, window, Qfalse);
144 + rb_cvar_set(self, id_default, window);
145 return Qnil;
146 }