glib2 2.0.0-x86-mingw32 → 2.0.1-x86-mingw32

data/Rakefile

@@ -23,7 +23,7 @@ package = GNOME2Package.new do |_package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.36.0",
+      :version => "2.36.2",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -31,14 +31,15 @@ package = GNOME2Package.new do |_package|
           "LIBFFI_LIBS=-L#{libffi_lib_dir} -lffi",
           "--disable-modular-tests",
         ],
+        :need_autoreconf => true,
       },
     },
     {
       :name => "gmp",
-      :download_base_url => "ftp://ftp.gmplib.org/pub/gmp-5.1.0",
+      :download_base_url => "ftp://ftp.gmplib.org/pub/gmp-5.1.2",
       :label => "GNU MP",
-      :version => "5.1.0",
-      :compression_method => "bz2",
+      :version => "5.1.2",
+      :compression_method => "xz",
       :windows => {
         :configure_args => [
           "--disable-static",
@@ -50,7 +51,7 @@ package = GNOME2Package.new do |_package|
       :name => "nettle",
       :download_base_url => "http://www.lysator.liu.se/~nisse/archive",
       :label => "Nettle",
-      :version => "2.5",
+      :version => "2.7",
       :windows => {
         :configure_args => [],
       },
@@ -59,7 +60,7 @@ package = GNOME2Package.new do |_package|
       :name => "gnutls",
       :download_base_url => "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1",
       :label => "GnuTLS",
-      :version => "3.1.10",
+      :version => "3.1.11",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -72,7 +73,7 @@ package = GNOME2Package.new do |_package|
       :name => "glib-networking",
       :download_site => :gnome,
       :label => "glib-networking",
-      :version => "2.36.0",
+      :version => "2.36.2",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/ext/glib2/extconf.rb

@@ -36,6 +36,7 @@ have_func("g_listenv", glib_header)
 
 ruby_header = "ruby.h"
 have_func("rb_check_array_type", ruby_header)
+have_func("rb_check_hash_type", ruby_header)
 have_func("rb_exec_recursive", ruby_header)
 have_func("rb_errinfo", ruby_header)
 have_func("rb_sourcefile", ruby_header)

data/ext/glib2/glib2.def

@@ -11,6 +11,8 @@ EXPORTS
 	rbgobj_remove_relative_all
 	rbgobj_define_class
 	rbgobj_define_class_dynamic
+	rbgobj_register_mark_func
+	rbgobj_register_free_func
 	rbgobj_instance_from_ruby_object
 	rbgobj_ruby_object_from_instance
 	rbgobj_ruby_object_from_instance2
@@ -23,6 +25,7 @@ EXPORTS
 	rbgobj_boxed_get
 	rbgobj_boxed_get_default
 	rbgobj_boxed_not_copy_obj
+	rbgobj_boxed_unown
 	rbgobj_make_boxed
 	rbgobj_make_boxed_raw
 	rbgobj_make_boxed_default
@@ -99,6 +102,10 @@ EXPORTS
         rbg_gslist2rval_with_type
 	rbg_define_method
 	rbg_define_singleton_method
+	rbg_to_array
+	rbg_to_hash
+	rbg_check_array_type
+	rbg_check_hash_type
 	rbg_scan_options
 	rbgutil_id_module_eval		DATA
 	rbgutil_def_setters

data/ext/glib2/rbglib.c

@@ -825,6 +825,37 @@ rbg_inspect (VALUE object)
     return StringValueCStr(inspected);
 }
 
+VALUE
+rbg_to_array (VALUE object)
+{
+    return rb_convert_type(object, RUBY_T_ARRAY, "Array", "to_ary");
+}
+
+VALUE
+rbg_to_hash (VALUE object)
+{
+    return rb_convert_type(object, RUBY_T_HASH, "Hash", "to_hash");
+}
+
+VALUE
+rbg_check_array_type (VALUE object)
+{
+#ifdef HAVE_RB_CHECK_ARRAY_TYPE
+    return rb_check_array_type(object);
+#else
+    return rb_check_convert_type(object, RUBY_T_ARRAY, "Array", "to_ary");
+#endif
+}
+
+VALUE
+rbg_check_hash_type (VALUE object)
+{
+#ifdef HAVE_RB_CHECK_HASH_TYPE
+    return rb_check_hash_type(object);
+#else
+    return rb_check_convert_type(object, RUBY_T_HASH, "Hash", "to_hash");
+#endif
+}
 
 void
 rbg_scan_options (VALUE options, ...)
@@ -835,7 +866,7 @@ rbg_scan_options (VALUE options, ...)
     VALUE *value;
     va_list args;
 
-    options = rb_check_convert_type(options, T_HASH, "Hash", "to_hash");
+    options = rbg_check_hash_type(options);
     if (NIL_P(options)) {
         options = rb_hash_new();
     } else if (options == original_options) {

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 0
+#define RBGLIB_MICRO_VERSION 1
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)
@@ -63,6 +63,19 @@ typedef int GPid;
 #  define G_SOURCE_CONTINUE TRUE
 #endif
 
+/* For suppressing a warning:
+ *   warning: format '%p' expects argument of type 'void *', but argument 3 has type 'VALUE' [-Wformat]
+ *
+ * Ruby's printf format that is used in rb_raise() uses '%p" for
+ * argument.inspect instead of formatting pointer address that is used
+ * in printf(3).
+*/
+#ifdef __GNUC__
+#  define RBG_PRINTF_INSPECT_VALUE(rb_object) GUINT_TO_POINTER(rb_object)
+#else
+#  define RBG_PRINTF_INSPECT_VALUE(rb_object) (rb_object)
+#endif
+
 #define RBG_INSPECT(object) (rbg_rval_inspect(object))
 
 #define RVAL2CSTR(v) (rbg_rval2cstr(&(v)))
@@ -179,6 +192,10 @@ gdouble *rbg_rval2gdoubles(volatile VALUE *value, long *n);
 VALUE rbg_gints2rval(const gint *gints, long n);
 VALUE rbg_gints2rval_free(gint *gints, long n);
 
+extern VALUE rbg_to_array(VALUE object);
+extern VALUE rbg_to_hash(VALUE object);
+extern VALUE rbg_check_array_type(VALUE object);
+extern VALUE rbg_check_hash_type(VALUE object);
 extern void rbg_scan_options(VALUE options, ...);
 
 /* rbgerror.h */

data/ext/glib2/rbglib_iochannel.c

@@ -689,11 +689,7 @@ rg_puts(int argc, VALUE *argv, VALUE self)
             line = rb_str_new2("nil");
         }
         else {
-#ifdef HAVE_RB_CHECK_ARRAY_TYPE
-          line = rb_check_array_type(argv[i]);
-#else
-          line = rb_check_convert_type(argv[i], T_ARRAY, "Array", "to_ary");
-#endif
+          line = rbg_check_array_type(argv[i]);
           if (!NIL_P(line)) {
 #ifdef HAVE_RB_EXEC_RECURSIVE
             rb_exec_recursive(ioc_puts_ary, line, self);

data/ext/glib2/rbglib_utils.c

@@ -255,7 +255,7 @@ rg_s_parse_debug_string(G_GNUC_UNUSED VALUE self, VALUE string, VALUE keys)
     VALUE ary;
     GDebugKey* gkeys;
 
-    Check_Type(keys, T_HASH);
+    Check_Type(keys, RUBY_T_HASH);
     ary = rb_funcall(keys, rb_intern("to_a"), 0);
     nkeys = RARRAY_LEN(ary);
     gkeys = ALLOCA_N(GDebugKey, nkeys);

data/ext/glib2/rbgobj_boxed.c

@@ -225,6 +225,22 @@ rbgobj_boxed_not_copy_obj(GType gtype)
     cinfo->flags |= RBGOBJ_BOXED_NOT_COPY;
 }
 
+void
+rbgobj_boxed_unown(VALUE boxed)
+{
+    boxed_holder *holder;
+
+    Data_Get_Struct(boxed, boxed_holder, holder);
+
+    if (!holder->own) {
+        rb_raise(rb_eArgError,
+                 "The boxed is already unowned: %p",
+                 boxed);
+    }
+
+    holder->own = FALSE;
+}
+
 /**********************************************************************/
 
 static VALUE

data/ext/glib2/rbgobj_object.c

@@ -225,7 +225,7 @@ rg_s_new_bang(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "01", &params_hash);
 
     if (!NIL_P(params_hash))
-        Check_Type(params_hash, T_HASH);
+        Check_Type(params_hash, RUBY_T_HASH);
 
     if (cinfo->klass != self)
         rb_raise(rb_eTypeError, "%s isn't registered class",
@@ -635,7 +635,7 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "01", &params_hash);
 
     if (!NIL_P(params_hash))
-        Check_Type(params_hash, T_HASH);
+        Check_Type(params_hash, RUBY_T_HASH);
 
     gobj = rbgobj_gobject_new(RVAL2GTYPE(self), params_hash);
 

data/ext/glib2/rbgobj_type.c

@@ -40,8 +40,8 @@ static GHashTable* dynamic_gtype_list;
 typedef struct {
     const gchar* name;
     VALUE module;
-    void (*mark)(gpointer);
-    void (*free)(gpointer);
+    RGMarkFunc mark;
+    RGFreeFunc free;
     int flags; /* RGObjClassFlag */
 } RGObjClassInfoDynamic;
 
@@ -294,7 +294,8 @@ rbgobj_gtype_to_ruby_class(GType gtype)
 }
 
 VALUE
-rbgobj_define_class(GType gtype, const gchar *name, VALUE module, void *mark, void *free, VALUE parent)
+rbgobj_define_class(GType gtype, const gchar *name, VALUE module,
+                    RGMarkFunc mark, RGFreeFunc free, VALUE parent)
 {
     RGObjClassInfo* cinfo;
     if (gtype == 0)
@@ -307,8 +308,39 @@ rbgobj_define_class(GType gtype, const gchar *name, VALUE module, void *mark, vo
     return cinfo->klass;
 }
 
+void
+rbgobj_register_mark_func(GType gtype, RGMarkFunc mark)
+{
+    RGObjClassInfo *cinfo;
+
+    cinfo =
+        (RGObjClassInfo *)rbgobj_lookup_class_by_gtype_full(gtype, Qnil, FALSE);
+    if (!cinfo) {
+        rb_raise(rb_eArgError,
+                 "rbgobj_register_free_func(): no class is defined: <%s>",
+                 g_type_name(gtype));
+    }
+    cinfo->mark = mark;
+}
+
+void
+rbgobj_register_free_func(GType gtype, RGFreeFunc free)
+{
+    RGObjClassInfo *cinfo;
+
+    cinfo =
+        (RGObjClassInfo *)rbgobj_lookup_class_by_gtype_full(gtype, Qnil, FALSE);
+    if (!cinfo) {
+        rb_raise(rb_eArgError,
+                 "rbgobj_register_free_func(): no class is defined: <%s>",
+                 g_type_name(gtype));
+    }
+    cinfo->free = free;
+}
+
 VALUE
-rbgobj_define_class_dynamic(const gchar *gtype_name, const gchar *name, VALUE module, void *mark, void *free)
+rbgobj_define_class_dynamic(const gchar *gtype_name, const gchar *name,
+                            VALUE module, RGMarkFunc mark, RGFreeFunc free)
 {
     RGObjClassInfoDynamic* cinfo;
     cinfo = (RGObjClassInfoDynamic*)g_new(RGObjClassInfoDynamic, 1);

data/ext/glib2/rbgobject.c

@@ -182,7 +182,7 @@ rbgobj_add_relative(VALUE obj, VALUE relative)
     if (RVAL2CBOOL(rb_ivar_defined(obj, id_relatives)))
         hash = rb_ivar_get(obj, id_relatives);
 
-    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
         hash = rb_hash_new();
         rb_ivar_set(obj, id_relatives, hash);
     }
@@ -206,7 +206,7 @@ rbgobj_add_relative_removable(VALUE obj, VALUE relative, ID obj_ivar_id, VALUE h
     if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
         hash = rb_ivar_get(obj, obj_ivar_id);
 
-    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
         hash = rb_hash_new();
         rb_ivar_set(obj, obj_ivar_id, hash);
     }
@@ -221,7 +221,7 @@ rbgobj_get_relative_removable(VALUE obj, ID obj_ivar_id, VALUE hash_key)
     if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
         hash = rb_ivar_get(obj, obj_ivar_id);
 
-    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
         return Qnil;
     }
     return rb_hash_aref(hash, hash_key);
@@ -235,7 +235,7 @@ rbgobj_remove_relative(VALUE obj, ID obj_ivar_id, VALUE hash_key)
     if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
         hash = rb_ivar_get(obj, obj_ivar_id);
 
-    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
         /* should not happen. */
     } else {
         rb_funcall(hash, id_delete, 1, hash_key);

data/ext/glib2/rbgobject.h

@@ -124,12 +124,15 @@ typedef enum
     RBGOBJ_BOXED_NOT_COPY         = 1 << 1,
     RBGOBJ_DEFINED_BY_RUBY        = 1 << 2,
 } RGObjClassFlag;
-    
+
+typedef void (*RGMarkFunc)(gpointer object);
+typedef void (*RGFreeFunc)(gpointer object);
+
 typedef struct {
     VALUE klass;
     GType gtype;
-    void (*mark)(gpointer);
-    void (*free)(gpointer);
+    RGMarkFunc mark;
+    RGFreeFunc free;
     int flags; /* RGObjClassFlag */
 } RGObjClassInfo;
 
@@ -173,14 +176,16 @@ extern const RGObjClassInfo *rbgobj_lookup_class_by_gtype_full(GType gtype,
 							       gboolean create_object);
 extern VALUE rbgobj_gtype_to_ruby_class(GType gtype);
 extern VALUE rbgobj_define_class(GType gtype, const gchar* name, VALUE module,
-                                 void* mark, void* free, VALUE parent); 
+                                 RGMarkFunc mark, RGFreeFunc free, VALUE parent); 
 extern VALUE rbgobj_define_class_dynamic(const gchar* gtype_name, 
                                          const gchar* name, VALUE module, 
-                                         void* mark, void* free); 
+                                         RGMarkFunc mark, RGFreeFunc free); 
 extern void rbgobj_register_class(VALUE klass,
                                   GType gtype,
                                   gboolean klass2gtype,
                                   gboolean gtype2klass);
+extern void rbgobj_register_mark_func(GType gtype, RGMarkFunc mark);
+extern void rbgobj_register_free_func(GType gtype, RGFreeFunc free);
 extern VALUE rbgobj_cType;
 extern VALUE rbgobj_gtype_new(GType gtype);
 extern GType rbgobj_gtype_get(VALUE obj);
@@ -233,6 +238,7 @@ extern VALUE rbgobj_make_boxed_raw(gpointer p, GType gtype,
                                    VALUE klass, gint flags);
 extern VALUE rbgobj_make_boxed_default(gpointer data, GType gtype);
 extern void rbgobj_boxed_not_copy_obj(GType gtype);
+extern void rbgobj_boxed_unown(VALUE boxed);
 
 /* rbgobj_enums.c */
 extern void rbgobj_constant_remap(const char *original, const char *replacement);

data/ext/glib2/rbgutil.c

@@ -61,7 +61,7 @@ rbgutil_set_properties(VALUE self, VALUE hash)
     VALUE ary;
     GObject* obj;
 
-    Check_Type(hash, T_HASH);
+    Check_Type(hash, RUBY_T_HASH);
     ary = rb_funcall(hash, id_to_a, 0);
     obj = RVAL2GOBJ(self);
 

data/lib/gnome2/rake/package-task.rb

@@ -234,7 +234,7 @@ module GNOME2
 
           def append_version(dependency)
             name, *ver = dependency.is_a?(Array) ? dependency : [dependency]
-            ver << ">= #{@package.version}" if @package.ruby_gnome2_package?(name)
+            ver << "= #{@package.version}" if @package.ruby_gnome2_package?(name)
             [name, *ver]
           end
         end

data/vendor/local/bin/glib-gettextize

@@ -38,7 +38,7 @@ 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.36.0
+version=2.36.2
 try_ln_s=:
 
 # Directory where the sources are stored.

data/vendor/local/bin/glib-mkenums

@@ -129,7 +129,7 @@ sub parse_entries {
 }
 
 sub version {
-    print "glib-mkenums version glib-2.36.0\n";
+    print "glib-mkenums version glib-2.36.2\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";