glib2 2.0.2 → 2.0.3

data/ext/glib2/rbgobject.h

@@ -143,6 +143,7 @@ extern gpointer rbgobj_instance_from_ruby_object(VALUE obj);
 extern VALUE rbgobj_ruby_object_from_instance(gpointer instance);
 extern VALUE rbgobj_ruby_object_from_instance2(gpointer instance, gboolean alloc);
 extern VALUE rbgobj_ruby_object_from_instance_with_unref(gpointer instance);
+extern void rbgobj_instance_unref(gpointer instance);
 
 extern void rbgobj_add_relative(VALUE obj, VALUE relative);
 extern void rbgobj_invalidate_relatives(VALUE obj);

data/ext/glib2/rbgprivate.h

@@ -33,6 +33,10 @@
 #  define rb_str_new_cstr(c_string) rb_str_new2(c_string)
 #endif
 
+#ifndef HAVE_RB_EXC_NEW_STR
+#  define rb_exc_new_str(klass, message) rb_exc_new3(klass, message)
+#endif
+
 #ifndef G_VALUE_INIT
 #  define G_VALUE_INIT { 0, { { 0 } } }
 #endif
@@ -119,6 +123,7 @@ G_GNUC_INTERNAL char *rg_obj_constant_lookup(const char *name);
 
 G_GNUC_INTERNAL void Init_gutil(void);
 G_GNUC_INTERNAL void Init_gutil_callback(void);
+G_GNUC_INTERNAL void Init_glib_gettext(void);
 G_GNUC_INTERNAL void Init_glib_int64(void);
 G_GNUC_INTERNAL void Init_glib_error(void);
 G_GNUC_INTERNAL void Init_glib_threads(void);
@@ -157,9 +162,7 @@ G_GNUC_INTERNAL void Init_gobject_typeinstance(void);
 G_GNUC_INTERNAL void Init_gobject_gvalue(void);
 G_GNUC_INTERNAL void Init_gobject_gvaluetypes(void);
 G_GNUC_INTERNAL void Init_gobject_gboxed(void);
-#if GLIB_CHECK_VERSION(2,6,0)
 G_GNUC_INTERNAL void Init_gobject_gstrv(void);
-#endif
 G_GNUC_INTERNAL void Init_gobject_value_array(void);
 G_GNUC_INTERNAL void Init_gobject_genumflags(void);
 G_GNUC_INTERNAL void Init_gobject_genums(void);

data/lib/glib2.rb

@@ -93,6 +93,10 @@ end
 
 base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
 vendor_dir = base_dir + "vendor" + "local"
+if vendor_dir.exist?
+  require "cairo"
+end
+
 GLib.prepend_dll_path(vendor_dir + "bin")
 begin
   major, minor, _ = RUBY_VERSION.split(/\./)

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

@@ -19,6 +19,8 @@
 module GNOME2
   module Rake
     class ExternalPackage < Struct.new(:name,
+                                       :base_name,
+                                       :archive_base_name,
                                        :label,
                                        :version,
                                        :download_site,
@@ -43,11 +45,11 @@ module GNOME2
       end
 
       def base_name
-        "#{name}-#{version}"
+        super || "#{name}-#{version}"
       end
 
       def archive_base_name
-        "#{base_name}.tar.#{compression_method}"
+        super || "#{base_name}.tar.#{compression_method}"
       end
 
       def archive_url
@@ -95,7 +97,7 @@ module GNOME2
         case download_site
         when :gnome
           base_url = "http://ftp.gnome.org/pub/gnome/sources"
-          release_series = version.gsub(/\A(\d+\.\d+).+\z/, '\1')
+          release_series = version.gsub(/\A(\d+\.\d+)(?:[^\d].*)?\z/, '\1')
           base_url << "/#{name}/#{release_series}"
         else
           base_url = nil
@@ -107,7 +109,9 @@ module GNOME2
                                               :include_paths,
                                               :library_paths,
                                               :configure_args,
+                                              :cc_args,
                                               :patches,
+                                              :built_file,
                                               :need_autogen,
                                               :need_autoreconf,
                                               :build_concurrently,
@@ -135,10 +139,18 @@ module GNOME2
           super || []
         end
 
+        def cc_args
+          super || []
+        end
+
         def patches
           super || []
         end
 
+        def built_file
+          super || nil
+        end
+
         def need_autogen?
           need_autogen.nil? ? false : need_autogen
         end
@@ -159,6 +171,7 @@ module GNOME2
       class NativeConfiguration < Struct.new(:build,
                                              :configure_args,
                                              :patches,
+                                             :built_file,
                                              :need_autogen,
                                              :need_autoreconf,
                                              :build_concurrently)
@@ -181,6 +194,10 @@ module GNOME2
           super || []
         end
 
+        def built_file
+          super || nil
+        end
+
         def need_autogen?
           need_autogen.nil? ? false : need_autogen
         end

data/lib/gnome2/rake/native-binary-build-task.rb

@@ -52,41 +52,58 @@ module GNOME2
       def define_build_tasks
         namespace :build do
           build_packages.each do |package|
-            download_task = "source:downloader:download:#{package.name}"
-            desc "Build #{package.label} and install it into #{dist_dir}."
-            task package.name => [download_task] do
-              package_tmp_dir = @package.tmp_dir + package.name
-              rm_rf(package_tmp_dir)
-              mkdir_p(package_tmp_dir)
-
-              tar_full_path = @package.download_dir + package.archive_base_name
-              Dir.chdir(package_tmp_dir.to_s) do
-                sh("tar", "xf", tar_full_path.to_s) or exit(false)
-              end
-
-              Dir.chdir((package_tmp_dir + package.base_name).to_s) do
-                package.native.patches.each do |patch|
-                  sh("patch -p1 < #{@package.patches_dir}/#{patch}")
+            namespace package.name do
+              download_task = "source:downloader:download:#{package.name}"
+              built_file = package.native.built_file
+              if built_file
+                built_file = dist_dir + built_file
+                file built_file.to_s do
+                  ::Rake::Task[download_task].invoke
+                  build_package_task_body(package)
                 end
-                sh("./autogen.sh") if package.native.need_autogen?
-                sh("autoreconf --install") if package.native.need_autoreconf?
-                sh("./configure",
-                   "PKG_CONFIG_PATH=#{pkg_config_path}",
-                   "--prefix=#{dist_dir}",
-                   *package.native.configure_args) or exit(false)
-                common_make_args = []
-                common_make_args << "GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
-                build_make_args = common_make_args.dup
-                install_make_args = common_make_args.dup
-                if package.native.build_concurrently?
-                  make_n_jobs = ENV["MAKE_N_JOBS"]
-                  build_make_args << "-j#{make_n_jobs}" if make_n_jobs
+                task :build => built_file.to_s
+              else
+                task :build => [download_task] do
+                  build_patckage_task_body(package)
                 end
-                sh("nice", "make", *build_make_args) or exit(false)
-                sh("make", "install", *install_make_args) or exit(false)
               end
             end
+            desc "Build #{package.label} and install it into #{dist_dir}."
+            task package.name => "native:builder:build:#{package.name}:build"
+          end
+        end
+      end
+
+      def build_package_task_body(package)
+        package_tmp_dir = @package.tmp_dir + package.name
+        rm_rf(package_tmp_dir)
+        mkdir_p(package_tmp_dir)
+
+        tar_full_path = @package.download_dir + package.archive_base_name
+        Dir.chdir(package_tmp_dir.to_s) do
+          sh("tar", "xf", tar_full_path.to_s) or exit(false)
+        end
+
+        Dir.chdir((package_tmp_dir + package.base_name).to_s) do
+          package.native.patches.each do |patch|
+            sh("patch -p1 < #{@package.patches_dir}/#{patch}")
+          end
+          sh("./autogen.sh") if package.native.need_autogen?
+          sh("autoreconf --install") if package.native.need_autoreconf?
+          sh("./configure",
+             "PKG_CONFIG_PATH=#{pkg_config_path}",
+             "--prefix=#{dist_dir}",
+             *package.native.configure_args) or exit(false)
+          common_make_args = []
+          common_make_args << "GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
+          build_make_args = common_make_args.dup
+          install_make_args = common_make_args.dup
+          if package.native.build_concurrently?
+            make_n_jobs = ENV["MAKE_N_JOBS"]
+            build_make_args << "-j#{make_n_jobs}" if make_n_jobs
           end
+          sh("nice", "make", *build_make_args) or exit(false)
+          sh("make", "install", *install_make_args) or exit(false)
         end
       end
 

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

@@ -131,7 +131,7 @@ module GNOME2
                                              "{ext,sample,test,test-unit}/**/*"]
           files.existing!
           s.files                 = files
-          s.required_ruby_version = @required_ruby_version || ">= 1.8.5"
+          s.required_ruby_version = @required_ruby_version || ">= 1.9.3"
           s.post_install_message  = @post_install_message
           @dependency_configuration.apply(s)
         end
@@ -180,6 +180,16 @@ module GNOME2
                 end
               end
               spec.files += win32_files
+              stage_path = "#{ext.tmp_dir}/#{ext.cross_platform}/stage"
+              win32_files.each do |win32_file|
+                next unless File.file?(win32_file)
+                stage_win32_file = "#{stage_path}/#{win32_file}"
+                stage_win32_binary_dir = File.dirname(stage_win32_file)
+                directory stage_win32_binary_dir
+                file stage_win32_file => [stage_win32_binary_dir, win32_file] do
+                  cp win32_file, stage_win32_file
+                end
+              end
             end
             @cross_compiling_hooks.each do |hook|
               hook.call(spec)

data/lib/gnome2/rake/source-download-task.rb

@@ -60,7 +60,8 @@ module GNOME2
             task :before
             task :after
             desc "Download #{package.label} into #{download_dir}."
-            task package[:name] => [:before, tar_full_path.to_s, :after]
+            # task package[:name] => [:before, tar_full_path.to_s, :after]
+            task package[:name] => tar_full_path.to_s
 
             directory_path = tar_full_path.dirname
             directory directory_path.to_s

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

@@ -48,6 +48,11 @@ class GNOME2Win32BinaryBuildTask
           end.join(":")
           ENV["PKG_CONFIG_LIBDIR"] = rcairo_win32_pkgconfig_path
         end
+
+        prepare_task_names << "pkg_config_for_build"
+        task :pkg_config_for_build do
+          ENV["PKG_CONFIG_FOR_BUILD"] = "env - pkg-config"
+        end
       end
 
       full_prepare_task_names = prepare_task_names.collect do |name|
@@ -59,8 +64,19 @@ class GNOME2Win32BinaryBuildTask
         namespace package.name do
           task :before
           download_task = "source:downloader:download:#{package.name}"
-          task :build => [:prepare, download_task] do
-            build_package_task_body(package)
+          built_file = package.windows.built_file
+          if built_file
+            built_file = dist_dir + built_file
+            file built_file.to_s do
+              Rake::Task["win32:builder:build:prepare"].invoke
+              Rake::Task[download_task].invoke
+              build_package_task_body(package)
+            end
+            task :build => built_file.to_s
+          else
+            task :build => [:prepare, download_task] do
+              build_package_task_body(package)
+            end
           end
           task :after
         end
@@ -92,7 +108,7 @@ class GNOME2Win32BinaryBuildTask
       end
       sh("./autogen.sh") if package.windows.need_autogen?
       sh("autoreconf --install") if package.windows.need_autoreconf?
-      cc_env = "CC=#{@package.windows.build_host}-gcc"
+      cc_env = "CC=#{cc(package)}"
       sh("./configure",
          cc_env,
          "CPPFLAGS=#{cppflags(package)}",
@@ -101,6 +117,7 @@ class GNOME2Win32BinaryBuildTask
          "--host=#{@package.windows.build_host}",
          *package.windows.configure_args) or exit(false)
       common_make_args = []
+      common_make_args << "MAKE=make"
       common_make_args << "GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
       if package.windows.use_cc_environment_variable?
         common_make_args << cc_env
@@ -175,6 +192,14 @@ class GNOME2Win32BinaryBuildTask
     "#{rcairo_win32_dir}/vendor/local/lib"
   end
 
+  def cc(package)
+    cc_command_line = [
+      "#{@package.windows.build_host}-gcc",
+      *package.windows.cc_args,
+    ]
+    cc_command_line.compact.join(" ")
+  end
+
   def cppflags(package)
     include_paths = package.windows.include_paths
     if @package.windows.build_dependencies.include?("glib2")

data/lib/mkmf-gnome2.rb

@@ -3,7 +3,7 @@
 #
 # Extended mkmf for Ruby-GNOME2 and Ruby/GLib based libraries.
 #
-# Copyright(C) 2003-2011 Ruby-GNOME2 Project.
+# Copyright(C) 2003-2013 Ruby-GNOME2 Project.
 #
 # This program is licenced under the same
 # license of Ruby-GNOME2.
@@ -11,13 +11,7 @@
 
 require 'English'
 require 'mkmf'
-begin
-  require 'pkg-config'
-rescue LoadError
-  require 'rubygems'
-  gem 'pkg-config'
-  require 'pkg-config'
-end
+require 'pkg-config'
 require 'glib-mkenums'
 
 $CFLAGS += " #{ENV['CFLAGS']}" if ENV['CFLAGS']

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 2.0.2
-  prerelease: 
+  version: 2.0.3
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2'
 description: Ruby/GLib2 is a Ruby binding of GLib-2.x.
@@ -76,6 +71,7 @@ files:
 - ext/glib2/rbglib_convert.c
 - ext/glib2/rbglib_error.c
 - ext/glib2/rbglib_fileutils.c
+- ext/glib2/rbglib_gettext.c
 - ext/glib2/rbglib_i18n.c
 - ext/glib2/rbglib_int64.c
 - ext/glib2/rbglib_io_constants.c
@@ -165,26 +161,25 @@ files:
 - test/test_win32.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.5
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby/GLib2 is a Ruby binding of GLib-2.x.
 test_files: []