wok diff kazehakase/stuff/kazehakase-0.5.8-svn3873_trunk-ruby19.patch @ rev 25226
updated python-pynacl (1.3.0 -> 1.4.0)
author | Hans-G?nter Theisgen |
---|---|
date | Wed Jul 13 16:46:32 2022 +0100 (2022-07-13) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/kazehakase/stuff/kazehakase-0.5.8-svn3873_trunk-ruby19.patch Wed Jul 13 16:46:32 2022 +0100 1.3 @@ -0,0 +1,147 @@ 1.4 +--- kazehakase-0.5.8-svn3873_trunk/configure.ac.ruby19 2010-05-04 00:38:45.000000000 +0900 1.5 ++++ kazehakase-0.5.8-svn3873_trunk/configure.ac 2012-04-04 14:00:45.795119865 +0900 1.6 +@@ -421,14 +421,21 @@ 1.7 + rbconfig="$RUBY -rrbconfig -e " 1.8 + 1.9 + changequote(<<, >>) 1.10 +- for var_name in archdir sitearchdir CFLAGS LIBRUBYARG LIBS libdir; do 1.11 ++ for var_name in archdir sitearchdir vendorarchdir CFLAGS LIBRUBYARG LIBS libdir; do 1.12 + rbconfig_tmp=`$rbconfig "print Config::CONFIG['$var_name']"` 1.13 + eval "rbconfig_$var_name=\"$rbconfig_tmp\"" 1.14 + done 1.15 + changequote([, ]) 1.16 + 1.17 ++ changequote(<<, >>) 1.18 ++ RUBY_CONFIGH_DIR=`$rbconfig "print Config::CONFIG['includedir']"` 1.19 ++ RUBY_CONFIGH_DIR=${RUBY_CONFIGH_DIR}/`$rbconfig "print Config::CONFIG['arch']"` 1.20 ++ changequote([, ]) 1.21 ++ 1.22 + RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_archdir " 1.23 + RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_sitearchdir " 1.24 ++ RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_vendorarchdir " 1.25 ++ RUBY_CFLAGS="$RUBY_CFLAGS -I$RUBY_CONFIGH_DIR" 1.26 + RUBY_CFLAGS="$RUBY_CFLAGS $rbconfig_CFLAGS " 1.27 + RUBY_LIBS="$rbconfig_LIBRUBYARG $rbconfig_LIBS" 1.28 + RUBY_LDFLAGS="-L$rbconfig_libdir" 1.29 +@@ -602,8 +609,8 @@ 1.30 + GENHTML_OPTIONS="--title 'Kazehakase Code Coverage'" 1.31 + 1.32 + KAZEHAKASE_CFLAGS="$GTK_CFLAGS $LIBGNUTLS_CFLAGS $GIO_CFLAGS $DBUS_GLIB_CFLAGS" 1.33 +-KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" 1.34 +-KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DG_DISABLE_DEPRECATED" 1.35 ++KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DGDK_NOTDISABLE_DEPRECATED -DGTK_NOTDISABLE_DEPRECATED" 1.36 ++KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DG_NOTDISABLE_DEPRECATED" 1.37 + KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DSYSDATADIR=\\\"\"\$(datadir)\"\\\"" 1.38 + KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DLOCALEDIR=\\\"\"\$(localedir)\"\\\"" 1.39 + KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DKZ_DATADIR=\\\"\"\$(datadir)/\$(PACKAGE)\"\\\"" 1.40 +--- kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-embed.c.ruby19 2009-09-27 22:18:07.000000000 +0900 1.41 ++++ kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-embed.c 2012-04-04 14:00:45.605121458 +0900 1.42 +@@ -112,7 +112,7 @@ 1.43 + rb_kz_embed_find(VALUE self, VALUE keyword, VALUE backward) 1.44 + { 1.45 + gboolean find; 1.46 +- find = kz_embed_find(_SELF(self), STR2CSTR(keyword), RVAL2CBOOL(backward)); 1.47 ++ find = kz_embed_find(_SELF(self), StringValuePtr(keyword), RVAL2CBOOL(backward)); 1.48 + return CBOOL2RVAL(find); 1.49 + } 1.50 + 1.51 +@@ -120,7 +120,7 @@ 1.52 + rb_kz_embed_incremental_search(VALUE self, VALUE keyword, VALUE backward) 1.53 + { 1.54 + gboolean search; 1.55 +- search = kz_embed_incremental_search(_SELF(self), STR2CSTR(keyword), 1.56 ++ search = kz_embed_incremental_search(_SELF(self), StringValuePtr(keyword), 1.57 + RVAL2CBOOL(backward)); 1.58 + return CBOOL2RVAL(search); 1.59 + } 1.60 +@@ -330,7 +330,7 @@ 1.61 + static VALUE 1.62 + rb_kz_embed_set_encoding(VALUE self, VALUE encoding) 1.63 + { 1.64 +- kz_embed_set_encoding(_SELF(self), STR2CSTR(encoding)); 1.65 ++ kz_embed_set_encoding(_SELF(self), StringValuePtr(encoding)); 1.66 + return self; 1.67 + } 1.68 + 1.69 +@@ -384,7 +384,7 @@ 1.70 + rb_kz_embed_save_with_content(VALUE self, VALUE rawfilename) 1.71 + { 1.72 + gboolean save; 1.73 +- save = kz_embed_save_with_content(_SELF(self), STR2CSTR(rawfilename)); 1.74 ++ save = kz_embed_save_with_content(_SELF(self), StringValuePtr(rawfilename)); 1.75 + return RVAL2CBOOL(save); 1.76 + } 1.77 + 1.78 +--- kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-sidebar.c.ruby19 2009-01-28 04:25:13.000000000 +0900 1.79 ++++ kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-sidebar.c 2012-04-04 14:00:45.605121458 +0900 1.80 +@@ -69,16 +69,16 @@ 1.81 + 1.82 + entries = rb_funcall(mKzSidebarFactory, rb_intern("entries"), 0); 1.83 + 1.84 +- len = RARRAY(entries)->len; 1.85 ++ len = RARRAY_LEN(entries); 1.86 + for (i = 0; i < len; i++) { 1.87 + VALUE entry_info; 1.88 + KzSidebarEntry *entry; 1.89 + 1.90 +- entry_info = RARRAY(entries)->ptr[i]; 1.91 ++ entry_info = (RARRAY_PTR(entries))[i]; 1.92 + entry = g_new0(KzSidebarEntry, 1); 1.93 +- entry->priority_hint = NUM2INT(RARRAY(entry_info)->ptr[0]); 1.94 +- entry->label = RVAL2CSTR(RARRAY(entry_info)->ptr[1]); 1.95 +- entry->icon = RVAL2CSTR2(RARRAY(entry_info)->ptr[2]); 1.96 ++ entry->priority_hint = NUM2INT((RARRAY_PTR(entry_info))[0]); 1.97 ++ entry->label = RVAL2CSTR((RARRAY_PTR(entry_info))[1]); 1.98 ++ entry->icon = RVAL2CSTR2((RARRAY_PTR(entry_info))[2]); 1.99 + entry->create = rb_kz_sidebar_entry_create; 1.100 + kz_sidebar_append_entry(entry); 1.101 + } 1.102 +--- kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-web.c.ruby19 2009-09-27 22:18:07.000000000 +0900 1.103 ++++ kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-web.c 2012-04-04 14:05:41.973991342 +0900 1.104 +@@ -161,7 +161,7 @@ 1.105 + rb_kz_web_find(VALUE self, VALUE keyword, VALUE backward) 1.106 + { 1.107 + gboolean find; 1.108 +- find = kz_web_find(_SELF(self), STR2CSTR(keyword), RVAL2CBOOL(backward)); 1.109 ++ find = kz_web_find(_SELF(self), StringValuePtr(keyword), RVAL2CBOOL(backward)); 1.110 + return CBOOL2RVAL(find); 1.111 + } 1.112 + 1.113 +@@ -169,7 +169,7 @@ 1.114 + rb_kz_web_incremental_search(VALUE self, VALUE keyword, VALUE backward) 1.115 + { 1.116 + gboolean search; 1.117 +- search = kz_web_incremental_search(_SELF(self), STR2CSTR(keyword), 1.118 ++ search = kz_web_incremental_search(_SELF(self), StringValuePtr(keyword), 1.119 + RVAL2CBOOL(backward)); 1.120 + return CBOOL2RVAL(search); 1.121 + } 1.122 +@@ -409,7 +409,7 @@ 1.123 + static VALUE 1.124 + rb_kz_web_set_encoding(VALUE self, VALUE encoding) 1.125 + { 1.126 +- kz_web_set_encoding(_SELF(self), STR2CSTR(encoding)); 1.127 ++ kz_web_set_encoding(_SELF(self), StringValuePtr(encoding)); 1.128 + return self; 1.129 + } 1.130 + 1.131 +@@ -463,7 +463,7 @@ 1.132 + rb_kz_web_save_with_content(VALUE self, VALUE rawfilename) 1.133 + { 1.134 + gboolean save; 1.135 +- save = kz_web_save_with_content(_SELF(self), STR2CSTR(rawfilename)); 1.136 ++ save = kz_web_save_with_content(_SELF(self), StringValuePtr(rawfilename)); 1.137 + return RVAL2CBOOL(save); 1.138 + } 1.139 + 1.140 +--- kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-window.c.ruby19 2009-09-27 22:18:07.000000000 +0900 1.141 ++++ kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-window.c 2012-04-04 14:00:45.605121458 +0900 1.142 +@@ -44,7 +44,7 @@ 1.143 + static VALUE 1.144 + rb_kz_window_set_default(VALUE self, VALUE window) 1.145 + { 1.146 +- rb_cvar_set(self, id_default, window, Qfalse); 1.147 ++ rb_cvar_set(self, id_default, window); 1.148 + return Qnil; 1.149 + } 1.150 +