glib2 2.0.2 → 2.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 51cb310b1487ddff56bbd1779b3d01fc2c57f129
+  data.tar.gz: 56ef55006002b7182b07307ddd5f23a406e6247d
+SHA512:
+  metadata.gz: fb2cc0a1746d30cf284a1f37f74c750c8a665d02d9d91683b87568f5b6b933a894c227987ee083f0d247b3cd1239f2979f4fb36f736972780a615f5ea169e8b1
+  data.tar.gz: 2f7dc9409805337147693951158b2929571b7fed0c767699dbbce2052c2fba011bd8a7324db730c649e619f4c6182a512e6c0cd2fb49dd9f0b111f1637f1676b

data/README

@@ -1,13 +1,13 @@
 Ruby/GLib2
 ==========
-Ruby/GLib2 is a Ruby binding of GLib-2.x.
+Ruby/GLib2 is a Ruby binding of GLib-2.12.x.
 
 Requirements
 ------------
 
-  Ruby >= 1.8.5: http://www.ruby-lang.org/
+  Ruby >= 1.9.x: http://www.ruby-lang.org/
   pkg-config.rb: http://github.com/rcairo/pkg-config
-  GLib >= 2.x: http://www.gtk.org/
+  GLib >= 2.12.x: http://www.gtk.org/
 
 Install (RubyGems)
 ------------------
@@ -21,7 +21,7 @@ Windows:
 Install (traditional)
 ---------------------
 
-Install ruby-1.8.5 or later, pkg-config.rb and GLib-2.x.
+Install ruby-1.9.x or later, pkg-config.rb and GLib-2.12.x.
 
   % ruby extconf.rb
   % make

data/Rakefile

@@ -3,27 +3,33 @@
 $LOAD_PATH.unshift("./lib")
 require 'gnome2-raketask'
 
+bin_dir            = nil
 include_dir        = nil
 glib2_include_dir  = nil
 libffi_lib_dir     = nil
 
+build_host         = nil
+
 package = GNOME2Package.new do |_package|
+  bin_dir            = (_package.windows.absolute_binary_dir + "bin").to_s
   include_dir        = (_package.windows.absolute_binary_dir + "include").to_s
   glib2_include_dir  = File.join(include_dir, "glib-2.0")
   libffi_lib_dir     = (_package.windows.absolute_binary_dir + "lib").to_s
 
+  build_host         = _package.windows.build_host
+
   _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 = []
-  _package.win32.dependencies = ["zlib", "libffi", "gettext-runtime"]
+  _package.win32.dependencies = ["libffi", "gettext-runtime"]
   _package.external_packages = [
     {
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.36.2",
+      :version => "2.38.2",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -32,48 +38,57 @@ package = GNOME2Package.new do |_package|
           "--disable-modular-tests",
         ],
         :need_autoreconf => true,
+        :patches => [
+          "glib-2.38.2-add-missing-exeext.diff",
+        ],
+        :built_file => "bin/libglib-2.0-0.dll",
       },
     },
     {
       :name => "gmp",
-      :download_base_url => "ftp://ftp.gmplib.org/pub/gmp-5.1.2",
+      :download_base_url => "ftp://ftp.gmplib.org/pub/gmp-5.1.3",
       :label => "GNU MP",
-      :version => "5.1.2",
+      :version => "5.1.3",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
           "--disable-static",
           "--enable-shared",
         ],
+        :built_file => "bin/libgmp-10.dll",
       },
     },
     {
       :name => "nettle",
       :download_base_url => "http://www.lysator.liu.se/~nisse/archive",
       :label => "Nettle",
-      :version => "2.7",
+      :version => "2.7.1",
       :windows => {
         :configure_args => [],
+        :built_file => "bin/libnettle-4-7.dll",
       },
     },
     {
       :name => "gnutls",
-      :download_base_url => "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1",
+      :download_base_url => "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2",
       :label => "GnuTLS",
-      :version => "3.1.11",
+      :version => "3.2.7",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
-          "--with-libnettle-prefix=#{_package.win32.absolute_binary_dir}"
+          "--disable-cxx",
         ],
         :use_cc_environment_variable => false,
+        :patches => [
+        ],
+        :built_file => "bin/libgnutls-28.dll",
       },
     },
     {
       :name => "glib-networking",
       :download_site => :gnome,
       :label => "glib-networking",
-      :version => "2.36.2",
+      :version => "2.38.2",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -81,9 +96,15 @@ package = GNOME2Package.new do |_package|
           "--without-gnome-proxy",
           "--without-ca-certificates",
         ],
+        :built_file => "lib/gio/modules/libgiognutls.dll",
       },
     },
   ]
+  _package.cross_compiling do |spec|
+    if /mingw|mswin/ =~ spec.platform.to_s
+      spec.add_runtime_dependency("cairo", ">= 1.12.8")
+    end
+  end
 end
 package.define_tasks
 
@@ -116,7 +137,7 @@ namespace :win32 do
     end
   end
 
-  namespace :buildler do
+  namespace :builder do
     namespace :build do
       namespace :glib do
         task :after => [

data/ext/glib2/extconf.rb

@@ -16,7 +16,7 @@ require 'mkmf-gnome2'
 
 setup_win32(module_name, base_dir)
 
-unless required_pkg_config_package(package_id,
+unless required_pkg_config_package([package_id, 2, 12, 0],
                                    :debian => "libglib2.0-dev",
                                    :redhat => "glib2-devel",
                                    :homebrew => "glib",
@@ -47,6 +47,7 @@ have_func("ruby_native_thread_p", ruby_header)
 have_func("rb_thread_call_with_gvl", ruby_header)
 have_func("rb_str_new_cstr", ruby_header)
 have_func("rb_gc_register_mark_object", ruby_header)
+have_func("rb_exc_new_str", ruby_header)
 
 have_var("curr_thread", [ruby_header, "node.h"])
 have_var("rb_curr_thread", [ruby_header, "node.h"])

data/ext/glib2/glib2.def

@@ -17,6 +17,7 @@ EXPORTS
 	rbgobj_ruby_object_from_instance
 	rbgobj_ruby_object_from_instance2
 	rbgobj_ruby_object_from_instance_with_unref
+	rbgobj_instance_unref
 	rbgobj_get_ruby_object_from_gobject
 	rbgobj_create_object
 	rbgobj_gobject_new

data/ext/glib2/rbglib.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,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -1029,7 +1029,6 @@ Init_glib2(void)
     rb_define_const(RG_TARGET_NAMESPACE, "MAXLONG", INT2NUM(G_MAXLONG));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXULONG", UINT2NUM(G_MAXULONG));
 
-#if GLIB_CHECK_VERSION(2,4,0)
     rb_define_const(RG_TARGET_NAMESPACE, "MININT8", INT2FIX(G_MININT8));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXINT8", INT2FIX(G_MAXINT8));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXUINT8", UINT2NUM(G_MAXUINT8));
@@ -1041,13 +1040,13 @@ Init_glib2(void)
     rb_define_const(RG_TARGET_NAMESPACE, "MININT32", INT2FIX(G_MININT32));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXINT32", INT2NUM(G_MAXINT32));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXUINT32", UINT2NUM(G_MAXUINT32));
-#endif
+
     rb_define_const(RG_TARGET_NAMESPACE, "MININT64", INT2FIX(G_MININT64));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXINT64", LL2NUM(G_MAXINT64));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXUINT64", ULL2NUM(G_MAXUINT64));
-#if GLIB_CHECK_VERSION(2,4,0)
+
     rb_define_const(RG_TARGET_NAMESPACE, "MAXSIZE", UINT2NUM(G_MAXSIZE));
-#endif
+
     rb_define_const(RG_TARGET_NAMESPACE, "MINFLOAT", INT2FIX(G_MINFLOAT));
     rb_define_const(RG_TARGET_NAMESPACE, "MAXFLOAT", DBL2NUM(G_MAXFLOAT));
 
@@ -1121,6 +1120,8 @@ union       GDoubleIEEE754;
 /*    Init_mem(); */
     Init_gutil();
     Init_gutil_callback();
+
+    Init_glib_gettext();
     Init_glib_int64();
     Init_glib_error();
     Init_glib_threads();

data/ext/glib2/rbglib.h

@@ -35,7 +35,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 2
 #define RBGLIB_MINOR_VERSION 0
-#define RBGLIB_MICRO_VERSION 2
+#define RBGLIB_MICRO_VERSION 3
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)
@@ -51,8 +51,8 @@ extern "C" {
 #  define DBL2NUM(v)      (rb_float_new(v))
 #endif
 
-#if ! GLIB_CHECK_VERSION(2,4,0)
-typedef int GPid;
+#ifndef RBASIC_CLASS
+#  define RBASIC_CLASS(obj) (RBASIC(obj)->klass)
 #endif
 
 #ifndef G_SOURCE_REMOVE

data/ext/glib2/rbglib_bookmarkfile.c

@@ -21,7 +21,6 @@
 
 #include "rbgprivate.h"
 
-#if GLIB_CHECK_VERSION(2,12,0)
 /************************************************/
 static GBookmarkFile*
 bookmarkfile_copy(const GBookmarkFile* file)
@@ -498,12 +497,9 @@ rg_move_item(VALUE self, VALUE old_uri, VALUE new_uri)
     return self;
 }
 
-#endif
-
 void
 Init_glib_bookmark_file(void)
 {
-#if GLIB_CHECK_VERSION(2,12,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_BOOKMARK_FILE, "BookmarkFile", mGLib);
 
     G_DEF_ERROR(G_BOOKMARK_FILE_ERROR, "BookmarkFileError", mGLib, 
@@ -547,5 +543,4 @@ Init_glib_bookmark_file(void)
     RG_DEF_METHOD(remove_application, 2);
     RG_DEF_METHOD(remove_item, 1);
     RG_DEF_METHOD(move_item, 2);
-#endif
 }

data/ext/glib2/rbglib_error.c

@@ -31,22 +31,19 @@ VALUE
 rbgerr_gerror2exception(GError *error)
 {
     VALUE exc = Qnil;
-    VALUE klass = Qnil;
+    VALUE exception_klass = Qnil;
 
-    if (! error){
+    if (!error) {
         return rb_exc_new2(rb_eRuntimeError, "GError parameter doesn't have a value.");
     }
 
-    klass = rb_hash_aref(gerror_table, UINT2NUM(error->domain));
-    if (NIL_P(klass)) {
-        exc = rb_exc_new2(generic_error, error->message);
-        rb_ivar_set(exc, id_domain, CSTR2RVAL(g_quark_to_string(error->domain)));
-        rb_ivar_set(exc, id_code, INT2NUM(error->code));
-    } else {
-        exc = rb_exc_new2(klass, error->message);
-        rb_ivar_set(exc, id_domain, CSTR2RVAL(g_quark_to_string(error->domain)));
-        rb_ivar_set(exc, id_code, INT2NUM(error->code));
+    exception_klass = rb_hash_aref(gerror_table, UINT2NUM(error->domain));
+    if (NIL_P(exception_klass)) {
+        exception_klass = generic_error;
     }
+    exc = rb_exc_new_str(exception_klass, CSTR2RVAL(error->message));
+    rb_ivar_set(exc, id_domain, CSTR2RVAL(g_quark_to_string(error->domain)));
+    rb_ivar_set(exc, id_code, INT2NUM(error->code));
     g_error_free(error);
     return exc;
 }

data/ext/glib2/rbglib_gettext.c

@@ -0,0 +1,48 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  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
+ */
+
+#include "rbgprivate.h"
+#include "rbglib.h"
+
+#include <libintl.h>
+
+#define RG_TARGET_NAMESPACE mGetText
+
+static VALUE
+rg_s_bindtextdomain(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+{
+    VALUE domain_name;
+    VALUE directory;
+    const char *current_directory = NULL;
+
+    rb_scan_args(argc, argv, "11", &domain_name, &directory);
+    current_directory = bindtextdomain(RVAL2CSTR(domain_name),
+                                       RVAL2CSTR_ACCEPT_NIL(directory));
+    return CSTR2RVAL(current_directory);
+}
+
+void
+Init_glib_gettext(void)
+{
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = rb_define_module_under(mGLib, "GetText");
+    RG_DEF_SMETHOD(bindtextdomain, -1);
+}

data/ext/glib2/rbglib_i18n.c

@@ -26,19 +26,15 @@
 
 #define RG_TARGET_NAMESPACE mGLib
 
-#if GLIB_CHECK_VERSION(2,6,0)
 static VALUE
 rg_s_language_names(G_GNUC_UNUSED VALUE self)
 {
     return STRV2RVAL((const gchar **)g_get_language_names());
 }
-#endif
 
 void
 Init_glib_i18n(void)
 {
     /* glib/gi18n.h */
-#if GLIB_CHECK_VERSION(2,6,0)
     RG_DEF_SMETHOD(language_names, 0);
-#endif
 }

data/ext/glib2/rbglib_keyfile.c

@@ -21,7 +21,6 @@
 
 #include "rbgprivate.h"
 
-#if GLIB_CHECK_VERSION(2,6,0)
 #if !GLIB_CHECK_VERSION(2,31,2)
 /************************************************/
 static GKeyFile*
@@ -312,7 +311,6 @@ rg_get_integer(VALUE self, VALUE group_name, VALUE key)
     return INT2NUM(ret);
 }
 
-#if GLIB_CHECK_VERSION(2,12,0)
 static VALUE
 rg_get_double(VALUE self, VALUE group_name, VALUE key)
 {
@@ -326,7 +324,6 @@ rg_get_double(VALUE self, VALUE group_name, VALUE key)
 
     return rb_float_new(ret);
 }
-#endif
 
 static VALUE
 rg_get_string_list(VALUE self, VALUE group_name, VALUE key)
@@ -422,7 +419,6 @@ rg_get_integer_list(VALUE self, VALUE group_name, VALUE key)
     return ary;
 }
 
-#if GLIB_CHECK_VERSION(2,12,0)
 static VALUE
 rg_get_double_list(VALUE self, VALUE group_name, VALUE key)
 {
@@ -443,7 +439,6 @@ rg_get_double_list(VALUE self, VALUE group_name, VALUE key)
     }
     return ary;
 }
-#endif
 
 static VALUE
 rg_get_comment(VALUE self, VALUE group_name, VALUE key)
@@ -505,7 +500,6 @@ rg_set_integer(VALUE self, VALUE group_name, VALUE key, VALUE value)
     return self;
 }
 
-#if GLIB_CHECK_VERSION(2,12,0)
 static VALUE
 rg_set_double(VALUE self, VALUE group_name, VALUE key, VALUE value)
 {
@@ -514,7 +508,6 @@ rg_set_double(VALUE self, VALUE group_name, VALUE key, VALUE value)
                           NUM2DBL(value));
     return self;
 }
-#endif
 
 static VALUE
 rg_set_string_list(VALUE self, VALUE rbgroup_name, VALUE rbkey, VALUE rblist)
@@ -581,7 +574,6 @@ rg_set_integer_list(VALUE self, VALUE rbgroup_name, VALUE rbkey, VALUE rblist)
     return self;
 }
 
-#if GLIB_CHECK_VERSION(2,12,0)
 static VALUE
 rg_set_double_list(VALUE self, VALUE rbgroup_name, VALUE rbkey, VALUE rblist)
 {
@@ -595,7 +587,6 @@ rg_set_double_list(VALUE self, VALUE rbgroup_name, VALUE rbkey, VALUE rblist)
 
     return self;
 }
-#endif
 
 static VALUE
 rg_set_comment(VALUE self, VALUE group_name, VALUE key, VALUE comment)
@@ -657,12 +648,10 @@ rg_remove_comment(VALUE self, VALUE group_name, VALUE key)
 
     return self;
 }
-#endif
 
 void
 Init_glib_keyfile(void)
 {
-#if GLIB_CHECK_VERSION(2,6,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_KEY_FILE, "KeyFile", mGLib);   
     G_DEF_ERROR(G_KEY_FILE_ERROR, "KeyFileError", mGLib, 
                 rb_eRuntimeError, G_TYPE_KEY_FILE_ERROR);
@@ -686,32 +675,24 @@ Init_glib_keyfile(void)
     RG_DEF_METHOD(get_locale_string, -1);
     RG_DEF_METHOD(get_boolean, 2);
     RG_DEF_METHOD(get_integer, 2);
-#if GLIB_CHECK_VERSION(2,12,0)
     RG_DEF_METHOD(get_double, 2);
-#endif
     RG_DEF_METHOD(get_string_list, 2);
     RG_DEF_METHOD(get_locale_string_list, -1);
     RG_DEF_METHOD(get_boolean_list, 2);
     RG_DEF_METHOD(get_integer_list, 2);
-#if GLIB_CHECK_VERSION(2,12,0)
     RG_DEF_METHOD(get_double_list, 2);
-#endif
     RG_DEF_METHOD(get_comment, 2);
     RG_DEF_METHOD(set_value, 3);
     RG_DEF_METHOD(set_string, 3);
     RG_DEF_METHOD(set_locale_string, 4);
     RG_DEF_METHOD(set_boolean, 3);
     RG_DEF_METHOD(set_integer, 3);
-#if GLIB_CHECK_VERSION(2,12,0)
     RG_DEF_METHOD(set_double, 3);
-#endif
     RG_DEF_METHOD(set_string_list, 3);
     RG_DEF_METHOD(set_locale_string_list, 4);
     RG_DEF_METHOD(set_boolean_list, 3);
     RG_DEF_METHOD(set_integer_list, 3);
-#if GLIB_CHECK_VERSION(2,12,0)
     RG_DEF_METHOD(set_double_list, 3);
-#endif
     RG_DEF_METHOD(set_comment, 3);
     RG_DEF_METHOD(remove_group, 1);
     RG_DEF_METHOD(remove_key, 2);
@@ -771,5 +752,4 @@ Init_glib_keyfile(void)
     rb_define_const(RG_TARGET_NAMESPACE, "DESKTOP_TYPE_DIRECTORY",
                     CSTR2RVAL(G_KEY_FILE_DESKTOP_TYPE_DIRECTORY));
 #endif
-#endif
 }