gtk2 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a658199fa7ed5e53bc74648767e77a52f00385d1
-  data.tar.gz: 5834926733ca7ab4b12e3acaba65f4411cc99459
+  metadata.gz: a061f5b3fae75220cd5d8dac99ec913c43c07717
+  data.tar.gz: 6f84a5b9bfc52a4eb4d4cdf638a89ebbdc4762bb
 SHA512:
-  metadata.gz: 3e9e5c5c70253fd24780ea4a7d0d7a8941ff27add4bd878b8072160284ed8a3a4b63cfff8d22a85ea0e052a91a9961f0e2eabe9c9ab84d7d4c01733943266f00
-  data.tar.gz: c8166aaacc28ab7bc830d412a7c025697150d3a6f25dcafd7523e0536dcb1040026ecd721ada297d214a07d0a57309cd9fa1eae5f2b15b4cca86ecd4f8b68853
+  metadata.gz: 8ab3fb84dd1fcee4d32774aa6dadb559b59741b956c203bfdb16677b8dd0d8fb886f42aceed90e7ae2a97246766cb65029d563505342eceb928ab47c115fa7e8
+  data.tar.gz: 05957a367a90cdcd6aa7bde2148bb46b05535460ddc65159bd5ab13c42dd505788812662e7faf539a4af50d6191a73fdc7111144ac60225bcebb3b4f26bd327c

data/Rakefile

@@ -1,23 +1,23 @@
 # -*- ruby -*-
 
 $LOAD_PATH.unshift("./../glib2/lib")
-require 'gnome2-raketask'
+require 'gnome2/rake/package-task'
 
-package = GNOME2Package.new do |_package|
-  _package.summary = "Ruby/GTK2 is a Ruby binding of GTK+-2.x."
-  _package.description = "Ruby/GTK2 is a Ruby binding of GTK+-2.x."
-  _package.dependency.gem.runtime = ["atk", "pango", "gdk_pixbuf2"]
-  _package.win32.packages = []
-  _package.win32.dependencies = []
-  _package.win32.build_dependencies = [
+package_task = GNOME2::Rake::PackageTask.new do |package|
+  package.summary = "Ruby/GTK2 is a Ruby binding of GTK+-2.x."
+  package.description = "Ruby/GTK2 is a Ruby binding of GTK+-2.x."
+  package.dependency.gem.runtime = ["atk", "pango", "gdk_pixbuf2"]
+  package.windows.packages = []
+  package.windows.dependencies = []
+  package.windows.build_dependencies = [
     "glib2", "atk", "pango", "gdk_pixbuf2",
   ]
-  _package.external_packages = [
+  package.external_packages = [
     {
       :name => "gtk+",
       :download_site => :gnome,
       :label => "gtk+",
-      :version => "2.24.22",
+      :version => "2.24.25",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -26,6 +26,7 @@ package = GNOME2Package.new do |_package|
         :need_autoreconf => true,
         :patches => [
           "gtk+-2.24.22-add-missing-exeext-and-fix-directory.diff",
+          "gtk+-2.24.22-remove-PRIVATE-from-def.diff",
         ],
         :built_file => "bin/libgtk-win32-2.0-0.dll",
       },
@@ -43,9 +44,9 @@ package = GNOME2Package.new do |_package|
     },
   ]
 end
-package.define_tasks
+package_task.define
 
-namespace :win32 do
+namespace :windows do
   desc "create default gtkrc"
   task :gtkrc do
     gtkrc_path = File.join("vendor", "local", "etc", "gtk-2.0", "gtkrc")
@@ -56,6 +57,6 @@ namespace :win32 do
   end
 
   namespace :builder do
-    task :after => ["win32:gtkrc"]
+    task :after => ["windows:gtkrc"]
   end
 end

data/ext/gtk2/extconf.rb

@@ -42,24 +42,11 @@ have_func("rb_errinfo")
                      :target_build_dir => build_dir)
 end
 
-rcairo_options = {}
-rcairo_source_dir_names = ["rcairo"]
-if /mingw|cygwin|mswin/ =~ RUBY_PLATFORM
-  rcairo_source_dir_names.unshift("rcairo.win32")
-end
-rcairo_source_dir_names.each do |rcairo_source_dir_name|
-  rcairo_source_dir = top_dir.parent.expand_path + rcairo_source_dir_name
-  if rcairo_source_dir.exist?
-    rcairo_options[:rcairo_source_dir] = rcairo_source_dir.to_s
-    break
-  end
-end
-
-unless check_cairo(rcairo_options)
+unless check_cairo(:top_dir => top_dir)
   exit(false)
 end
 
-setup_win32(module_name, base_dir)
+setup_windows(module_name, base_dir)
 
 unless required_pkg_config_package([package_id, 2, 10, 0],
                                    :debian => "libgtk2.0-dev",

data/ext/gtk2/rbgtkaboutdialog.c

@@ -98,7 +98,7 @@ rg_s_show(VALUE self, VALUE parent, VALUE props)
                    strlen(pd[i].name) == strlen("logo")){
             pd[i].value = g_object_ref(RVAL2GOBJ(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]));
         } else if (strncmp(pd[i].name, "wrap_license", strlen("wrap_license")) == 0){
-            pd[i].value = GINT_TO_POINTER(RVAL2CBOOL(RARRAY_PTR(ary)[i]));
+            pd[i].value = GINT_TO_POINTER(RVAL2CBOOL(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]));
         } else {
             pd[i].value = g_strdup(RVAL2CSTR(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]));
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtk2
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atk
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 description: Ruby/GTK2 is a Ruby binding of GTK+-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []