glib2 1.2.5 → 1.2.6

data/Rakefile

@@ -21,7 +21,7 @@ package = GNOME2Package.new do |_package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.34.3",
+      :version => "2.36.0",
       :configure_args => [
         "LIBFFI_CFLAGS=-I#{libffi_include_dir}",
         "LIBFFI_LIBS=-L#{libffi_lib_dir} -lffi",
@@ -51,7 +51,7 @@ package = GNOME2Package.new do |_package|
       :name => "gnutls",
       :download_base_url => "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1",
       :label => "GnuTLS",
-      :version => "3.1.5",
+      :version => "3.1.10",
       :configure_args => [
         "--with-libnettle-prefix=#{_package.win32.absolute_binary_dir}"
       ],
@@ -61,7 +61,7 @@ package = GNOME2Package.new do |_package|
       :name => "glib-networking",
       :download_site => :gnome,
       :label => "glib-networking",
-      :version => "2.34.2",
+      :version => "2.36.0",
       :configure_args => [
         "--without-libproxy",
         "--without-gnome-proxy",

data/ext/glib2/rbglib.c

@@ -1115,7 +1115,6 @@ union       GDoubleIEEE754;
     Init_glib_io_channel_win32_socket();
     Init_glib_shell();
     Init_glib_shellerror();
-    Init_glib_completion();
     Init_glib_timer();
     Init_glib_unicode();
     Init_glib_utf8();

data/ext/glib2/rbglib.h

@@ -35,7 +35,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 1
 #define RBGLIB_MINOR_VERSION 2
-#define RBGLIB_MICRO_VERSION 5
+#define RBGLIB_MICRO_VERSION 6
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/ext/glib2/rbglib2conversions.h

@@ -25,8 +25,6 @@
 
 #define RVAL2GCLOSURE(o)                   ((GClosure*)RVAL2BOXED(o, G_TYPE_CLOSURE))
 #define GCLOSURE2RVAL(o)                   (BOXED2RVAL(o, G_TYPE_CLOSURE))
-#define RVAL2GCOMPLETION(o)                ((GCompletion*)RVAL2BOXED(o, G_TYPE_COMPLETION))
-#define GCOMPLETION2RVAL(o)                (BOXED2RVAL(o, G_TYPE_COMPLETION))
 #define RVAL2GIOCHANNEL(o)                 ((GIOChannel*)RVAL2BOXED(o, G_TYPE_IO_CHANNEL))
 #define GIOCHANNEL2RVAL(o)                 (BOXED2RVAL(o, G_TYPE_IO_CHANNEL))
 #define RVAL2GKEYFILE(o)                   ((GKeyFile*)RVAL2BOXED(o, G_TYPE_KEY_FILE))

data/ext/glib2/rbglib_source.c

@@ -148,14 +148,15 @@ rg_remove_poll(VALUE self, VALUE fd)
     return self;
 }
 
+#if GLIB_CHECK_VERSION(2, 28, 0)
 static VALUE
-rg_current_time(VALUE self)
+rg_time(VALUE self)
 {
-    GTimeVal timeval;
-    g_source_get_current_time(_SELF(self), &timeval);
-
-    return rb_assoc_new(LONG2NUM(timeval.tv_sec), LONG2NUM(timeval.tv_usec));
+    gint64 time;
+    time = g_source_get_time(_SELF(self));
+    return LL2NUM(time);
 }
+#endif
 
 /* How can I implement them ?
 gboolean    g_source_remove_by_funcs_user_data
@@ -189,7 +190,9 @@ Init_glib_source(void)
     RG_DEF_METHOD(set_callback, 0);
     RG_DEF_METHOD(add_poll, 1);
     RG_DEF_METHOD(remove_poll, 1);
-    RG_DEF_METHOD(current_time, 0);
+#if GLIB_CHECK_VERSION(2, 28, 0)
+    RG_DEF_METHOD(time, 0);
+#endif
 
     /* GLib::Source.remove is moved to rbglib_maincontext.c */
 }

data/ext/glib2/rbgobj_closure.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2006  Ruby-GNOME2 Project
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
@@ -332,9 +332,11 @@ rg_invalidate(VALUE self)
 void
 Init_gobject_gclosure(void)
 {
+    VALUE RG_TARGET_NAMESPACE;
+
     init_rclosure();
 
-    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_CLOSURE, "Closure", mGLib);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_CLOSURE, "Closure", mGLib);
 
     RG_DEF_METHOD(initialize, 0);
     RG_DEF_METHOD_P(in_marshal, 0);

data/ext/glib2/rbgprivate.h

@@ -141,7 +141,6 @@ G_GNUC_INTERNAL void Init_glib_io_channelerror(void);
 G_GNUC_INTERNAL void Init_glib_io_channel_win32_socket(void);
 G_GNUC_INTERNAL void Init_glib_shell(void);
 G_GNUC_INTERNAL void Init_glib_shellerror(void);
-G_GNUC_INTERNAL void Init_glib_completion(void);
 G_GNUC_INTERNAL void Init_glib_timer(void);
 G_GNUC_INTERNAL void Init_glib_unicode(void);
 G_GNUC_INTERNAL void Init_glib_utf8(void);

data/lib/glib-mkenums.rb

@@ -3,7 +3,7 @@
 #
 # C language enum description generation library like as glib-mkenums tool.
 #
-# Copyright(C) 2006-2008 Ruby-GNOME2 Project.
+# Copyright(C) 2006-2013 Ruby-GNOME2 Project.
 #
 # This program is licenced under the same license of Ruby-GNOME2.
 #
@@ -29,8 +29,6 @@ module GLib
     end
 
     def parse_const_lines(const_lines)
-      ret = ""
-
       if @options[:force_flags] or /<</ =~ const_lines
         @type = "flags"
         @Type = "Flags"

data/lib/gnome2-raketask.rb

@@ -202,6 +202,7 @@ class GNOME2Package
     attr_accessor :packages, :dependencies, :build_packages, :build_dependencies
     attr_accessor :build_host
     attr_accessor :relative_binary_dir, :absolute_binary_dir
+    attr_accessor :support_concurrent_build
     def initialize(package)
       @package = package
       @packages = []
@@ -211,6 +212,7 @@ class GNOME2Package
       @build_host = "i686-w64-mingw32"
       @relative_binary_dir = File.join("vendor", "local")
       @absolute_binary_dir = File.expand_path(@relative_binary_dir)
+      @support_concurrent_build = true
     end
 
     def to_hash
@@ -221,6 +223,7 @@ class GNOME2Package
         :build_host => @build_host,
         :relative_binary_dir => @relative_binary_dir,
         :absolute_binary_dir => @absolute_binary_dir,
+        :support_concurrent_build => @support_concurrent_build,
       }
     end
   end

data/lib/gnome2-win32-binary-build-task.rb

@@ -119,8 +119,10 @@ class GNOME2Win32BinaryBuildTask
             common_make_args << "GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
             build_make_args = common_make_args.dup
             install_make_args = common_make_args.dup
-            make_n_jobs = ENV["MAKE_N_JOBS"]
-            build_make_args << "-j#{make_n_jobs}" if make_n_jobs
+            if package[:support_concurrent_build]
+              make_n_jobs = ENV["MAKE_N_JOBS"]
+              build_make_args << "-j#{make_n_jobs}" if make_n_jobs
+            end
             ENV["GREP_OPTIONS"] = "--text"
             sh("nice", "make", *build_make_args) or exit(false)
             sh("make", "install", *install_make_args) or exit(false)

data/test/test_source.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class TestGLibSource < Test::Unit::TestCase
+  include GLibTestUtils
+
+  def test_time
+    context = GLib::MainContext.default
+    source = GLib::Idle.source_new
+    source.attach(context)
+    time = source.time
+    assert_operator(0, :<, time)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -68,7 +68,6 @@ files:
 - ext/glib2/rbglib.h
 - ext/glib2/rbglib2conversions.h
 - ext/glib2/rbglib_bookmarkfile.c
-- ext/glib2/rbglib_completion.c
 - ext/glib2/rbglib_convert.c
 - ext/glib2/rbglib_error.c
 - ext/glib2/rbglib_fileutils.c
@@ -129,7 +128,6 @@ files:
 - ext/glib2/rbgutildeprecated.c
 - ext/glib2/rbgutildeprecated.h
 - sample/bookmarkfile.rb
-- sample/completion.rb
 - sample/idle.rb
 - sample/iochannel.rb
 - sample/keyfile.rb
@@ -153,6 +151,7 @@ files:
 - test/test_mkenums.rb
 - test/test_poll_fd.rb
 - test/test_signal.rb
+- test/test_source.rb
 - test/test_spawn.rb
 - test/test_timeout.rb
 - test/test_unicode.rb

data/ext/glib2/rbglib_completion.c

@@ -1,195 +0,0 @@
-/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2005,2006  Masao Mutoh
- *
- *  This library 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.1 of the License, 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., 51 Franklin Street, Fifth Floor, Boston,
- *  MA  02110-1301  USA
- */
-
-#include "rbgprivate.h"
-
-static ID id_compfunc;
-static ID id_call;
-static ID id_to_s;
-static ID id_clear;
-static ID id_items_internal;
-
-/*****************************************/
-static GCompletion*
-completion_copy(GCompletion *comp)
-{
-  GCompletion* new_comp;
-  g_return_val_if_fail (comp != NULL, NULL);
-
-  new_comp = g_new(GCompletion, 1);
-  *new_comp = *comp;
-  return new_comp;
-}
-
-static GType
-g_completion_get_type(void)
-{
-    static GType our_type = 0;
-    if (our_type == 0)
-        our_type = g_boxed_type_register_static ("GCompletion",
-                                                 (GBoxedCopyFunc)completion_copy,
-                                                 (GBoxedFreeFunc)g_completion_free);
-    return our_type;
-}
-/*****************************************/
-
-#define G_TYPE_COMPLETION (g_completion_get_type())
-
-#define RG_TARGET_NAMESPACE cCompletion
-#define _SELF(s) ((GCompletion*)RVAL2BOXED(s, G_TYPE_COMPLETION))
-
-/* data should be [self, data] */
-static gchar *
-comp_func(gpointer compdata)
-{
-    VALUE ret;
-    VALUE self = RARRAY_PTR((VALUE)compdata)[0];
-    VALUE data = RARRAY_PTR((VALUE)compdata)[1];
-
-    VALUE func = rb_ivar_get(self, id_compfunc);
-
-    if (NIL_P(func)){
-        ret = rb_funcall(data, id_to_s, 0);
-    } else {
-        ret = rb_funcall(func, id_call, 1, data);
-    }
-    return (gchar *)RVAL2CSTR(ret);
-}
-
-static VALUE
-rg_initialize(VALUE self)
-{
-    VALUE block = Qnil;
-
-    if (rb_block_given_p()) {
-        block = rb_block_proc();
-    }
-
-    rb_ivar_set(self, id_compfunc, block);
-    /* This is used for memory management(GC) */
-    rb_ivar_set(self, id_items_internal, rb_hash_new());
-
-    G_INITIALIZE(self, g_completion_new((GCompletionFunc)comp_func));
-
-    return Qnil;
-}
-
-static VALUE
-rg_add_items(VALUE self, VALUE items)
-{
-    gint i, len;
-    GList* list = (GList*)NULL;
-    VALUE items_internal = rb_ivar_get(self, id_items_internal);
-
-    items = rb_ary_to_ary(items);
-    len = RARRAY_LEN(items);
-    for (i = 0; i < len; i ++){
-        VALUE data = RARRAY_PTR(items)[i];
-        VALUE item = rb_assoc_new(self, data);
-        list = g_list_append(list, (gpointer)item);
-        rb_hash_aset(items_internal, data, item);
-    }
-    g_completion_add_items(_SELF(self), list);
-
-    return self;
-}
-
-static VALUE
-rg_remove_items(VALUE self, VALUE items)
-{
-    gint i, len;
-    GList* list = (GList*)NULL;
-    VALUE items_internal = rb_ivar_get(self, id_items_internal);
-
-    items = rb_ary_to_ary(items);
-    len = RARRAY_LEN(items);
-    for (i = 0; i < len; i ++){
-        VALUE data = RARRAY_PTR(items)[i];
-        VALUE item = rb_hash_aref(items_internal, data);
-        list = g_list_append(list, (gpointer)item);
-        rb_hash_delete(items_internal, data);
-    }
-    g_completion_remove_items(_SELF(self), list);
-
-    return self;
-}
-
-static VALUE
-rg_clear_items(VALUE self)
-{
-    VALUE items_internal = rb_ivar_get(self, id_items_internal);
-    rb_funcall(items_internal, id_clear, 0);
-    g_completion_clear_items(_SELF(self));
-    return self;
-}
-
-static VALUE
-rg_items(VALUE self)
-{
-    return rb_ivar_get(self, id_items_internal);
-}
-
-static VALUE
-rg_complete(VALUE self, VALUE prefix)
-{
-    gchar* new_prefix;
-    VALUE ary = rb_ary_new();
-#if GLIB_CHECK_VERSION(2,4,0)
-    GList* list = g_completion_complete_utf8(_SELF(self),
-                                            (const gchar*)RVAL2CSTR(prefix),
-                                            &new_prefix);
-#else
-    GList* list = g_completion_complete(_SELF(self),
-                                        RVAL2CSTR(prefix),
-                                        &new_prefix);
-#endif
-    while (list) {
-        rb_ary_push(ary, RARRAY_PTR((VALUE)list->data)[1]);
-        list = list->next;
-    }
-
-    return rb_assoc_new(ary, new_prefix ? CSTR2RVAL(new_prefix) : Qnil);
-}
-
-/* We don't use this.
-void        g_completion_set_compare        (GCompletion *cmp,
-                                             GCompletionStrncmpFunc strncmp_func);
-*/
-
-void
-Init_glib_completion(void)
-{
-    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_COMPLETION, "Completion", mGLib); 
-
-    id_call = rb_intern("call");
-    id_to_s = rb_intern("to_s");
-    id_clear = rb_intern("clear");
-    id_compfunc = rb_intern("completion_proc");
-    id_items_internal = rb_intern("items_internal");
-
-    RG_DEF_METHOD(initialize, 0);
-    RG_DEF_METHOD(add_items, 1);
-    RG_DEF_METHOD(remove_items, 1);
-    RG_DEF_METHOD(clear_items, 0);
-    RG_DEF_METHOD(complete, 1);
-
-    RG_DEF_METHOD(items, 0);
-}

data/sample/completion.rb

@@ -1,45 +0,0 @@
-=begin
-  completion.rb - Sample for GLib::Completion
-
-  Copyright (C) 2005 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: completion.rb,v 1.1 2005/10/14 19:10:07 mutoh Exp $
-=end
-
-require 'glib2'
-
-###########################
-# Simple String completion
-###########################
-ary = ["a_", "a_ab", "aac", "aabc", "aabcd"]
-comp = GLib::Completion.new
-comp.add_items(ary)
-p comp.complete("a_")
-p comp.complete("aab")
-
-puts "-----------"
-
-
-############################
-# Class completion and UTF-8
-############################
-class Test
-  def initialize(str)
-    @str = str
-  end
-  def value
-    @str
-  end
-end
-
-ary2 = [Test.new("あ_"), Test.new("あ_あい"), 
-  Test.new("ああab"), Test.new("ああabc"), Test.new("ああbcd")]
-
-comp2 = GLib::Completion.new {|data|
-  data.value
-}
-
-comp2.add_items(ary2)
-puts %Q$["#{comp2.complete("あ_").join(', "')}"]$
-puts %Q$["#{comp2.complete("ああa").join(', "')}"]$