glib2 1.1.9-x86-mingw32 → 1.2.0-x86-mingw32

data/ext/glib2/rbgobj_value.c

@@ -22,6 +22,8 @@
 #include "rbgprivate.h"
 
 /**********************************************************************/
+#define RG_TARGET_NAMESPACE rbgobj_cValue
+#define _SELF(self) RVAL2GVALUE(self)
 
 static ID id_to_s;
 static GQuark qRValueToGValueFunc;
@@ -332,10 +334,50 @@ rbgobj_gc_mark_gvalue(GValue* value)
 
 /**********************************************************************/
 
+static VALUE
+rg_initialize(VALUE self, VALUE rb_gtype, VALUE rb_value)
+{
+    GValue value = G_VALUE_INIT;
+
+    g_value_init(&value, NUM2INT(rb_to_int(rb_gtype)));
+    rbgobj_rvalue_to_gvalue(rb_value, &value);
+    G_INITIALIZE(self, &value);
+    g_value_unset(&value);
+
+    return Qnil;
+}
+
+static VALUE
+rg_type(VALUE self)
+{
+    GValue *value;
+
+    value = _SELF(self);
+
+    return rbgobj_gtype_new(value->g_type);
+}
+
+static VALUE
+rg_value(VALUE self)
+{
+    GValue *value;
+
+    value = _SELF(self);
+
+    return GVAL2RVAL(value);
+}
+
 void
 Init_gobject_gvalue(void)
 {
+    VALUE RG_TARGET_NAMESPACE;
+
     id_to_s = rb_intern("to_s");
     qRValueToGValueFunc = g_quark_from_static_string("__ruby_r2g_func__");
     qGValueToRValueFunc = g_quark_from_static_string("__ruby_g2r_func__");
+
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_VALUE, "Value", mGLib);
+    RG_DEF_METHOD(initialize, 2);
+    RG_DEF_METHOD(type, 0);
+    RG_DEF_METHOD(value, 0);
 }

data/ext/glib2/rbgobject.c

@@ -77,9 +77,10 @@ gpointer
 rbgobj_instance_from_ruby_object(VALUE obj)
 {
     GType type;
+    GType fundamental_type;
 
     if (NIL_P(obj))
-    	return NULL;
+        return NULL;
 
     type = RVAL2GTYPE(obj);
     if (rbgobj_convert_has_type(type)) {
@@ -88,16 +89,18 @@ rbgobj_instance_from_ruby_object(VALUE obj)
             return instance;
     }
 
-    type = G_TYPE_FUNDAMENTAL(type);
-    switch (type){
+    fundamental_type = G_TYPE_FUNDAMENTAL(type);
+    switch (fundamental_type) {
     case G_TYPE_OBJECT:
         return rbgobj_get_gobject(obj);
+    case G_TYPE_BOXED:
+        return rbgobj_boxed_get(obj, type);
     case G_TYPE_PARAM:
         return rbgobj_get_param_spec(obj);
     default:
       {
         gpointer instance;
-        if (!rbgobj_convert_robj2instance(type, obj, &instance)) {
+        if (!rbgobj_convert_robj2instance(fundamental_type, obj, &instance)) {
             rb_raise(rb_eTypeError, "%s isn't supported",
                      rb_class2name(CLASS_OF(obj)));
         }

data/ext/glib2/rbgobject.h

@@ -227,7 +227,11 @@ extern void rbgobj_register_property_getter(GType gtype, const char* prop_name,
 /* rbgobj_boxed.c */
 extern VALUE rbgobj_boxed_create(VALUE klass); /* deprecated */
 extern gpointer rbgobj_boxed_get(VALUE obj, GType gtype);
+extern gpointer rbgobj_boxed_get_default(VALUE obj, GType gtype);
 extern VALUE rbgobj_make_boxed(gpointer data, GType gtype);
+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);
 
 /* rbgobj_enums.c */
@@ -267,17 +271,19 @@ extern GType g_poll_fd_get_type(void);
 typedef struct {
     GType type;
     VALUE klass;
-    VALUE (*get_superclass)(void);
-    void (*type_init_hook)(VALUE);
-    void (*rvalue2gvalue)(VALUE val, GValue *result);
-    VALUE (*gvalue2rvalue)(const GValue *);
-    void (*initialize)(VALUE, gpointer);
-    gpointer (*robj2instance)(VALUE);
-    VALUE (*instance2robj)(gpointer);
-    void (*unref)(gpointer instance);
+    gpointer user_data;
+    GDestroyNotify notify;
+    VALUE (*get_superclass)(gpointer user_data);
+    void (*type_init_hook)(VALUE klass, gpointer user_data);
+    void (*rvalue2gvalue)(VALUE value, GValue *result, gpointer user_data);
+    VALUE (*gvalue2rvalue)(const GValue *value, gpointer user_data);
+    void (*initialize)(VALUE rb_instance, gpointer insntance, gpointer user_data);
+    gpointer (*robj2instance)(VALUE rb_instance, gpointer user_data);
+    VALUE (*instance2robj)(gpointer instance, gpointer user_data);
+    void (*unref)(gpointer instance, gpointer user_data);
 } RGConvertTable;
 
-extern void rbgobj_convert_define(RGConvertTable *table);
+extern void rbgobj_convert_define(const RGConvertTable *table);
 
 #ifdef __cplusplus
 }

data/lib/gnome2-raketask.rb

@@ -112,8 +112,13 @@ class GNOME2Package
     define_win32_build_task
   end
 
+  def so_base_name
+    @name.gsub(/-/, "_")
+  end
+
   def define_win32_extension_task
-    Rake::ExtensionTask.new(@name, @spec) do |ext|
+    Rake::ExtensionTask.new(so_base_name, @spec) do |ext|
+      ext.ext_dir = "ext/#{@name}"
       ext.cross_compile = true
       ext.cross_compiling do |spec|
         if /mingw|mswin/ =~ spec.platform.to_s

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

@@ -64,18 +64,27 @@ class GNOME2Win32BinaryBuildTask
 
   def define_build_tasks
     namespace :build do
-      task :prepare do
-        depended_packages = @configuration.build_dependencies
-        use_packages = [@configuration.package.name] + depended_packages
-        pkg_config_path = use_packages.collect do |package|
-          "../#{package}/#{@configuration.relative_binary_dir}/lib/pkgconfig"
+      prepare_task_names = []
+      namespace :prepare do
+        prepare_task_names << "pkg_config"
+        task :pkg_config do
+          depended_packages = @configuration.build_dependencies
+          use_packages = [@configuration.package.name] + depended_packages
+          pkg_config_path = use_packages.collect do |package|
+            "../#{package}/#{@configuration.relative_binary_dir}/lib/pkgconfig"
+          end
+          ENV["PKG_CONFIG_PATH"] = pkg_config_path.collect do |path|
+            File.expand_path(path)
+          end.join(":")
+          ENV["PKG_CONFIG_LIBDIR"] = rcairo_win32_pkgconfig_path
         end
-        ENV["PKG_CONFIG_PATH"] = pkg_config_path.collect do |path|
-          File.expand_path(path)
-        end.join(":")
-        ENV["PKG_CONFIG_LIBDIR"] = rcairo_win32_pkgconfig_path
       end
 
+      full_prepare_task_names = prepare_task_names.collect do |name|
+        "win32:builder:build:prepare:#{name}"
+      end
+      task :prepare => full_prepare_task_names
+
       build_packages.each do |package|
         download_task = "win32:builder:download:#{package[:name]}"
         desc "Build #{package[:label]} and install it into #{dist_dir}."
@@ -95,8 +104,11 @@ class GNOME2Win32BinaryBuildTask
             (package[:patches] || []).each do |patch|
               sh("patch -p1 < #{patches_dir}/#{patch}")
             end
+            (package[:remove_paths] || []).each do |path|
+              rm_rf(path)
+            end
             sh("./autogen.sh") if package[:need_autogen]
-            sh("autoreconf -i") if package[:need_autoreconf]
+            sh("autoreconf --install") if package[:need_autoreconf]
             sh("./configure",
                "CPPFLAGS=#{cppflags(package)}",
                "LDFLAGS=#{ldflags(package)}",
@@ -163,6 +175,18 @@ class GNOME2Win32BinaryBuildTask
     package_root_dir + "patches"
   end
 
+  def glib2_dir
+    package_root_dir.parent + "glib2"
+  end
+
+  def glib2_include_path
+    "#{glib2_dir}/vendor/local/include"
+  end
+
+  def glib2_lib_path
+    "#{glib2_dir}/vendor/local/lib"
+  end
+
   def rcairo_win32_dir
     package_root_dir.parent.parent + "rcairo.win32"
   end
@@ -194,6 +218,9 @@ class GNOME2Win32BinaryBuildTask
 
   def cppflags(package)
     include_paths = package[:include_paths] || []
+    if @configuration.build_dependencies.include?("glib2")
+      include_paths += [glib2_include_path]
+    end
     include_paths += [
       rcairo_win32_include_path,
       dist_dir + 'include',
@@ -206,6 +233,9 @@ class GNOME2Win32BinaryBuildTask
 
   def ldflags(package)
     library_paths = package[:library_paths] || []
+    if @configuration.build_dependencies.include?("glib2")
+      library_paths += [glib2_lib_path]
+    end
     library_paths += [
       rcairo_win32_lib_path,
       dist_dir + 'lib',

data/vendor/local/bin/gdbus-codegen

@@ -33,7 +33,7 @@ elif os.name == 'nt':
     # Makes gdbus-codegen 'relocatable' at runtime on Windows.
     path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gdbus-2.0')
 else:
-    path = os.path.join('/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/share', 'glib-2.0')
+    path = os.path.join('/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib', 'gdbus-2.0')
 
 sys.path.insert(0, os.path.abspath(path))
 from codegen import codegen_main

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.35.3
+version=2.34.3
 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.35.3\n";
+    print "glib-mkenums version glib-2.34.3\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/bin/libgnutls-openssl-28.def

@@ -209,96 +209,90 @@ EXPORTS
     getpass @208
     getsubopt @209
     gettime @210
-    gl_signbitd @211
-    gl_signbitf @212
-    gl_signbitl @213
-    gl_sockets_cleanup @214
-    gl_sockets_startup @215
-    gmtime_r @216
-    gnutls_x509_extract_certificate_dn @217
-    gnutls_x509_extract_certificate_issuer_dn @218
-    hash_pjw_bare @219
-    inet_ntop @220
-    inet_pton @221
-    isbase64 @222
-    last_component @223
-    localtime_r @224
-    mdir_name @225
-    memmem @226
-    printf_fetchargs @227
-    printf_frexp @228
-    printf_frexpl @229
-    printf_parse @230
-    program_invocation_name @231 DATA
-    program_invocation_short_name @232 DATA
-    program_name @233 DATA
-    rawmemchr @234
-    register_fd_hook @235
-    rpl_accept @236
-    rpl_bind @237
-    rpl_close @238
-    rpl_connect @239
-    rpl_dup2 @240
-    rpl_frexp @241
-    rpl_frexpl @242
-    rpl_fstat @243
-    rpl_gai_strerror @244
-    rpl_getline @245
-    rpl_getopt @246
-    rpl_getopt_internal @247
-    rpl_getopt_long @248
-    rpl_getopt_long_only @249
-    rpl_getpeername @250
-    rpl_gettimeofday @251
-    rpl_gmtime @252
-    rpl_isnanl @253
-    rpl_listen @254
-    rpl_localtime @255
-    rpl_lseek @256
-    rpl_malloc @257
-    rpl_memchr @258
-    rpl_optarg @259 DATA
-    rpl_opterr @260 DATA
-    rpl_optind @261 DATA
-    rpl_optopt @262 DATA
-    rpl_realloc @263
-    rpl_recv @264
-    rpl_recvfrom @265
-    rpl_select @266
-    rpl_send @267
-    rpl_sendto @268
-    rpl_setsockopt @269
-    rpl_shutdown @270
-    rpl_snprintf @271
-    rpl_socket @272
-    rpl_strdup @273
-    rpl_strerror @274
-    rpl_vfprintf @275
-    rpl_vprintf @276
-    rpl_vsnprintf @277
-    scandir @278
-    set_program_name @279
-    sleep @280
-    strchrnul @281
-    strerror_override @282
-    strip_trailing_slashes @283
-    strndup @284
-    strtok_r @285
-    strverscmp @286
-    timespec_cmp @287
-    timespec_sign @288
-    timespectod @289
-    u8_mbtoucr @290
-    u8_uctomb_aux @291
-    unregister_fd_hook @292
-    vasnprintf @293
-    vasprintf @294
-    version_etc @295
-    version_etc_ar @296
-    version_etc_arn @297
-    version_etc_copyright @298 DATA
-    version_etc_va @299
-    xmax @300
-    xsum @301
-    xsum3 @302
-    xsum4 @303
+    gl_sockets_cleanup @211
+    gl_sockets_startup @212
+    gmtime_r @213
+    gnutls_x509_extract_certificate_dn @214
+    gnutls_x509_extract_certificate_issuer_dn @215
+    hash_pjw_bare @216
+    inet_ntop @217
+    inet_pton @218
+    isbase64 @219
+    last_component @220
+    localtime_r @221
+    mdir_name @222
+    memmem @223
+    printf_fetchargs @224
+    printf_frexp @225
+    printf_frexpl @226
+    printf_parse @227
+    program_invocation_name @228 DATA
+    program_invocation_short_name @229 DATA
+    program_name @230 DATA
+    rawmemchr @231
+    register_fd_hook @232
+    rpl_accept @233
+    rpl_bind @234
+    rpl_close @235
+    rpl_connect @236
+    rpl_dup2 @237
+    rpl_frexpl @238
+    rpl_fstat @239
+    rpl_ftell @240
+    rpl_ftello @241
+    rpl_gai_strerror @242
+    rpl_getline @243
+    rpl_getopt @244
+    rpl_getopt_internal @245
+    rpl_getopt_long @246
+    rpl_getopt_long_only @247
+    rpl_getpeername @248
+    rpl_isnanl @249
+    rpl_listen @250
+    rpl_lseek @251
+    rpl_malloc @252
+    rpl_optarg @253 DATA
+    rpl_opterr @254 DATA
+    rpl_optind @255 DATA
+    rpl_optopt @256 DATA
+    rpl_realloc @257
+    rpl_recv @258
+    rpl_recvfrom @259
+    rpl_select @260
+    rpl_send @261
+    rpl_sendto @262
+    rpl_setsockopt @263
+    rpl_shutdown @264
+    rpl_snprintf @265
+    rpl_socket @266
+    rpl_strdup @267
+    rpl_strerror @268
+    rpl_vfprintf @269
+    rpl_vprintf @270
+    rpl_vsnprintf @271
+    scandir @272
+    set_program_name @273
+    sleep @274
+    strchrnul @275
+    strerror_override @276
+    strip_trailing_slashes @277
+    strndup @278
+    strtok_r @279
+    strverscmp @280
+    timespec_cmp @281
+    timespec_sign @282
+    timespectod @283
+    u8_mbtoucr @284
+    u8_uctomb_aux @285
+    unregister_fd_hook @286
+    vasnprintf @287
+    vasprintf @288
+    version_etc @289
+    version_etc_ar @290
+    version_etc_arn @291
+    version_etc_copyright @292 DATA
+    version_etc_va @293
+    xmax @294
+    xsum @295
+    xsum3 @296
+    xsum4 @297