wok annotate kazehakase/stuff/kazehakase-0.5.8-svn3873_trunk-ruby19.patch @ rev 22153

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