glib2 1.2.0 → 1.2.1

data/ext/glib2/extconf.rb

@@ -44,6 +44,8 @@ have_func("ruby_set_current_source", ruby_header)
 have_func("rb_thread_blocking_region", ruby_header)
 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_var("curr_thread", [ruby_header, "node.h"])
 have_var("rb_curr_thread", [ruby_header, "node.h"])

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 0
+#define RBGLIB_MICRO_VERSION 1
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)
@@ -63,6 +63,10 @@ typedef int GPid;
 #  define G_SOURCE_CONTINUE TRUE
 #endif
 
+#ifndef HAVE_RB_STR_NEW_CSTR
+#  define rb_str_new_cstr(c_string) rb_str_new2(c_string)
+#endif
+
 #define RBG_INSPECT(object) (rbg_rval_inspect(object))
 
 #define RVAL2CSTR(v) (rbg_rval2cstr(&(v)))

data/ext/glib2/rbglib_iochannel.c

@@ -22,6 +22,10 @@
 #include "rbgprivate.h"
 
 static ID id_call;
+static ID id_puts;
+static ID id_unpack;
+
+static VALUE default_rs;
 
 #define RG_TARGET_NAMESPACE cIOChannel
 #define _SELF(s) ((GIOChannel*)RVAL2BOXED(s, G_TYPE_IO_CHANNEL))
@@ -415,8 +419,6 @@ rg_write(VALUE self, VALUE buf)
     return UINT2NUM(bytes_written);
 }
 
-static ID id_unpack;
-
 static VALUE
 rg_putc(VALUE self, VALUE thechar)
 {
@@ -666,7 +668,7 @@ ioc_puts_ary(VALUE ary, VALUE out, int recur)
         if (recur) {
             tmp = rb_str_new2("[...]");
         }
-        rb_io_puts(1, &tmp, out);
+        rb_funcall(out, id_puts, 1, tmp);
     }
     return Qnil;
 }
@@ -679,7 +681,7 @@ rg_puts(int argc, VALUE *argv, VALUE self)
 
     /* if no argument given, print newline. */
     if (argc == 0) {
-        rg_write(self, rb_default_rs);
+        rg_write(self, default_rs);
         return Qnil;
     }
     for (i=0; i<argc; i++) {
@@ -705,7 +707,7 @@ rg_puts(int argc, VALUE *argv, VALUE self)
         rg_write(self, line);
         if (RSTRING_LEN(line) == 0 ||
             RSTRING_PTR(line)[RSTRING_LEN(line)-1] != '\n') {
-            rg_write(self, rb_default_rs);
+            rg_write(self, default_rs);
         }
     }
 
@@ -755,8 +757,16 @@ Init_glib_io_channel(void)
     rb_include_module(RG_TARGET_NAMESPACE, rb_mEnumerable);
 
     id_call = rb_intern("call");
+    id_puts = rb_intern("puts");
     id_unpack = rb_intern("unpack");
 
+    default_rs = rb_str_new_cstr("\n");
+#ifdef HAVE_RB_GC_REGISTER_MARK_OBJECT
+    rb_gc_register_mark_object(default_rs);
+#else
+    rb_global_variable(&default_rs);
+#endif
+
     RG_DEF_METHOD(initialize, -1);
     RG_DEF_SMETHOD(open, -1);
     RG_DEF_METHOD(fileno, 0);

data/ext/glib2/rbgobj_type.c

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2002-2009  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -27,10 +26,6 @@
 /**********************************************************************/
 /* Type Mapping */
 
-#ifdef RBGOBJ_USE_DLPTR
-#include "dl.h"
-#endif
-
 static VALUE rb_cMutex;
 static VALUE lookup_class_mutex;
 
@@ -104,11 +99,7 @@ get_superclass(GType gtype)
       case G_TYPE_BOXED:
         return rb_cObject;
       case G_TYPE_POINTER:
-#ifdef RBGOBJ_USE_DLPTR
-        return rb_cDLPtrData;
-#else
         return rb_cData;
-#endif
       case G_TYPE_ENUM:
       case G_TYPE_FLAGS:
         return rb_cObject;
@@ -434,8 +425,7 @@ rg_initialize(VALUE self, VALUE type)
     GType gtype;
 
     if (RVAL2CBOOL(rb_obj_is_kind_of(type, rb_cInteger))) {
-        gtype = NUM2UINT(type);
-        // XXX
+        gtype = NUM2ULONG(type);
         if (!g_type_name(gtype))
             gtype = G_TYPE_INVALID;
     } else {
@@ -445,7 +435,7 @@ rg_initialize(VALUE self, VALUE type)
     if (G_TYPE_INVALID == gtype)
         rb_raise(rb_eArgError, "invalid type");
 
-    rb_ivar_set(self, id_gtype, UINT2NUM(gtype));
+    rb_ivar_set(self, id_gtype, ULONG2NUM(gtype));
 
     return Qnil;
 }
@@ -734,7 +724,10 @@ _def_fundamental_type(VALUE ary, GType gtype, const char* name)
 void
 Init_gobject_gtype(void)
 {
+#if !GLIB_CHECK_VERSION(2, 35, 1)
     g_type_init();
+#endif
+
     init_typemap();
 
     /* type */

data/ext/glib2/rbgobj_valuetypes.c

@@ -21,27 +21,17 @@
 
 #include "rbgprivate.h"
 #include "rbgobject.h"
-#ifdef RBGOBJ_USE_DLPTR
-#include "dl.h"
-#endif
 
 
 VALUE
 rbgobj_ptr_new(GType type, gpointer ptr)
 {
-#ifdef RBGOBJ_USE_DLPTR
-    return rb_dlptr_new2(GTYPE2CLASS(type), 0, NULL);
-#else
     return Data_Wrap_Struct(GTYPE2CLASS(type), NULL, NULL, ptr);
-#endif
 }
 
 gpointer
 rbgobj_ptr2cptr(VALUE ptr)
 {
-#ifdef RBGOBJ_USE_DLPTR
-    return rb_dlptr2cptr(ptr);
-#else
     gpointer dest;
     if (rb_obj_is_kind_of(ptr, GTYPE2CLASS(G_TYPE_POINTER))){
         Data_Get_Struct(ptr, void, dest);
@@ -51,7 +41,6 @@ rbgobj_ptr2cptr(VALUE ptr)
         rb_raise(rb_eTypeError, "not a pointer object");
     }
     return dest;
-#endif
 }
 
 static VALUE
@@ -66,59 +55,12 @@ ptr_gtype(VALUE self)
     return ptr_s_gtype(CLASS_OF(self));
 }
 
-#ifndef RBGOBJ_USE_DLPTR
-static VALUE
-ptr_inspect(VALUE self)
-{
-    gpointer ptr;
-    gchar* s;
-    VALUE result;
-
-    Data_Get_Struct(self, void, ptr);
-
-    s = g_strdup_printf("#<%s:%p ptr=%p>",
-                        rb_class2name(CLASS_OF(self)),
-                        (void *)self,
-                        ptr);
-
-    result = rb_str_new2(s);
-    g_free(s);
-
-    return result;
-}
-
-static VALUE
-ptr_eql(VALUE self, VALUE other)
-{
-    gpointer ptr1, ptr2;
-    if (!rb_obj_is_kind_of(other, GTYPE2CLASS(G_TYPE_POINTER)))
-        return Qnil;
-    Data_Get_Struct(self, void, ptr1);
-    Data_Get_Struct(other, void, ptr2);
-    return CBOOL2RVAL(ptr1 == ptr2);
-}
-
-static VALUE
-ptr_hash(VALUE self)
-{
-    gpointer ptr;
-    Data_Get_Struct(self, void, ptr);
-    return INT2FIX((long)ptr);
-}
-#endif
-
 static void
 Init_gtype_pointer(void)
 {
     VALUE cPtr = G_DEF_CLASS(G_TYPE_POINTER, "Pointer", mGLib);
     rbg_define_singleton_method(cPtr, "gtype", ptr_s_gtype, 1);
     rbg_define_method(cPtr, "gtype", ptr_gtype, 1);
-#ifndef RBGOBJ_USE_DLPTR
-    rbg_define_method(cPtr, "inspect", ptr_inspect, 0);
-    rbg_define_method(cPtr, "==", ptr_eql, 1);
-    rbg_define_method(cPtr, "eql?", ptr_eql, 1);
-    rbg_define_method(cPtr, "hash", ptr_hash, 0);
-#endif
 }
 
 /**********************************************************************/

data/lib/gnome2-raketask.rb

@@ -92,7 +92,9 @@ class GNOME2Package
       s.email                 = @email
       s.homepage              = @homepage
       s.version               = version
-      s.extensions            = FileList["ext/#{@name}/extconf.rb"]
+      extensions              = FileList["ext/#{@name}/extconf.rb"]
+      extensions.existing!
+      s.extensions            = extensions
       s.require_paths         = ["lib"]
       files                   = FileList["ChangeLog", "README",
                                          "Rakefile", "extconf.rb",

data/lib/mkmf-gnome2.rb

@@ -489,7 +489,9 @@ def install_missing_native_package(native_package_info)
     succeeded = xsystem(install_command)
   else
     if sudo
-      install_command = "#{sudo} #{install_command}"
+      prompt = "[sudo] password for %u to install <#{package}>: "
+      sudo_options = "-p #{Shellwords.escape(prompt)}"
+      install_command = "#{sudo} #{sudo_options} #{install_command}"
       succeeded = xsystem(install_command)
     else
       succeeded = false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: glib2
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Project Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-24 00:00:00 Z
+date: 2013-01-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: pkg-config