glib2 0.90.8-x86-mingw32 → 0.90.9-x86-mingw32

data/ChangeLog

@@ -1,5 +1,51 @@
+2011-06-11  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/gnome2-raketask.rb: suppress deprecation warnings.
+
+	* Rakefile, test/: use test-unit 2 gem. don't bundle it.
+
+2011-06-04  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/mkmf-gnome2.rb (add_depend_package): don't require parent
+	directory for target_srcdir. target_srcdir can be relative path
+	from target package root directory.
+
+	e.g.:
+	  add_depend_package("glib2", "ext/glib2",
+	                     "/path/to/ruby-gnome2-root-dir"))
+          before: NG
+          after: OK
+
+	  add_depend_package("glib2", "glib2/ext/glib2",
+	                     "/path/to/ruby-gnome2-root-dir"))
+          before: OK
+          after: OK
+
+	* lib/mkmf-gnome2.rb (add_depend_package): support gem installed
+	depend package.
+
+	* ext/glib2/rbglib_iochannel.c: [backward incompatible]
+	GLib::IOChannel#write returns written byte not self.
+
+2011-06-03  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/glib2/rbglib_iochannel.c: support GLib::IOChannel.new(fd)
+	and GLib::IOChannel#fd on Windows.
+
+2011-05-27  Kouhei Sutou  <kou@clear-code.com>
+
+	* ext/glib2/rbgobject.h, ext/glib2/rbgobj_signal.c
+	(rbgobj_set_signal_func): add missing "const".
+
+2011-03-03  Vincent Carmona
+
+	* glib2/lib/mkmf-gnome2.rb: Fix a bug in make_version_header.
+	[ruby-gnome2-devel-en] reported by Grant Schoep. Thanks!!!
+
 2011-03-04  Kouhei Sutou  <kou@cozmixng.org>
 
+	* ext/glib2/rbglib.h: 0.90.7 -> 0.90.8.
+
 	* ext/glib2/rbglib_win32.c
 	(rbglib_m_win32_locale_filename_from_utf8_deprecated): add missing
 	argument.

data/Rakefile

@@ -6,6 +6,7 @@ package = GNOME2Package.new do |_package|
   _package.summary = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
   _package.description = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
   _package.dependency.gem.runtime = [["pkg-config", ">= 0"]]
+  _package.dependency.gem.development = [["test-unit", ">= 2"]]
   _package.win32.packages = ["glib"]
   _package.win32.dependencies = ["gettext-runtime"]
 end

data/ext/glib2/rbglib.h

@@ -23,7 +23,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 0
 #define RBGLIB_MINOR_VERSION 90
-#define RBGLIB_MICRO_VERSION 8
+#define RBGLIB_MICRO_VERSION 9
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/ext/glib2/rbglib_iochannel.c

@@ -41,12 +41,16 @@ ioc_initialize(gint argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "11", &arg1, &arg2);
 
     if (TYPE(arg1) != T_STRING){
-#ifdef G_OS_UNIX
+        gint fd;
         if (TYPE(arg1) == T_FIXNUM){
-            io = g_io_channel_unix_new(NUM2INT(arg1));
+            fd = NUM2INT(arg1);
         } else {
-            io = g_io_channel_unix_new(NUM2INT(rb_funcall(arg1, rb_intern("to_i"), 0)));
+            fd = NUM2INT(rb_funcall(arg1, rb_intern("to_i"), 0));
         }
+#ifdef G_OS_UNIX
+        io = g_io_channel_unix_new(fd);
+#elif defined(G_OS_WIN32)
+        io = g_io_channel_win32_new_fd(fd);
 #else
         rb_raise(rb_eRuntimeError, "GLib::IOChannel.new(fd) is supported on UNIX environment only");
 #endif
@@ -86,7 +90,9 @@ ioc_s_open(gint argc, VALUE *argv, VALUE self)
 #ifdef G_OS_UNIX
         io = g_io_channel_unix_new(NUM2INT(arg1));
 #else
-        rb_raise(rb_eRuntimeError, "GLib::IOChannel.new(fd) is supported on UNIX environment only");
+        rb_raise(rb_eRuntimeError,
+                 "GLib::IOChannel.new(fd) is supported on "
+                 "UNIX and Windows environment only");
 #endif
     } else {
         GError* err = NULL;
@@ -109,8 +115,11 @@ ioc_get_fd(VALUE self)
 {
 #ifdef G_OS_UNIX
     return INT2NUM(g_io_channel_unix_get_fd(_SELF(self)));
+#elif defined(G_OS_WIN32)
+    return INT2NUM(g_io_channel_win32_get_fd(_SELF(self)));
 #else
-    rb_warn("GLib::IOChannel#fd is supported on UNIX environment only.");
+    rb_warn("GLib::IOChannel#fd is supported on "
+            "UNIX and Windows environment only.");
     return Qnil;
 #endif
 }
@@ -404,7 +413,7 @@ ioc_write_chars(VALUE self, VALUE buf)
     status = g_io_channel_write_chars(_SELF(self), RVAL2CSTR(buf), count, &bytes_written, &err);
 
     ioc_error(status, err);
-    return self;
+    return UINT2NUM(bytes_written);
 }
 
 static ID id_unpack;

data/ext/glib2/rbgobj_signal.c

@@ -24,7 +24,7 @@ VALUE rbgobj_signal_wrap(guint sig_id);
 static VALUE signal_func_table;
 
 void
-rbgobj_set_signal_func(VALUE klass, gchar *sig_name, GValToRValSignalFunc func)
+rbgobj_set_signal_func(VALUE klass, const gchar *sig_name, GValToRValSignalFunc func)
 {
     VALUE obj = Data_Wrap_Struct(rb_cData, NULL, NULL, func);
     guint signal_id = g_signal_lookup(sig_name, CLASS2GTYPE(klass));

data/ext/glib2/rbgobject.h

@@ -175,7 +175,7 @@ extern GType rbgobj_gtype_get(VALUE obj);
 
 /* rbgobj_signal.c */
 typedef VALUE (*GValToRValSignalFunc)(guint num,const GValue* values);
-extern void rbgobj_set_signal_func(VALUE klass, gchar* sig_name, GValToRValSignalFunc func);
+extern void rbgobj_set_signal_func(VALUE klass, const gchar *sig_name, GValToRValSignalFunc func);
 extern GValToRValSignalFunc rbgobj_get_signal_func(guint signal_id);
 extern VALUE rbgobj_signal_wrap(guint sig_id);
 

data/lib/gnome2-raketask.rb

@@ -10,6 +10,8 @@ require 'rubygems'
 require 'rake/extensiontask'
 
 class GNOME2Package
+  include Rake::DSL
+
   attr_accessor :name, :summary, :description, :author, :email, :homepage, :post_install_message
   def initialize
     initialize_variables
@@ -86,11 +88,10 @@ class GNOME2Package
           "ChangeLog", "README", "Rakefile", "extconf.rb",
           "lib/**/*.rb", "{ext,sample,test,test-unit}/**/*"]
       s.post_install_message  = @post_install_message
-      s.has_rdoc              = false
       @dependency_configuration.apply(s)
     end
 
-    Rake::GemPackageTask.new(@spec) do |pkg|
+    Gem::PackageTask.new(@spec) do |pkg|
     end
   end
 

data/lib/mkmf-gnome2.rb

@@ -77,12 +77,25 @@ end
 
 #add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2")
 def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
-  [top_srcdir, $configure_args['--topdir']].each do |topdir|
+  begin
+    require 'rubygems'
+    gem_spec = Gem.source_index.find_name(target_name).last
+    if gem_spec
+      target_source_dir = File.join(gem_spec.full_gem_path, "ext/#{target_name}")
+      target_build_dir = target_source_dir
+      add_depend_package_path(target_name,
+                              target_source_dir,
+                              target_build_dir)
+    end
+  rescue LoadError
+  end
+
+  [top_srcdir,
+   File.join(top_srcdir, target_name),
+   $configure_args['--topdir'],
+   File.join($configure_args['--topdir'], target_name)].each do |topdir|
     topdir = File.expand_path(topdir)
     target_source_dir_full_path = File.join(topdir, target_srcdir)
-    if File.exist?(target_source_dir_full_path)
-      $INCFLAGS = "-I#{target_source_dir_full_path} #{$INCFLAGS}"
-    end
 
     top_build_dir = options[:top_build_dir] || topdir
     target_build_dir = options[:target_build_dir] || target_srcdir
@@ -96,26 +109,38 @@ def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
     unless File.exist?(target_build_dir_full_path)
       target_build_dir_full_path = File.join(topdir, target_srcdir)
     end
-    next unless File.exist?(target_build_dir_full_path)
-    $INCFLAGS = "-I#{target_build_dir_full_path} #{$INCFLAGS}"
+    add_depend_package_path(target_name,
+                            target_source_dir_full_path,
+                            target_build_dir_full_path)
+  end
+end
+
+def add_depend_package_path(target_name, target_source_dir, target_build_dir)
+  if File.exist?(target_source_dir)
+    $INCFLAGS = "-I#{target_source_dir} #{$INCFLAGS}"
+  end
+
+  return unless File.exist?(target_build_dir)
+  if target_source_dir != target_build_dir
+    $INCFLAGS = "-I#{target_build_dir} #{$INCFLAGS}"
+  end
 
+  case RUBY_PLATFORM
+  when /cygwin|mingw|mswin32/
     case RUBY_PLATFORM
-    when /cygwin|mingw|mswin32/
-      case RUBY_PLATFORM
-      when /cygwin|mingw/
-        $LDFLAGS << " -L#{target_build_dir_full_path}"
-        $libs << " -lruby-#{target_name}"
-      when /mswin32/
-        $DLDFLAGS << " /libpath:#{target_build_dir_full_path}"
-        $libs << " libruby-#{target_name}.lib"
-      end
-      target_base_dir = Pathname.new(target_source_dir_full_path).parent.parent
-      target_binary_base_dir = target_base_dir + "vendor" + "local"
-      if target_binary_base_dir.exist?
-        $INCFLAGS = "-I#{target_binary_base_dir}/include #{$INCFLAGS}"
-        target_pkg_config_dir = target_binary_base_dir + "lib" + "pkgconfig"
-        PKGConfig.add_path(target_pkg_config_dir.to_s)
-      end
+    when /cygwin|mingw/
+      $LDFLAGS << " -L#{target_build_dir}"
+      $libs << " -lruby-#{target_name}"
+    when /mswin32/
+      $DLDFLAGS << " /libpath:#{target_build_dir}"
+      $libs << " libruby-#{target_name}.lib"
+    end
+    target_base_dir = Pathname.new(target_source_dir).parent.parent
+    target_binary_base_dir = target_base_dir + "vendor" + "local"
+    if target_binary_base_dir.exist?
+      $INCFLAGS = "-I#{target_binary_base_dir}/include #{$INCFLAGS}"
+      target_pkg_config_dir = target_binary_base_dir + "lib" + "pkgconfig"
+      PKGConfig.add_path(target_pkg_config_dir.to_s)
     end
   end
 end
@@ -258,7 +283,6 @@ end
 # This is used for the library which doesn't support version info.
 def make_version_header(app_name, pkgname, dir = "src")
   version = PKGConfig.modversion(pkgname).split(/\./)
-  version = "2.0b7".split(/\./)
   (0..2).each do |v|
     version[v] = "0" unless version[v]
     if /\A(\d+)/ =~ version[v]

data/test/glib-test-init.rb

@@ -1,6 +1,4 @@
 $VERBOSE = true
 
-glib_top = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-
-$LOAD_PATH.unshift(File.join(glib_top, "test-unit", "lib"))
+gem 'test-unit'
 require 'test/unit'

data/vendor/local/bin/glib-gettextize

@@ -38,11 +38,11 @@ Usage: glib-gettextize [OPTION]... [package-dir]
   -f, --force          force writing of new files even if old exist
 Report bugs to http://bugzilla.gnome.org/."
 package=glib
-version=2.26.1
+version=2.28.1
 try_ln_s=:
 
 # Directory where the sources are stored.
-prefix=c:/devel/target/059c48de6b739307c37648aba3005b29
+prefix=c:/devel/target/ea4ef54bcf881bcdd4139385601018a2
 case `uname` in
 MINGW32*)
     prefix="`dirname $0`/.."

data/vendor/local/bin/glib-mkenums

@@ -1,5 +1,6 @@
-#!/bin/perl -w
+#! /bin/perl
 
+use warnings;
 use File::Basename;
 use Safe;
 
@@ -128,7 +129,7 @@ sub parse_entries {
 }
 
 sub version {
-    print "glib-mkenums version glib-2.26.1\n";
+    print "glib-mkenums version glib-2.28.1\n";
     print "glib-mkenums comes with ABSOLUTELY NO WARRANTY.\n";
     print "You may redistribute copies of glib-mkenums under the terms of\n";
     print "the GNU General Public License which can be found in the\n";

data/vendor/local/include/glib-2.0/gio/gaction.h

@@ -0,0 +1,91 @@
+/*
+ * Copyright © 2010 Codethink Limited
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2 of the licence or (at
+ * your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
+#ifndef __G_ACTION_H__
+#define __G_ACTION_H__
+
+#include <gio/giotypes.h>
+
+G_BEGIN_DECLS
+
+#define G_TYPE_ACTION                                       (g_action_get_type ())
+#define G_ACTION(inst)                                      (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
+                                                             G_TYPE_ACTION, GAction))
+#define G_IS_ACTION(inst)                                   (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_ACTION))
+#define G_ACTION_GET_IFACE(inst)                            (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
+                                                             G_TYPE_ACTION, GActionInterface))
+
+typedef struct _GActionInterface                            GActionInterface;
+
+/**
+ * GActionInterface:
+ * @get_name: the virtual function pointer for g_action_get_name()
+ * @get_parameter_type: the virtual function pointer for g_action_get_parameter_type()
+ * @get_state_type: the virtual function pointer for g_action_get_state_type()
+ * @get_state_hint: the virtual function pointer for g_action_get_state_hint()
+ * @get_enabled: the virtual function pointer for g_action_get_enabled()
+ * @get_state: the virtual function pointer for g_action_get_state()
+ * @set_state: the virtual function pointer for g_action_set_state()
+ * @activate: the virtual function pointer for g_action_activate().  Note that #GAction does not have an
+ *            'activate' signal but that implementations of it may have one.
+ *
+ * Since: 2.28
+ */
+struct _GActionInterface
+{
+  GTypeInterface g_iface;
+
+  /* virtual functions */
+  const gchar *        (* get_name)             (GAction  *action);
+  const GVariantType * (* get_parameter_type)   (GAction  *action);
+  const GVariantType * (* get_state_type)       (GAction  *action);
+  GVariant *           (* get_state_hint)       (GAction  *action);
+
+  gboolean             (* get_enabled)          (GAction  *action);
+  GVariant *           (* get_state)            (GAction  *action);
+  void                 (* set_state)            (GAction  *action,
+                                                 GVariant *value);
+
+  void                 (* activate)             (GAction  *action,
+                                                 GVariant *parameter);
+};
+
+GType                   g_action_get_type                               (void) G_GNUC_CONST;
+
+const gchar *           g_action_get_name                               (GAction            *action);
+const GVariantType *    g_action_get_parameter_type                     (GAction            *action);
+const GVariantType *    g_action_get_state_type                         (GAction            *action);
+GVariant *              g_action_get_state_hint                         (GAction            *action);
+
+gboolean                g_action_get_enabled                            (GAction            *action);
+GVariant *              g_action_get_state                              (GAction            *action);
+void                    g_action_set_state                              (GAction            *action,
+                                                                         GVariant           *value);
+
+void                    g_action_activate                               (GAction            *action,
+                                                                         GVariant           *parameter);
+G_END_DECLS
+
+#endif /* __G_ACTION_H__ */

data/vendor/local/include/glib-2.0/gio/gactiongroup.h

@@ -0,0 +1,151 @@
+/*
+ * Copyright © 2010 Codethink Limited
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2 of the licence or (at
+ * your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
+#ifndef __G_ACTION_GROUP_H__
+#define __G_ACTION_GROUP_H__
+
+#include <gio/giotypes.h>
+
+G_BEGIN_DECLS
+
+
+#define G_TYPE_ACTION_GROUP                                 (g_action_group_get_type ())
+#define G_ACTION_GROUP(inst)                                (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
+                                                             G_TYPE_ACTION_GROUP, GActionGroup))
+#define G_IS_ACTION_GROUP(inst)                             (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
+                                                             G_TYPE_ACTION_GROUP))
+#define G_ACTION_GROUP_GET_IFACE(inst)                      (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
+                                                             G_TYPE_ACTION_GROUP, GActionGroupInterface))
+
+typedef struct _GActionGroupInterface                       GActionGroupInterface;
+
+/**
+ * GActionGroupInterface:
+ * @has_action: the virtual function pointer for g_action_group_has_action()
+ * @list_actions: the virtual function pointer for g_action_group_list_actions()
+ * @get_parameter_type: the virtual function pointer for g_action_group_get_parameter_type()
+ * @get_state_type: the virtual function pointer for g_action_group_get_state_type()
+ * @get_state_hint: the virtual function pointer for g_action_group_get_state_hint()
+ * @get_enabled: the virtual function pointer for g_action_group_get_enabled()
+ * @get_state: the virtual function pointer for g_action_group_get_state()
+ * @set_state: the virtual function pointer for g_action_group_set_state()
+ * @activate: the virtual function pointer for g_action_group_activate()
+ * @action_added: the class closure for the action-added signal
+ * @action_removed: the class closure for the action-removed signal
+ * @action_enabled_changed: the class closure for the action-enabled-changed signal
+ * @action_state_changed: the class closure for the action-enabled-changed signal
+ *
+ * The virtual function table for #GActionGroup.
+ *
+ * Since: 2.28
+ */
+struct _GActionGroupInterface
+{
+  GTypeInterface g_iface;
+
+  /* virtual functions */
+  gboolean              (* has_action)                 (GActionGroup  *action_group,
+                                                        const gchar   *action_name);
+
+  gchar **              (* list_actions)               (GActionGroup  *action_group);
+
+  gboolean              (* get_action_enabled)         (GActionGroup  *action_group,
+                                                        const gchar   *action_name);
+
+  const GVariantType *  (* get_action_parameter_type)  (GActionGroup  *action_group,
+                                                        const gchar   *action_name);
+
+  const GVariantType *  (* get_action_state_type)      (GActionGroup  *action_group,
+                                                        const gchar   *action_name);
+
+  GVariant *            (* get_action_state_hint)      (GActionGroup  *action_group,
+                                                        const gchar   *action_name);
+
+  GVariant *            (* get_action_state)           (GActionGroup  *action_group,
+                                                        const gchar   *action_name);
+
+  void                  (* change_action_state)        (GActionGroup  *action_group,
+                                                        const gchar   *action_name,
+                                                        GVariant      *value);
+
+  void                  (* activate_action)            (GActionGroup  *action_group,
+                                                        const gchar   *action_name,
+                                                        GVariant      *parameter);
+
+  /* signals */
+  void                  (* action_added)               (GActionGroup  *action_group,
+                                                        const gchar   *action_name);
+  void                  (* action_removed)             (GActionGroup  *action_group,
+                                                        const gchar   *action_name);
+  void                  (* action_enabled_changed)     (GActionGroup  *action_group,
+                                                        const gchar   *action_name,
+                                                        gboolean       enabled);
+  void                  (* action_state_changed)       (GActionGroup   *action_group,
+                                                        const gchar    *action_name,
+                                                        GVariant       *value);
+};
+
+GType                   g_action_group_get_type                         (void) G_GNUC_CONST;
+
+gboolean                g_action_group_has_action                       (GActionGroup *action_group,
+                                                                         const gchar  *action_name);
+gchar **                g_action_group_list_actions                     (GActionGroup *action_group);
+
+const GVariantType *    g_action_group_get_action_parameter_type        (GActionGroup *action_group,
+                                                                         const gchar  *action_name);
+const GVariantType *    g_action_group_get_action_state_type            (GActionGroup *action_group,
+                                                                         const gchar  *action_name);
+GVariant *              g_action_group_get_action_state_hint            (GActionGroup *action_group,
+                                                                         const gchar  *action_name);
+
+gboolean                g_action_group_get_action_enabled               (GActionGroup *action_group,
+                                                                         const gchar  *action_name);
+
+GVariant *              g_action_group_get_action_state                 (GActionGroup *action_group,
+                                                                         const gchar  *action_name);
+void                    g_action_group_change_action_state              (GActionGroup *action_group,
+                                                                         const gchar  *action_name,
+                                                                         GVariant     *value);
+
+void                    g_action_group_activate_action                  (GActionGroup *action_group,
+                                                                         const gchar  *action_name,
+                                                                         GVariant     *parameter);
+
+/* signals */
+void                    g_action_group_action_added                     (GActionGroup *action_group,
+                                                                         const gchar  *action_name);
+void                    g_action_group_action_removed                   (GActionGroup *action_group,
+                                                                         const gchar  *action_name);
+void                    g_action_group_action_enabled_changed           (GActionGroup *action_group,
+                                                                         const gchar  *action_name,
+                                                                         gboolean      enabled);
+
+void                    g_action_group_action_state_changed             (GActionGroup *action_group,
+                                                                         const gchar  *action_name,
+                                                                         GVariant     *state);
+
+G_END_DECLS
+
+#endif /* __G_ACTION_GROUP_H__ */