glib2 1.1.8 → 1.1.9

data/Rakefile

@@ -8,20 +8,62 @@ package = GNOME2Package.new do |_package|
   _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 = ["glib"]
-  _package.win32.dependencies = ["gettext-runtime", "gnutls"]
+  _package.win32.packages = []
+  _package.win32.dependencies = ["zlib", "libffi", "gettext-runtime"]
+  libffi_lib_dir     = File.join(_package.win32.absolute_binary_dir, "lib")
+  libffi_include_dir = File.join(libffi_lib_dir, "libffi-3.0.6", "include")
   _package.win32.build_packages = [
+    {
+      :name => "glib",
+      :download_site => :gnome,
+      :label => "GLib",
+      :version => "2.35.3",
+      :configure_args => [
+        "LIBFFI_CFLAGS=-I#{libffi_include_dir}",
+        "LIBFFI_LIBS=-L#{libffi_lib_dir} -lffi",
+        "--disable-modular-tests",
+      ],
+      :compression_method => "xz",
+    },
+    {
+      :name => "gmp",
+      :download_base_url => "ftp://ftp.gmplib.org/pub/gmp-5.1.0",
+      :label => "GNU MP",
+      :version => "5.1.0",
+      :configure_args => [
+        "--disable-static",
+        "--enable-shared",
+      ],
+      :compression_method => "bz2",
+    },
+    {
+      :name => "nettle",
+      :download_base_url => "http://www.lysator.liu.se/~nisse/archive",
+      :label => "Nettle",
+      :version => "2.5",
+      :configure_args => [],
+    },
+    {
+      :name => "gnutls",
+      :download_base_url => "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1",
+      :label => "GnuTLS",
+      :version => "3.1.5",
+      :configure_args => [
+        "--with-libnettle-prefix=#{_package.win32.absolute_binary_dir}"
+      ],
+      :compression_method => "xz",
+    },
     {
       :name => "glib-networking",
       :download_site => :gnome,
       :label => "glib-networking",
-      :version => "2.28.7",
-      :configure_args => ["--without-libproxy",
-                          "--without-gnome-proxy",
-                          "--without-ca-certificates"],
-      :patches => ["glib-networking-2.28.7-fix-with-gnome-proxy.diff",
-                   "glib-networking-2.28.7-support-gnutls-2.4.2.diff"],
-      :need_autoreconf => true,
+      :version => "2.35.3",
+      :configure_args => [
+        "--without-libproxy",
+        "--without-gnome-proxy",
+        "--without-ca-certificates",
+      ],
+      :compression_method => "xz",
     },
   ]
 end

data/ext/glib2/extconf.rb

@@ -50,7 +50,7 @@ have_var("rb_curr_thread", [ruby_header, "node.h"])
 
 create_pkg_config_file("Ruby/GLib2", package_id)
 
-enum_type_prefix = "glib-enum-types"
+enum_types_prefix = "glib-enum-types"
 include_paths = PKGConfig.cflags_only_I("glib-2.0")
 headers = include_paths.split.inject([]) do |result, path|
   result + Dir.glob(File.join(path.sub(/^-I/, ""), "glib", "*.h"))
@@ -61,7 +61,7 @@ include_paths = PKGConfig.cflags_only_I("gobject-2.0")
 headers = include_paths.split.inject(headers) do |result, path|
   result + Dir.glob(File.join(path.sub(/^-I/, ""), "gobject", "gsignal.h"))
 end
-glib_mkenums(enum_type_prefix, headers, "G_TYPE_", ["glib-object.h"])
+glib_mkenums(enum_types_prefix, headers, "G_TYPE_", ["glib-object.h"])
 
 $defs << "-DRUBY_GLIB2_COMPILATION"
 create_makefile(module_name)

data/ext/glib2/rbglib.h

@@ -35,7 +35,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 1
 #define RBGLIB_MINOR_VERSION 1
-#define RBGLIB_MICRO_VERSION 8
+#define RBGLIB_MICRO_VERSION 9
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)
@@ -110,7 +110,8 @@ typedef int GPid;
 #define CBOOL2RVAL(b)   ((b) ? Qtrue : Qfalse)
 #define RVAL2CBOOL(b)   (RTEST(b))
 #define GERROR2RVAL(error) (rbgerr_gerror2exception(error))
-#define RAISE_GERROR(error) rb_exc_raise(GERROR2RVAL(error))
+#define RG_RAISE_ERROR(error) rb_exc_raise(GERROR2RVAL(error))
+#define RAISE_GERROR(error) RG_RAISE_ERROR(error) /* deprecated */
 #define G_DEF_ERROR(domain, name, module, parent, gtype)         \
     rbgerr_define_gerror(domain, name, module, parent, gtype)
 #define G_DEF_ERROR2(domain, name, module, parent) \

data/ext/glib2/rbgobj_type.c

@@ -114,14 +114,19 @@ get_superclass(GType gtype)
         return rb_cObject;
       default:
       {
-          const RGObjClassInfo *cinfo_super;
           GType parent_type;
 
           parent_type = g_type_parent(gtype);
-          cinfo_super = rbgobj_lookup_class_by_gtype_without_lock(parent_type,
-                                                                  Qnil,
-                                                                  TRUE);
-          return cinfo_super->klass;
+          if (parent_type == G_TYPE_INVALID) {
+              return cInstantiatable;
+          } else {
+              const RGObjClassInfo *cinfo_super;
+              cinfo_super =
+                  rbgobj_lookup_class_by_gtype_without_lock(parent_type,
+                                                            Qnil,
+                                                            TRUE);
+              return cinfo_super->klass;
+          }
       }
     }
 }

data/ext/glib2/rbgobject.h

@@ -45,8 +45,10 @@ extern "C" {
     G_DEF_CLASS_WITH_GC_FUNC(gtype, name, module, mark, free)
 #define G_DEF_CLASS3(gtype_name, name, module)\
     (rbgobj_define_class_dynamic(gtype_name, name, module, 0, 0))
-#define G_DEF_CLASS4(gtype, name, module, parent) \
+#define G_DEF_CLASS_WITH_PARENT(gtype, name, module, parent) \
     (rbgobj_define_class(gtype, name, module, 0, 0, parent))
+#define G_DEF_CLASS4(gtype, name, module, parent) \
+    G_DEF_CLASS_WITH_PARENT(gtype, name, module, parent)
 
 #define G_DEF_INTERFACE(gtype, name, module)\
     (rbgobj_define_class(gtype, name, module, 0, 0, Qnil))

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

@@ -10,6 +10,9 @@ class GNOME2Win32BinaryBuildTask
 
   def initialize(configuration)
     @configuration = configuration
+    @configuration.build_packages.each do |package|
+      package[:compression_method] ||= "gz"
+    end
     define
   end
 
@@ -38,20 +41,20 @@ class GNOME2Win32BinaryBuildTask
     namespace :download do
       build_packages.each do |package|
         base = "#{package[:name]}-#{package[:version]}"
-        tar_gz = "#{base}.tar.gz"
-        tar_gz_url = "#{download_base_url(package)}/#{tar_gz}"
-        tar_gz_full_path = download_dir + tar_gz
+        tar = "#{base}.tar.#{package[:compression_method]}"
+        tar_url = "#{download_base_url(package)}/#{tar}"
+        tar_full_path = download_dir + tar
 
         desc "Download #{package[:label]} into #{download_dir}."
-        task package[:name] => tar_gz_full_path.to_s
+        task package[:name] => tar_full_path.to_s
 
-        directory_path = tar_gz_full_path.dirname
+        directory_path = tar_full_path.dirname
         directory directory_path.to_s
-        file tar_gz_full_path.to_s => directory_path.to_s do
-          rake_output_message "downloading... #{tar_gz_url}"
-          open(tar_gz_url) do |downloaded_tar_gz|
-            tar_gz_full_path.open("wb") do |tar_gz_file|
-              tar_gz_file.print(downloaded_tar_gz.read)
+        file tar_full_path.to_s => directory_path.to_s do
+          rake_output_message "downloading... #{tar_url}"
+          open(tar_url) do |downloaded_tar|
+            tar_full_path.open("wb") do |tar_file|
+              tar_file.print(downloaded_tar.read)
             end
           end
         end
@@ -82,10 +85,10 @@ class GNOME2Win32BinaryBuildTask
           mkdir_p(package_tmp_dir)
 
           base = "#{package[:name]}-#{package[:version]}"
-          tar_gz = "#{base}.tar.gz"
-          tar_gz_full_path = download_dir + tar_gz
+          tar = "#{base}.tar.#{package[:compression_method]}"
+          tar_full_path = download_dir + tar
           Dir.chdir(package_tmp_dir.to_s) do
-            sh("tar", "xzf", tar_gz_full_path.to_s) or exit(false)
+            sh("tar", "xf", tar_full_path.to_s) or exit(false)
           end
 
           Dir.chdir((package_tmp_dir + base).to_s) do
@@ -95,8 +98,8 @@ class GNOME2Win32BinaryBuildTask
             sh("./autogen.sh") if package[:need_autogen]
             sh("autoreconf -i") if package[:need_autoreconf]
             sh("./configure",
-               "CPPFLAGS=-I#{rcairo_win32_include_path} -I#{dist_dir + 'include'}",
-               "LDFLAGS=-L#{rcairo_win32_lib_path} -L#{dist_dir + 'lib'}",
+               "CPPFLAGS=#{cppflags(package)}",
+               "LDFLAGS=#{ldflags(package)}",
                "--prefix=#{dist_dir}",
                "--host=#{@configuration.build_host}",
                *package[:configure_args]) or exit(false)
@@ -188,4 +191,28 @@ class GNOME2Win32BinaryBuildTask
     end
     download_base_url
   end
+
+  def cppflags(package)
+    include_paths = package[:include_paths] || []
+    include_paths += [
+      rcairo_win32_include_path,
+      dist_dir + 'include',
+    ]
+    cppflags = include_paths.collect do |path|
+      "-I#{path}"
+    end
+    cppflags.join(" ")
+  end
+
+  def ldflags(package)
+    library_paths = package[:library_paths] || []
+    library_paths += [
+      rcairo_win32_lib_path,
+      dist_dir + 'lib',
+    ]
+    ldflags = library_paths.collect do |path|
+      "-L#{path}"
+    end
+    ldflags.join(" ")
+  end
 end

metadata

@@ -1,185 +1,201 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: glib2
-version: !ruby/object:Gem::Version
-  version: 1.1.8
+version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 9
+  version: 1.1.9
 platform: ruby
-authors:
+authors: 
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-12-30 00:00:00 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
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !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
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
+  type: :development
+  version_requirements: *id002
 description: Ruby/GLib2 is a Ruby binding of GLib-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
-extensions:
+
+extensions: 
 - ext/glib2/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - README
 - Rakefile
 - extconf.rb
-- lib/glib-mkenums.rb
-- lib/glib2.rb
 - lib/glib2/deprecatable.rb
-- lib/gnome2-raketask.rb
 - lib/gnome2-win32-binary-build-task.rb
-- lib/gnome2-win32-binary-download-task.rb
+- lib/gnome2-raketask.rb
+- lib/glib2.rb
 - lib/mkmf-gnome2.rb
-- ext/glib2/depend
-- ext/glib2/extconf.rb
-- ext/glib2/glib2.def
-- ext/glib2/rbgcompat.h
-- ext/glib2/rbglib.c
-- ext/glib2/rbglib.h
-- ext/glib2/rbglib2conversions.h
-- ext/glib2/rbglib_bookmarkfile.c
+- lib/gnome2-win32-binary-download-task.rb
+- lib/glib-mkenums.rb
+- ext/glib2/rbglib_timer.c
 - ext/glib2/rbglib_completion.c
-- ext/glib2/rbglib_convert.c
-- ext/glib2/rbglib_error.c
-- ext/glib2/rbglib_fileutils.c
-- ext/glib2/rbglib_i18n.c
-- ext/glib2/rbglib_int64.c
-- ext/glib2/rbglib_io_constants.c
-- ext/glib2/rbglib_iochannel.c
 - ext/glib2/rbglib_iochannel_win32_socket.c
-- ext/glib2/rbglib_iochannelerror.c
-- ext/glib2/rbglib_keyfile.c
-- ext/glib2/rbglib_maincontext.c
-- ext/glib2/rbglib_mainloop.c
-- ext/glib2/rbglib_messages.c
-- ext/glib2/rbglib_pollfd.c
-- ext/glib2/rbglib_shell.c
-- ext/glib2/rbglib_shellerror.c
-- ext/glib2/rbglib_source.c
-- ext/glib2/rbglib_spawn.c
-- ext/glib2/rbglib_spawnerror.c
+- ext/glib2/rbgobj_param.c
+- ext/glib2/rbgobj_valuearray.c
+- ext/glib2/rbgutildeprecated.h
 - ext/glib2/rbglib_threads.c
-- ext/glib2/rbglib_timer.c
-- ext/glib2/rbglib_ucs4.c
+- ext/glib2/rbgobj_value.c
+- ext/glib2/rbglib_fileutils.c
+- ext/glib2/rbglib.c
+- ext/glib2/rbglib_iochannel.c
+- ext/glib2/rbgobj_type.c
+- ext/glib2/rbgobj_typeplugin.c
+- ext/glib2/rbglib.h
+- ext/glib2/rbgobj_convert.c
+- ext/glib2/rbgobj_strv.c
 - ext/glib2/rbglib_unichar.c
-- ext/glib2/rbglib_unicode.c
+- ext/glib2/rbglib_messages.c
+- ext/glib2/rbgutil.c
+- ext/glib2/rbglib_maincontext.c
 - ext/glib2/rbglib_utf16.c
-- ext/glib2/rbglib_utf8.c
-- ext/glib2/rbglib_utils.c
-- ext/glib2/rbglib_win32.c
-- ext/glib2/rbglibdeprecated.c
-- ext/glib2/rbglibdeprecated.h
-- ext/glib2/rbgobj_boxed.c
-- ext/glib2/rbgobj_closure.c
-- ext/glib2/rbgobj_convert.c
-- ext/glib2/rbgobj_enumflags.c
-- ext/glib2/rbgobj_enums.c
-- ext/glib2/rbgobj_flags.c
-- ext/glib2/rbgobj_fundamental.c
 - ext/glib2/rbgobj_object.c
-- ext/glib2/rbgobj_param.c
-- ext/glib2/rbgobj_paramspecs.c
-- ext/glib2/rbgobj_signal.c
-- ext/glib2/rbgobj_strv.c
-- ext/glib2/rbgobj_type.c
 - ext/glib2/rbgobj_typeinstance.c
-- ext/glib2/rbgobj_typeinterface.c
+- ext/glib2/rbglib_error.c
+- ext/glib2/rbgobj_paramspecs.c
+- ext/glib2/rbglib2conversions.h
+- ext/glib2/rbglib_shellerror.c
+- ext/glib2/rbgutil_callback.c
 - ext/glib2/rbgobj_typemodule.c
-- ext/glib2/rbgobj_typeplugin.c
-- ext/glib2/rbgobj_value.c
-- ext/glib2/rbgobj_valuearray.c
-- ext/glib2/rbgobj_valuetypes.c
+- ext/glib2/rbglib_utils.c
+- ext/glib2/rbglib_mainloop.c
+- ext/glib2/extconf.rb
+- ext/glib2/rbgutil_list.h
+- ext/glib2/rbgobj_enums.c
+- ext/glib2/rbglib_win32.c
+- ext/glib2/rbglib_int64.c
+- ext/glib2/rbglib_io_constants.c
+- ext/glib2/glib2.def
+- ext/glib2/rbgobj_fundamental.c
+- ext/glib2/rbgcompat.h
+- ext/glib2/rbgobj_closure.c
 - ext/glib2/rbgobject.c
+- ext/glib2/rbgobj_boxed.c
+- ext/glib2/rbglib_shell.c
 - ext/glib2/rbgobject.h
+- ext/glib2/rbglib_utf8.c
+- ext/glib2/rbgobj_typeinterface.c
+- ext/glib2/rbglib_convert.c
+- ext/glib2/rbglib_keyfile.c
+- ext/glib2/rbglib_ucs4.c
+- ext/glib2/rbgobj_valuetypes.c
+- ext/glib2/rbglib_i18n.c
+- ext/glib2/rbglib_spawnerror.c
+- ext/glib2/rbglib_unicode.c
+- ext/glib2/rbgobj_flags.c
+- ext/glib2/rbgutildeprecated.c
+- ext/glib2/rbglibdeprecated.c
+- ext/glib2/rbgutil_list.c
+- ext/glib2/depend
 - ext/glib2/rbgprivate.h
-- ext/glib2/rbgutil.c
+- ext/glib2/rbglib_pollfd.c
 - ext/glib2/rbgutil.h
-- ext/glib2/rbgutil_callback.c
-- ext/glib2/rbgutil_list.c
-- ext/glib2/rbgutil_list.h
-- ext/glib2/rbgutildeprecated.c
-- ext/glib2/rbgutildeprecated.h
-- sample/bookmarkfile.rb
+- ext/glib2/rbglib_bookmarkfile.c
+- ext/glib2/rbglib_iochannelerror.c
+- ext/glib2/rbglib_source.c
+- ext/glib2/rbgobj_signal.c
+- ext/glib2/rbglibdeprecated.h
+- ext/glib2/rbgobj_enumflags.c
+- ext/glib2/rbglib_spawn.c
+- sample/timeout2.rb
 - sample/completion.rb
+- sample/utils.rb
+- sample/timeout.rb
 - sample/idle.rb
-- sample/iochannel.rb
+- sample/bookmarkfile.rb
 - sample/keyfile.rb
 - sample/shell.rb
-- sample/spawn.rb
-- sample/timeout.rb
-- sample/timeout2.rb
 - sample/timer.rb
-- sample/type-register.rb
+- sample/iochannel.rb
 - sample/type-register2.rb
-- sample/utils.rb
-- test/glib-test-init.rb
-- test/glib-test-utils.rb
-- test/run-test.rb
+- sample/spawn.rb
+- sample/type-register.rb
+- test/test_mkenums.rb
+- test/test_spawn.rb
 - test/test_enum.rb
 - test/test_file_utils.rb
 - test/test_flags.rb
-- test/test_glib2.rb
-- test/test_iochannel.rb
 - test/test_key_file.rb
-- test/test_mkenums.rb
+- test/glib-test-utils.rb
+- test/run-test.rb
+- test/test_win32.rb
 - test/test_signal.rb
-- test/test_spawn.rb
+- test/test_glib2.rb
 - test/test_timeout.rb
-- test/test_unicode.rb
 - test/test_utils.rb
-- test/test_win32.rb
+- test/test_unicode.rb
+- test/test_iochannel.rb
+- test/glib-test-init.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 61
+      segments: 
+      - 1
+      - 8
+      - 5
       version: 1.8.5
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby/GLib2 is a Ruby binding of GLib-2.x.
 test_files: []
+