glib2 0.90.4 → 0.90.5

data/ChangeLog

@@ -1,3 +1,13 @@
+2010-10-27  Kouhei Sutou  <kou@clear-code.com>
+
+	* lib/glib-mkenums.rb: work on LANG=C environment.
+
+	* Rakefile: depend on pkg-config as not development library.
+
+2010-10-24  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/glib2/rbglib.h: 0.90.4 -> 0.90.5.
+
 2010-10-24  Kouhei Sutou  <kou@clear-code.com>
 
 	* ext/glib2/rbglib.c (rbg_rval2cstr): add missing '*'.

data/Rakefile

@@ -35,7 +35,7 @@ spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.extensions = FileList["ext/#{package_name}/extconf.rb"]
   s.require_paths = ["lib"]
-  s.add_development_dependency("pkg-config", ">= 0")
+  s.add_dependency("pkg-config", ">= 0")
   s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
                      "lib/**/*.rb", "{ext,sample,test,test-unit}/**/*"]
 end

data/ext/glib2/extconf.rb

@@ -58,3 +58,11 @@ glib_mkenums(enum_type_prefix, headers, "G_TYPE_", ["glib-object.h"])
 
 $defs << "-DRUBY_GLIB2_COMPILATION"
 create_makefile(module_name)
+
+pkg_config_dir = with_config("pkg-config-dir")
+if pkg_config_dir.is_a?(String)
+  File.open("Makefile", "ab") do |makefile|
+    makefile.puts
+    makefile.puts("pkgconfigdir=#{pkg_config_dir}")
+  end
+end

data/ext/glib2/rbglib.h

@@ -23,7 +23,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 0
 #define RBGLIB_MINOR_VERSION 90
-#define RBGLIB_MICRO_VERSION 4
+#define RBGLIB_MICRO_VERSION 5
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/lib/glib-mkenums.rb

@@ -96,6 +96,7 @@ GType #{@enum_name}_get_type (void);
     def self.parse(data, g_type_prefix, options={})
       options ||= {}
       enums = []
+      data.force_encoding("utf-8") if data.respond_to?(:force_encoding)
       data.scan(/^\s*typedef\s+enum\s*
                 \{?\s*(.*?)
                 \}\s*(\w+);/mx){|constants, name|
@@ -167,7 +168,7 @@ GType #{@enum_name}_get_type (void);
 
     # Create a C source as a String.
     def create_c
-      ret = "\n/* Generated by glib-mkenums.rb ($Id: glib-mkenums.rb 3896 2010-09-25 07:49:34Z ktou $) */ \n\n"
+      ret = "\n/* Generated by glib-mkenums.rb ($Id: glib-mkenums.rb 3990 2010-10-27 03:38:42Z ktou $) */ \n\n"
       ret << %Q[#include "#{@target_filename}.h"\n]
       @include_files.each do |file|
         ret << "#include <#{file}>\n"
@@ -183,7 +184,7 @@ GType #{@enum_name}_get_type (void);
       header = "#{@target_filename}.h"
       const = "__#{File.basename(header).upcase.gsub(/-|\./, '_')}__"
 
-      ret = "\n/* Generated by glib-mkenums.rb ($Id: glib-mkenums.rb 3896 2010-09-25 07:49:34Z ktou $) */ \n\n"
+      ret = "\n/* Generated by glib-mkenums.rb ($Id: glib-mkenums.rb 3990 2010-10-27 03:38:42Z ktou $) */ \n\n"
       ret << "#ifndef #{const}\n"
       ret << "#define #{const}\n\n"
       ret << "#include <glib-object.h>\n\n"

data/lib/mkmf-gnome2.rb

@@ -331,16 +331,20 @@ def check_cairo(options={})
   unless have_rb_cairo_h
     begin
       require 'rubygems'
-      gem 'cairo'
-      require 'cairo'
-      rcairo_src_gem_path_re =
-        /\A#{Regexp.escape(Gem.dir)}\/gems\/cairo-[\d.]+\/ext\/cairo\z/
-      $LOAD_PATH.each do |path|
-        if rcairo_src_gem_path_re =~ path
-          $CFLAGS += " -I#{path} "
-          have_rb_cairo_h = have_header('rb_cairo.h')
-          break
-        end
+      rcairo_gem = Gem.cache.find_name("cairo").sort_by do |gem|
+        gem.version
+      end.last
+      if rcairo_gem
+        rcairo_source_dir = rcairo_gem.full_gem_path
+        rb_cairo_h_dir = File.join(rcairo_source_dir, "ext", "cairo")
+        $CFLAGS += " -I#{rb_cairo_h_dir} "
+        have_rb_cairo_h = have_header('rb_cairo.h')
+      else
+        require "cairo"
+        rcairo_source_dir = File.dirname($".grep(/cairo\.(?!rb\z)\w+\z/).first)
+        rb_cairo_h_dir = rcairo_source_dir
+        $CFLAGS += " -I#{rcairo_h_dir} "
+        have_rb_cairo_h = have_header('rb_cairo.h')
       end
     rescue LoadError
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: glib2
 version: !ruby/object:Gem::Version 
-  hash: 383
+  hash: 381
   prerelease: false
   segments: 
   - 0
   - 90
-  - 4
-  version: 0.90.4
+  - 5
+  version: 0.90.5
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-24 00:00:00 +09:00
+date: 2010-10-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id001
 description: Ruby/GLib2 is a Ruby binding of GLib-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
@@ -45,198 +45,198 @@ files:
 - README
 - Rakefile
 - extconf.rb
-- lib/gnome2-win32-binary-downloader.rb
+- lib/glib-mkenums.rb
 - lib/glib2.rb
 - lib/mkmf-gnome2.rb
-- lib/glib-mkenums.rb
-- ext/glib2/rbglib_timer.c
-- ext/glib2/rbglib_completion.c
-- ext/glib2/rbgobj_param.c
-- ext/glib2/rbgobj_valuearray.c
-- ext/glib2/rbglib_threads.c
-- ext/glib2/rbgobj_value.c
+- lib/gnome2-win32-binary-downloader.rb
+- ext/glib2/rbgutil_callback.c
+- ext/glib2/rbglib_source.c
+- ext/glib2/rbglib_int64.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_messages.c
-- ext/glib2/rbgutil.c
+- ext/glib2/rbglib_win32.c
+- ext/glib2/rbgprivate.h
+- ext/glib2/rbglib_bookmarkfile.c
+- ext/glib2/rbgobj_closure.c
+- ext/glib2/rbgobj_valuetypes.c
+- ext/glib2/rbglib_pollfd.c
 - ext/glib2/rbglib_maincontext.c
-- ext/glib2/rbgobj_object.c
-- ext/glib2/rbgobj_typeinstance.c
-- ext/glib2/rbglib_error.c
-- ext/glib2/rbgobj_paramspecs.c
-- ext/glib2/rbgutil_callback.c
-- ext/glib2/rbgobj_typemodule.c
-- ext/glib2/rbglib_utils.c
-- ext/glib2/rbglib_mainloop.c
+- ext/glib2/rbgobj_valuearray.c
+- ext/glib2/rbglib.h
 - ext/glib2/extconf.rb
-- ext/glib2/rbgobj_enums.c
-- ext/glib2/rbglib_win32.c
-- ext/glib2/rbglib_int64.c
-- ext/glib2/glib2.def
-- ext/glib2/rbgobj_fundamental.c
+- ext/glib2/rbglib_convert.c
+- ext/glib2/rbgutil.c
+- ext/glib2/depend
 - ext/glib2/rbgcompat.h
-- ext/glib2/rbgobj_closure.c
 - ext/glib2/rbgobject.c
 - ext/glib2/rbgobj_boxed.c
+- ext/glib2/rbgobj_typemodule.c
+- ext/glib2/rbgobj_enums.c
+- ext/glib2/rbglib_threads.c
+- ext/glib2/rbgobj_typeinterface.c
+- ext/glib2/rbgobj_param.c
+- ext/glib2/rbgobj_object.c
+- ext/glib2/rbglib_spawn.c
+- ext/glib2/glib2.def
+- ext/glib2/rbgobj_signal.c
+- ext/glib2/rbgobj_convert.c
+- ext/glib2/rbglib_error.c
+- ext/glib2/rbglib_i18n.c
+- ext/glib2/rbgobj_value.c
+- ext/glib2/rbglib_messages.c
 - ext/glib2/rbglib_shell.c
+- ext/glib2/rbglib_completion.c
 - ext/glib2/rbgobject.h
-- ext/glib2/rbgobj_typeinterface.c
-- ext/glib2/rbglib_convert.c
 - ext/glib2/rbglib_keyfile.c
-- ext/glib2/rbgobj_valuetypes.c
-- ext/glib2/rbglib_i18n.c
-- ext/glib2/rbglib_unicode.c
-- ext/glib2/depend
-- ext/glib2/rbgprivate.h
-- ext/glib2/rbglib_pollfd.c
+- ext/glib2/rbgobj_typeplugin.c
+- ext/glib2/rbglib_mainloop.c
+- ext/glib2/rbgobj_strv.c
+- ext/glib2/rbglib_iochannel.c
+- ext/glib2/rbgobj_typeinstance.c
+- ext/glib2/rbglib_timer.c
+- ext/glib2/rbgobj_type.c
 - ext/glib2/rbgutil.h
-- ext/glib2/rbglib_bookmarkfile.c
-- ext/glib2/rbglib_source.c
-- ext/glib2/rbgobj_signal.c
-- ext/glib2/rbglib_spawn.c
-- sample/timeout2.rb
-- sample/completion.rb
+- ext/glib2/rbglib.c
+- ext/glib2/rbglib_utils.c
+- ext/glib2/rbgobj_fundamental.c
+- ext/glib2/rbglib_unicode.c
+- ext/glib2/rbgobj_paramspecs.c
 - sample/utils.rb
+- sample/completion.rb
+- sample/spawn.rb
+- sample/iochannel.rb
 - sample/timeout.rb
-- sample/idle.rb
+- sample/type-register2.rb
 - sample/bookmarkfile.rb
-- sample/keyfile.rb
+- sample/idle.rb
 - sample/shell.rb
-- sample/timer.rb
-- sample/iochannel.rb
-- sample/type-register2.rb
-- sample/spawn.rb
+- sample/keyfile.rb
+- sample/timeout2.rb
 - sample/type-register.rb
-- test/test_mkenums.rb
-- test/test_enum.rb
+- sample/timer.rb
 - test/test_file_utils.rb
+- test/test_timeout.rb
 - test/test_key_file.rb
-- test/glib-test-utils.rb
-- test/run-test.rb
-- test/test_win32.rb
 - test/test_signal.rb
-- test/test_glib2.rb
-- test/test_timeout.rb
-- test/test_utils.rb
-- test/test_unicode.rb
+- test/run-test.rb
+- test/glib-test-utils.rb
+- test/test_mkenums.rb
 - test/test_iochannel.rb
+- test/test_utils.rb
+- test/test_enum.rb
 - test/glib-test-init.rb
-- test-unit/Manifest.txt
-- test-unit/TODO
-- test-unit/html/rubyforge.png
-- test-unit/html/test-unit.css
-- test-unit/html/reference.png
-- test-unit/html/tutorial.svg
-- test-unit/html/jp.png
-- test-unit/html/tango-logo.png
-- test-unit/html/install.svg
-- test-unit/html/heading-mark.png
-- test-unit/html/developer.svg
-- test-unit/html/kinotan-failure.png
-- test-unit/html/developer.png
-- test-unit/html/heading-mark.svg
-- test-unit/html/logo.png
-- test-unit/html/tutorial.png
-- test-unit/html/us.png
-- test-unit/html/bar.svg
-- test-unit/html/index.html
-- test-unit/html/index.html.ja
-- test-unit/html/bar.png
-- test-unit/html/favicon.svg
-- test-unit/html/favicon.png
-- test-unit/html/favicon.ico
-- test-unit/html/install.png
-- test-unit/html/kinotan-pass.png
-- test-unit/html/logo.svg
-- test-unit/html/famfamfam-logo.png
-- test-unit/History.txt
-- test-unit/README.txt
-- test-unit/images/color-diff.png
+- test/test_unicode.rb
+- test/test_glib2.rb
+- test/test_win32.rb
 - test-unit/COPYING
+- test-unit/Rakefile
+- test-unit/TODO
 - test-unit/lib/test/unit.rb
-- test-unit/lib/test/unit/attribute.rb
-- test-unit/lib/test/unit/color.rb
+- test-unit/lib/test/unit/priority.rb
 - test-unit/lib/test/unit/version.rb
-- test-unit/lib/test/unit/runner/emacs.rb
-- test-unit/lib/test/unit/runner/console.rb
-- test-unit/lib/test/unit/runner/tap.rb
-- test-unit/lib/test/unit/ui/testrunnerutilities.rb
+- test-unit/lib/test/unit/pending.rb
+- test-unit/lib/test/unit/error.rb
+- test-unit/lib/test/unit/util/procwrapper.rb
+- test-unit/lib/test/unit/util/method-owner-finder.rb
+- test-unit/lib/test/unit/util/observable.rb
+- test-unit/lib/test/unit/util/output.rb
+- test-unit/lib/test/unit/util/backtracefilter.rb
+- test-unit/lib/test/unit/testcase.rb
+- test-unit/lib/test/unit/omission.rb
+- test-unit/lib/test/unit/assertions.rb
 - test-unit/lib/test/unit/ui/emacs/testrunner.rb
-- test-unit/lib/test/unit/ui/testrunner.rb
+- test-unit/lib/test/unit/ui/testrunnermediator.rb
 - test-unit/lib/test/unit/ui/tap/testrunner.rb
 - test-unit/lib/test/unit/ui/console/outputlevel.rb
 - test-unit/lib/test/unit/ui/console/testrunner.rb
-- test-unit/lib/test/unit/ui/testrunnermediator.rb
-- test-unit/lib/test/unit/assertionfailederror.rb
-- test-unit/lib/test/unit/failure.rb
-- test-unit/lib/test/unit/autorunner.rb
-- test-unit/lib/test/unit/exceptionhandler.rb
-- test-unit/lib/test/unit/assertions.rb
-- test-unit/lib/test/unit/error.rb
-- test-unit/lib/test/unit/omission.rb
-- test-unit/lib/test/unit/fixture.rb
+- test-unit/lib/test/unit/ui/testrunner.rb
+- test-unit/lib/test/unit/ui/testrunnerutilities.rb
 - test-unit/lib/test/unit/collector/descendant.rb
 - test-unit/lib/test/unit/collector/load.rb
 - test-unit/lib/test/unit/collector/dir.rb
 - test-unit/lib/test/unit/collector/objectspace.rb
-- test-unit/lib/test/unit/color-scheme.rb
-- test-unit/lib/test/unit/testcase.rb
-- test-unit/lib/test/unit/util/method-owner-finder.rb
-- test-unit/lib/test/unit/util/output.rb
-- test-unit/lib/test/unit/util/procwrapper.rb
-- test-unit/lib/test/unit/util/observable.rb
-- test-unit/lib/test/unit/util/backtracefilter.rb
-- test-unit/lib/test/unit/pending.rb
+- test-unit/lib/test/unit/fixture.rb
+- test-unit/lib/test/unit/testsuite.rb
+- test-unit/lib/test/unit/assertionfailederror.rb
+- test-unit/lib/test/unit/failure.rb
 - test-unit/lib/test/unit/testresult.rb
-- test-unit/lib/test/unit/collector.rb
+- test-unit/lib/test/unit/color-scheme.rb
 - test-unit/lib/test/unit/diff.rb
-- test-unit/lib/test/unit/priority.rb
+- test-unit/lib/test/unit/runner/emacs.rb
+- test-unit/lib/test/unit/runner/tap.rb
+- test-unit/lib/test/unit/runner/console.rb
+- test-unit/lib/test/unit/collector.rb
+- test-unit/lib/test/unit/autorunner.rb
+- test-unit/lib/test/unit/exceptionhandler.rb
 - test-unit/lib/test/unit/notification.rb
-- test-unit/lib/test/unit/testsuite.rb
-- test-unit/bin/testrb
-- test-unit/sample/test_subtracter.rb
-- test-unit/sample/subtracter.rb
-- test-unit/sample/test_user.rb
+- test-unit/lib/test/unit/attribute.rb
+- test-unit/lib/test/unit/color.rb
 - test-unit/sample/test_adder.rb
 - test-unit/sample/adder.rb
-- test-unit/Rakefile
-- test-unit/PSFL
-- test-unit/GPL
+- test-unit/sample/subtracter.rb
+- test-unit/sample/test_user.rb
+- test-unit/sample/test_subtracter.rb
+- test-unit/images/color-diff.png
+- test-unit/README.txt
+- test-unit/Manifest.txt
 - test-unit/test/testunit-test-util.rb
-- test-unit/test/test-testcase.rb
-- test-unit/test/ui/test_testrunmediator.rb
-- test-unit/test/ui/test_tap.rb
-- test-unit/test/test_testresult.rb
-- test-unit/test/test-pending.rb
-- test-unit/test/test-emacs-runner.rb
-- test-unit/test/test-fixture.rb
-- test-unit/test/test-attribute.rb
 - test-unit/test/test_failure.rb
-- test-unit/test/test_testsuite.rb
-- test-unit/test/collector/test_objectspace.rb
-- test-unit/test/collector/test-descendant.rb
-- test-unit/test/collector/test_dir.rb
-- test-unit/test/collector/test-load.rb
-- test-unit/test/run-test.rb
-- test-unit/test/test-priority.rb
+- test-unit/test/util/test-output.rb
+- test-unit/test/util/test_procwrapper.rb
 - test-unit/test/util/test_backtracefilter.rb
 - test-unit/test/util/test_observable.rb
-- test-unit/test/util/test_procwrapper.rb
 - test-unit/test/util/test-method-owner-finder.rb
-- test-unit/test/util/test-output.rb
-- test-unit/test/test_error.rb
-- test-unit/test/test-diff.rb
-- test-unit/test/test-notification.rb
 - test-unit/test/test-color-scheme.rb
-- test-unit/test/test-omission.rb
+- test-unit/test/test-priority.rb
+- test-unit/test/test_testsuite.rb
+- test-unit/test/test-pending.rb
+- test-unit/test/test_error.rb
+- test-unit/test/run-test.rb
+- test-unit/test/test-emacs-runner.rb
+- test-unit/test/ui/test_tap.rb
+- test-unit/test/ui/test_testrunmediator.rb
+- test-unit/test/collector/test_dir.rb
+- test-unit/test/collector/test_objectspace.rb
+- test-unit/test/collector/test-descendant.rb
+- test-unit/test/collector/test-load.rb
+- test-unit/test/test-testcase.rb
+- test-unit/test/test-fixture.rb
+- test-unit/test/test_testresult.rb
 - test-unit/test/test-color.rb
+- test-unit/test/test-diff.rb
 - test-unit/test/test_assertions.rb
+- test-unit/test/test-attribute.rb
+- test-unit/test/test-omission.rb
+- test-unit/test/test-notification.rb
+- test-unit/History.txt
+- test-unit/html/developer.svg
+- test-unit/html/reference.png
+- test-unit/html/favicon.ico
+- test-unit/html/tutorial.png
+- test-unit/html/jp.png
+- test-unit/html/index.html
+- test-unit/html/heading-mark.png
+- test-unit/html/install.svg
+- test-unit/html/favicon.svg
+- test-unit/html/famfamfam-logo.png
+- test-unit/html/heading-mark.svg
+- test-unit/html/kinotan-pass.png
+- test-unit/html/logo.svg
+- test-unit/html/test-unit.css
+- test-unit/html/bar.svg
+- test-unit/html/us.png
+- test-unit/html/rubyforge.png
+- test-unit/html/bar.png
+- test-unit/html/favicon.png
+- test-unit/html/logo.png
+- test-unit/html/index.html.ja
+- test-unit/html/kinotan-failure.png
+- test-unit/html/tutorial.svg
+- test-unit/html/tango-logo.png
+- test-unit/html/developer.png
+- test-unit/html/install.png
+- test-unit/GPL
+- test-unit/bin/testrb
+- test-unit/PSFL
 has_rdoc: true
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []