gio2 0.90.5-x86-mingw32 → 0.90.6-x86-mingw32

data/ChangeLog

@@ -1,3 +1,44 @@
+2011-01-30  Kouhei Sutou  <kou@cozmixng.org>
+
+	* Rakefile, ext/gio2/extconf.rb: share depended packages
+	vendor/local/.
+
+2011-01-29  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/gio2/gunixsocketaddress.c (Init_gunixsocketaddress): disable
+	G_TYPE_UNIX_SOCKET_ADDRESS_TYPE on GIO 2.24 because it was appeared
+	in GIO 2.26.
+
+	* ext/gio2/gdatainputstream.c: disable read_upto related methods
+	with GIO 2.24 because GIO 2.24 has those definition in *.c but no those
+	declarations in *.h.
+
+2011-01-22  Masaaki Aoyagi
+
+	* Rakefile: change to use gnome2-raketask.rb.
+
+2011-01-16  Nikolai Weibull
+
+	* ext/gio2/gfileattribute.c: Split into files for each separate class
+	and update names to match the rules of Ruby-GNOME2.
+	* ext/gio2/*: Remove methods for getting and setting properties that
+	are automatically generated.
+	* lib/gio2.rb: Make GLib::UnixFDList Enumerable.
+	* ext/gio2/*: Don’t use rb_undef_alloc_func.  We would like to remove
+	.new from these classes, but I don’t know of a way of doing so.  Using
+	rb_undef_alloc_func is incorrect, as it will make subclasses
+	unallocatable.
+	* ext/gio2/*: Fix some TODOs.
+
+2010-11-12  Nikolai Weibull
+
+	* *: Fix two compilation issues introduced in yesterdays bugfixing.
+	* *: Update various other small things.
+
+2010-11-11  Nikolai Weibull
+
+	* *: Fix various minor bugs.
+
 2010-10-23  Kouhei Sutou  <kou@clear-code.com>
 
 	* Rakefile: remove needless cairo dependency.

data/Rakefile

@@ -1,75 +1,14 @@
 # -*- ruby -*-
 
-require 'pathname'
-require 'find'
-require 'rubygems'
-require 'rake/extensiontask'
+require './../glib2/lib/gnome2-raketask'
 
-@top_dir = Pathname(__FILE__).dirname.parent.expand_path
-@rb_glib2_dir = @top_dir + "glib2"
-
-task :default => :build
-
-def version
-  @version ||= ENV["VERSION"] || guess_version
-end
-
-def guess_version
-  versions = {}
-  rbglib_h_path = @rb_glib2_dir + "ext" + "glib2" + "rbglib.h"
-  rbglib_h_path.open do |rbglib_h|
-    rbglib_h.each_line do |line|
-      if /#define\s+RBGLIB_([A-Z]+)_VERSION\s+(\d+)/ =~ line
-        versions[$1.downcase] = $2.to_i
-      end
-    end
-  end
-  ["major", "minor", "micro"].collect {|type| versions[type]}.compact.join(".")
-end
-
-package_name = "gio2"
-
-spec = Gem::Specification.new do |s|
-  s.name = package_name
-  s.summary = "Ruby/GIO2 is a Ruby binding of gio-2.x."
-  s.description = "Ruby/GIO2 is a Ruby binding of gio-2.x."
-  s.author = "The Ruby-GNOME2 Proejct Team"
-  s.email = "ruby-gnome2-devel-en@lists.sourceforge.net"
-  s.homepage = "http://ruby-gnome2.sourceforge.jp/"
-  s.version = version
-  s.platform = Gem::Platform::RUBY
-  compatible_version = version.split(/\./)[0, 3].join(".")
-  s.add_dependency("glib2", ">= #{compatible_version}")
-  s.extensions = FileList["ext/#{package_name}/extconf.rb"]
-  s.require_paths = ["lib"]
-  s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
-                     "lib/**/*.rb", "ext/**/*"]
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
+package = GNOME2Package.new do |_package|
+  _package.summary = "Ruby/GIO2 is a Ruby binding of gio-2.x."
+  _package.description = "Ruby/GIO2 is a Ruby binding of gio-2.x."
+  _package.dependency.gem.runtime = ["glib2"]
+  _package.win32.packages = []
+  _package.win32.dependencies = []
+  _package.post_install_message = "This library is experimental."
 end
+package.define_tasks
 
-Rake::ExtensionTask.new(package_name, spec) do |ext|
-  ext.cross_compile = true
-  ext.cross_compiling do |spec|
-    if /mingw|mswin/ =~ spec.platform.to_s
-      win32_dir = File.join("vendor", "local")
-      win32_files = []
-      Find.find(win32_dir) do |file|
-        next if /\.zip\z/ =~ file
-        win32_files << file
-      end
-      spec.files += win32_files
-    end
-  end
-end
-
-namespace :win32 do
-  desc "download Windows binaries"
-  task :download do
-    $LOAD_PATH.unshift((@rb_glib2_dir + "lib").to_s)
-    require 'gnome2-win32-binary-downloader'
-    GNOME2Win32BinaryDownloader.download(:packages => ["glib"],
-                                         :dependencies => ["gettext-runtime"])
-  end
-end

data/ext/gio2/extconf.rb

@@ -24,6 +24,15 @@ package_id = "gio-2.0"
 
 require 'mkmf-gnome2'
 
+["glib2"].each do |package|
+  directory = "#{package}#{version_suffix}"
+  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+  add_depend_package(package, "#{directory}/ext/#{package}",
+                     top_dir.to_s,
+                     :top_build_dir => top_build_dir.to_s,
+                     :target_build_dir => build_dir)
+end
+
 win32 = setup_win32(module_name, base_dir)
 
 defines = '-DRUBY_GIO2_COMPILATION'
@@ -36,15 +45,6 @@ PKGConfig.have_package('gobject-2.0') or exit 1
 
 have_func('rb_exec_recursive')
 
-["glib2"].each do |package|
-  directory = "#{package}#{version_suffix}"
-  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
-  add_depend_package(package, "#{directory}/ext/#{package}",
-                     top_dir.to_s,
-                     :top_build_dir => top_build_dir.to_s,
-                     :target_build_dir => build_dir)
-end
-
 def try_compiler_option(opt, &block)
   checking_for "#{opt} option to compiler" do
     $CFLAGS += " #{opt}" if try_compile '', opt, &block

data/ext/gio2/gasyncinitable.c

@@ -239,6 +239,5 @@ Init_gasyncinitable(VALUE glib)
         rb_define_method(asyncinitable, "init_async", asyncinitable_init_async, -1);
         rb_define_method(asyncinitable, "init_finish", asyncinitable_init_finish, 1);
         rb_define_method(asyncinitable, "initialize", asyncinitable_initialize, -1);
-        /* TODO: Ruby name? */
         rb_define_method(asyncinitable, "initialize_finish", asyncinitable_initialize_finish, 1);
 }

data/ext/gio2/gbufferedinputstream.c

@@ -39,20 +39,6 @@ bufferedinputstream_initialize(int argc, VALUE *argv, VALUE self)
         return Qnil;
 }
 
-static VALUE
-bufferedinputstream_get_buffer_size(VALUE self)
-{
-        return GSIZE2RVAL(g_buffered_input_stream_get_buffer_size(_SELF(self)));
-}
-
-static VALUE
-bufferedinputstream_set_buffer_size(VALUE self, VALUE size)
-{
-        g_buffered_input_stream_set_buffer_size(_SELF(self), RVAL2GSIZE(size));
-
-        return self;
-}
-
 static VALUE
 bufferedinputstream_get_available(VALUE self)
 {
@@ -80,8 +66,6 @@ bufferedinputstream_peek(VALUE self, VALUE rboffset, VALUE rbcount)
                                                           RSTRING_PTR(result),
                                                           offset,
                                                           count);
-        if (bytes_peeked == (gsize)-1)
-                rb_raise(rb_eIOError, "cannot peek"); /* TODO: Better class and message */
 
         rb_str_set_len(result, bytes_peeked);
         rb_str_resize(result, bytes_peeked);
@@ -171,9 +155,6 @@ Init_gbufferedinputstream(VALUE glib)
         VALUE bufferedinputstream = G_DEF_CLASS(G_TYPE_BUFFERED_INPUT_STREAM, "BufferedInputStream", glib);
 
         rb_define_method(bufferedinputstream, "initialize", bufferedinputstream_initialize, -1);
-        rb_define_method(bufferedinputstream, "buffer_size", bufferedinputstream_get_buffer_size, 0);
-        rb_define_method(bufferedinputstream, "set_buffer_size", bufferedinputstream_set_buffer_size, 1);
-        G_DEF_SETTER(bufferedinputstream, "buffer_size");
         rb_define_method(bufferedinputstream, "available", bufferedinputstream_get_available, 0);
         rb_define_method(bufferedinputstream, "peek_buffer", bufferedinputstream_peek_buffer, 0);
         rb_define_method(bufferedinputstream, "peek", bufferedinputstream_peek, 2);

data/ext/gio2/gbufferedoutputstream.c

@@ -39,44 +39,10 @@ bufferedoutputstream_initialize(int argc, VALUE *argv, VALUE self)
         return Qnil;
 }
 
-static VALUE
-bufferedoutputstream_get_buffer_size(VALUE self)
-{
-        return GSIZE2RVAL(g_buffered_output_stream_get_buffer_size(_SELF(self)));
-}
-
-static VALUE
-bufferedoutputstream_set_buffer_size(VALUE self, VALUE size)
-{
-        g_buffered_output_stream_set_buffer_size(_SELF(self), RVAL2GSIZE(size));
-
-        return self;
-}
-
-static VALUE
-bufferedoutputstream_get_auto_grow(VALUE self)
-{
-        return CBOOL2RVAL(g_buffered_output_stream_get_auto_grow(_SELF(self)));
-}
-
-static VALUE
-bufferedoutputstream_set_auto_grow(VALUE self, VALUE grow)
-{
-        g_buffered_output_stream_set_auto_grow(_SELF(self), RVAL2CBOOL(grow));
-
-        return self;
-}
-
 void
 Init_gbufferedoutputstream(VALUE glib)
 {
         VALUE bufferedoutputstream = G_DEF_CLASS(G_TYPE_BUFFERED_OUTPUT_STREAM, "BufferedOutputStream", glib);
 
         rb_define_method(bufferedoutputstream, "initialize", bufferedoutputstream_initialize, -1);
-        rb_define_method(bufferedoutputstream, "buffer_size", bufferedoutputstream_get_buffer_size, 0);
-        rb_define_method(bufferedoutputstream, "set_buffer_size", bufferedoutputstream_set_buffer_size, 1);
-        G_DEF_SETTER(bufferedoutputstream, "buffer_size");
-        rb_define_method(bufferedoutputstream, "auto_grow", bufferedoutputstream_get_auto_grow, 0);
-        rb_define_method(bufferedoutputstream, "set_auto_grow", bufferedoutputstream_set_auto_grow, 1);
-        G_DEF_SETTER(bufferedoutputstream, "auto_grow");
 }

data/ext/gio2/gcharsetconverter.c

@@ -39,20 +39,6 @@ charsetconverter_initialize(VALUE self, VALUE to, VALUE from)
         return Qnil;
 }
 
-static VALUE
-charsetconverter_set_use_fallback(VALUE self, VALUE use_fallback)
-{
-        g_charset_converter_set_use_fallback(_SELF(self), RVAL2CBOOL(use_fallback));
-
-        return self;
-}
-
-static VALUE
-charsetconverter_get_use_fallback(VALUE self)
-{
-        return CBOOL2RVAL(g_charset_converter_get_use_fallback(_SELF(self)));
-}
-
 static VALUE
 charsetconverter_get_num_fallbacks(VALUE self)
 {
@@ -65,8 +51,5 @@ Init_gcharsetconverter(VALUE glib)
         VALUE charsetconverter = G_DEF_CLASS(G_TYPE_CHARSET_CONVERTER, "CharsetConverter", glib);
 
         rb_define_method(charsetconverter, "initialize", charsetconverter_initialize, 2);
-        rb_define_method(charsetconverter, "set_use_fallback", charsetconverter_set_use_fallback, 1);
-        G_DEF_SETTER(charsetconverter, "use_fallback");
-        rb_define_method(charsetconverter, "use_fallback?", charsetconverter_get_use_fallback, 0);
         rb_define_method(charsetconverter, "num_fallbacks", charsetconverter_get_num_fallbacks, 0);
 }

data/ext/gio2/gcontenttype.c

@@ -75,7 +75,6 @@ contenttype_guess(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
               rbdata;
         const char *filename;
         const guchar *data;
-        gsize data_size;
         gboolean result_uncertain;
         char *type;
 
@@ -87,16 +86,10 @@ contenttype_guess(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 
         filename = RVAL2CSTR_ACCEPT_NIL(rbfilename);
         data = (guchar *)RVAL2CSTR_ACCEPT_NIL(rbdata);
-        if (data != NULL) {
-                StringValue(rbdata);
-                data_size = RSTRING_LEN(rbdata);
-        } else {
-                data_size = 0;
-        }
 
         type = g_content_type_guess(filename,
                                     data,
-                                    data_size,
+                                    (gsize)((data != NULL) ? RSTRING_LEN(rbdata) : 0),
                                     &result_uncertain);
 
         return rb_assoc_new(CSTR2RVAL_FREE(type), CBOOL2RVAL(result_uncertain));

data/ext/gio2/gconverterinputstream.c

@@ -32,17 +32,10 @@ converterinputstream_initialize(VALUE self, VALUE base_stream, VALUE converter)
         return Qnil;
 }
 
-static VALUE
-converterinputstream_get_converter(VALUE self)
-{
-        return GOBJ2RVAL(g_converter_input_stream_get_converter(_SELF(self)));
-}
-
 void
 Init_gconverterinputstream(VALUE glib)
 {
         VALUE converterinputstream = G_DEF_CLASS(G_TYPE_CONVERTER_INPUT_STREAM, "ConverterInputStream", glib);
 
         rb_define_method(converterinputstream, "initialize", converterinputstream_initialize, 2);
-        rb_define_method(converterinputstream, "converter", converterinputstream_get_converter, 0);
 }

data/ext/gio2/gconverteroutputstream.c

@@ -32,17 +32,10 @@ converteroutputstream_initialize(VALUE self, VALUE base_stream, VALUE converter)
         return Qnil;
 }
 
-static VALUE
-converteroutputstream_get_converter(VALUE self)
-{
-        return GOBJ2RVAL(g_converter_output_stream_get_converter(_SELF(self)));
-}
-
 void
 Init_gconverteroutputstream(VALUE glib)
 {
         VALUE converteroutputstream = G_DEF_CLASS(G_TYPE_CONVERTER_OUTPUT_STREAM, "ConverterOutputStream", glib);
 
         rb_define_method(converteroutputstream, "initialize", converteroutputstream_initialize, 2);
-        rb_define_method(converteroutputstream, "converter", converteroutputstream_get_converter, 0);
 }

data/ext/gio2/gdatainputstream.c

@@ -1,7 +1,7 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
  * Ruby/GIO: a Ruby binding of gio-2.0.x.
- * Copyright (C) 2008-2009  Ruby-GNOME2 Project Team
+ * Copyright (C) 2008-2011  Ruby-GNOME2 Project Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,9 +22,6 @@
 
 #define _SELF(value) G_DATA_INPUT_STREAM(RVAL2GOBJ(value))
 
-#define GDATASTREAMNEWLINETYPE2RVAL(value) \
-        RVAL2GENUM((value), G_TYPE_DATA_STREAM_NEWLINE_TYPE)
-
 #define RVAL2GDATASTREAMNEWLINETYPE(value) \
         GENUM2RVAL((value), G_TYPE_DATA_STREAM_NEWLINE_TYPE)
 
@@ -48,36 +45,6 @@ datainputstream_initialize(int argc, VALUE *argv, VALUE self)
         return Qnil;
 }
 
-static VALUE
-datainputstream_get_byte_order(VALUE self)
-{
-        return GDATASTREAMBYTEORDER2RVAL(g_data_input_stream_get_byte_order(_SELF(self)));
-}
-
-static VALUE
-datainputstream_set_byte_order(VALUE self, VALUE value)
-{
-        g_data_input_stream_set_byte_order(_SELF(self),
-                                           RVAL2GDATASTREAMBYTEORDER(value));
-
-        return self;
-}
-
-static VALUE
-datainputstream_set_newline_type(VALUE self, VALUE value)
-{
-        g_data_input_stream_set_newline_type(_SELF(self),
-                                             RVAL2GDATASTREAMNEWLINETYPE(value));
-
-        return self;
-}
-
-static VALUE
-datainputstream_get_newline_type(VALUE self)
-{
-        return GDATASTREAMNEWLINETYPE2RVAL(g_data_input_stream_get_newline_type(_SELF(self)));
-}
-
 static VALUE
 datainputstream_read_byte(int argc, VALUE *argv, VALUE self)
 {
@@ -253,20 +220,24 @@ datainputstream_read_line_finish(VALUE self, VALUE result)
         return CSTR2RVAL_TAINTED_FREE(line, length);
 }
 
+#if GLIB_CHECK_VERSION(2, 26, 0)
 static VALUE
-datainputstream_read_until(int argc, VALUE *argv, VALUE self)
+datainputstream_read_upto(int argc, VALUE *argv, VALUE self)
 {
-        VALUE stop_chars, cancellable;
+        VALUE rbstop_chars, cancellable;
+        const char *stop_chars;
         gsize length;
         GError *error;
         char *string;
 
-        rb_scan_args(argc, argv, "11", &stop_chars, &cancellable);
-        string = g_data_input_stream_read_until(_SELF(self),
-                                                RVAL2CSTR(stop_chars),
-                                                &length,
-                                                RVAL2GCANCELLABLE(cancellable),
-                                                &error);
+        rb_scan_args(argc, argv, "11", &rbstop_chars, &cancellable);
+        stop_chars = RVAL2CSTR(rbstop_chars);
+        string = g_data_input_stream_read_upto(_SELF(self),
+                                               stop_chars,
+                                               RSTRING_LEN(rbstop_chars),
+                                               &length,
+                                               RVAL2GCANCELLABLE(cancellable),
+                                               &error);
         if (error != NULL)
                 rbgio_raise_error(error);
 
@@ -274,7 +245,7 @@ datainputstream_read_until(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-datainputstream_read_until_async(int argc, VALUE *argv, VALUE self)
+datainputstream_read_upto_async(int argc, VALUE *argv, VALUE self)
 {
         VALUE rbstop_chars, rbcancellable, rbio_priority, block;
         const char *stop_chars;
@@ -286,32 +257,34 @@ datainputstream_read_until_async(int argc, VALUE *argv, VALUE self)
         io_priority = RVAL2IOPRIORITYDEFAULT(rbio_priority);
         cancellable = RVAL2GCANCELLABLE(rbcancellable);
         SAVE_BLOCK(block);
-        g_data_input_stream_read_until_async(_SELF(self),
-                                             stop_chars,
-                                             io_priority,
-                                             cancellable,
-                                             rbgio_async_ready_callback,
-                                             (gpointer)block);
+        g_data_input_stream_read_upto_async(_SELF(self),
+                                            stop_chars,
+                                            RSTRING_LEN(rbstop_chars),
+                                            io_priority,
+                                            cancellable,
+                                            rbgio_async_ready_callback,
+                                            (gpointer)block);
 
         return self;
 }
 
 static VALUE
-datainputstream_read_until_finish(VALUE self, VALUE result)
+datainputstream_read_upto_finish(VALUE self, VALUE result)
 {
         GError *error = NULL;
         gsize length;
         char *string;
 
-        string = g_data_input_stream_read_until_finish(_SELF(self),
-                                                       RVAL2GASYNCRESULT(result),
-                                                       &length,
-                                                       &error);
+        string = g_data_input_stream_read_upto_finish(_SELF(self),
+                                                      RVAL2GASYNCRESULT(result),
+                                                      &length,
+                                                      &error);
         if (error != NULL)
                 rbgio_raise_error(error);
 
         return CSTR2RVAL_TAINTED_FREE(string, length);
 }
+#endif
 
 void
 Init_gdatainputstream(VALUE glib)
@@ -319,12 +292,14 @@ Init_gdatainputstream(VALUE glib)
         VALUE datainputstream = G_DEF_CLASS(G_TYPE_DATA_INPUT_STREAM, "DataInputStream", glib);
 
         rb_define_method(datainputstream, "initialize", datainputstream_initialize, -1);
+        /*
         rb_define_method(datainputstream, "byte_order", datainputstream_get_byte_order, 0);
         rb_define_method(datainputstream, "set_byte_order", datainputstream_set_byte_order, 1);
         G_DEF_SETTER(datainputstream, "byte_order");
         rb_define_method(datainputstream, "set_newline_type", datainputstream_set_newline_type, 1);
         G_DEF_SETTER(datainputstream, "newline_type");
         rb_define_method(datainputstream, "newline_type", datainputstream_get_newline_type, 0);
+        */
         rb_define_method(datainputstream, "read_byte", datainputstream_read_byte, -1);
         rb_define_method(datainputstream, "read_int16", datainputstream_read_int16, -1);
         rb_define_method(datainputstream, "read_uint16", datainputstream_read_uint16, -1);
@@ -335,7 +310,9 @@ Init_gdatainputstream(VALUE glib)
         rb_define_method(datainputstream, "read_line", datainputstream_read_line, -1);
         rb_define_method(datainputstream, "read_line_async", datainputstream_read_line_async, -1);
         rb_define_method(datainputstream, "read_line_finish", datainputstream_read_line_finish, 1);
-        rb_define_method(datainputstream, "read_until", datainputstream_read_until, -1);
-        rb_define_method(datainputstream, "read_until_async", datainputstream_read_until_async, -1);
-        rb_define_method(datainputstream, "read_until_finish", datainputstream_read_until_finish, 1);
+#if GLIB_CHECK_VERSION(2, 26, 0)
+        rb_define_method(datainputstream, "read_upto", datainputstream_read_upto, -1);
+        rb_define_method(datainputstream, "read_upto_async", datainputstream_read_upto_async, -1);
+        rb_define_method(datainputstream, "read_upto_finish", datainputstream_read_upto_finish, 1);
+#endif
 }