gtk2 3.1.1-x64-mingw32 → 3.1.2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad59eae17001467213ea614e97b7db2ecc3eb001
-  data.tar.gz: 86cde39b933c928e3d8cddf24b04e67369baba74
+  metadata.gz: 302a5a1fc8dcb398a59ff4015fd057740e2af71c
+  data.tar.gz: cd3d3e6fa8435abeaa7a7fad10d0ebca1514d704
 SHA512:
-  metadata.gz: fe0e9c87ec5f8d0c1ed149df1f0c7009420bd666f55001fe506124dc67d0af8eb0a901c4dfde0bcf794a6d0601bd57dce1bc25272d3a565a03a7a36d62d4f0f7
-  data.tar.gz: 2bd2f6e9e8539c0a5e7c62d69c3363991bed27db3da904f0af5ed400a479a159f57ab0a7dfc8b108d53494b97f5feb81eb7b0c17369ada48684e46cfca4eff84
+  metadata.gz: 0cab3830b09b70af50d747caac7d27cfa37688395462c734b221ec353a15a1de56187808b8e020b9e2cae2e22ab170267f610a45ef7df0279f8e39f6f0accf2b
+  data.tar.gz: fc1019d155c802a2213276eaf8b2e87c293dac90e87be941f00dbb67ef82b51f21731b2be4483f74dbced14ccea7f05f16a321a9e9c7ab898575430e79552637

data/ext/gtk2/extconf.rb

@@ -33,7 +33,7 @@ end
 
 have_func("rb_errinfo")
 
-["glib2", "atk", "pango", "gdk_pixbuf2"].each do |package|
+["glib2", "pango"].each do |package|
   directory = "#{package}#{version_suffix}"
   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
   add_depend_package(package, "#{directory}/ext/#{package}",
@@ -49,10 +49,10 @@ end
 setup_windows(module_name, base_dir)
 
 unless required_pkg_config_package([package_id, 2, 10, 0],
-                                   :altlinux => "libgtk+2-devel",
+                                   :alt_linux => "libgtk+2-devel",
                                    :debian => "libgtk2.0-dev",
                                    :redhat => "gtk2-devel",
-                                   :arch => "gtk2",
+                                   :arch_linux => "gtk2",
                                    :homebrew => "gtk+",
                                    :macports => "gtk2")
   exit(false)
@@ -68,9 +68,13 @@ $defs << "-DRUBY_GTK2_TARGET=\\\"#{target}\\\""
 STDOUT.print(target, "\n")
 
 gdk_include_path = nil
-include_paths = $CFLAGS.gsub(/-D\w+/, '').split(/-I/) + ['/usr/include']
+include_paths =
+  $CFLAGS.gsub(/-D\w+/, '').split(/-I/) +
+  $INCFLAGS.split(/-I/) +
+  ['/usr/include']
 include_paths.each do |path|
   path.strip!
+  next if path.empty?
 
   if FileTest.exist?("#{path}/gdk/gdkkeysyms.h")
     gdk_include_path = Pathname("#{path}/gdk")

data/ext/gtk2/rbgdkdraw.c

@@ -23,7 +23,7 @@
  */
 
 #include "global.h"
-#include "rbpango.h"
+#include <rb-pango.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif

data/ext/gtk2/rbgdkpango.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2017  Ruby-GNOME2 Project Team
  *  Copyright (C) 2003,2004 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -20,9 +20,9 @@
  */
 
 #include "global.h"
-#include "rbpango.h"
+#include <rb-pango.h>
 
-#define RG_TARGET_NAMESPACE mPango
+#define RG_TARGET_NAMESPACE mGdkPango
 
 static VALUE
 rg_m_context(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
@@ -55,7 +55,7 @@ gdkpango_attr_embossed_initialize(VALUE self, VALUE embossed)
 static VALUE
 gdkpango_attr_embossed_value(VALUE self)
 {
-    return CBOOL2RVAL(((GdkPangoAttrEmbossed*)RVAL2ATTR(self))->embossed);
+    return CBOOL2RVAL(((GdkPangoAttrEmbossed*)RVAL2PANGOATTR(self))->embossed);
 }
 
 static VALUE
@@ -68,7 +68,7 @@ gdkpango_attr_stipple_initialize(VALUE self, VALUE stipple)
 static VALUE
 gdkpango_attr_stipple_value(VALUE self)
 {
-    return GOBJ2RVAL(((GdkPangoAttrStipple*)RVAL2ATTR(self))->stipple);
+    return GOBJ2RVAL(((GdkPangoAttrStipple*)RVAL2PANGOATTR(self))->stipple);
 }
 
 static VALUE
@@ -130,7 +130,7 @@ gdkpango_attr_emboss_color_initialize(VALUE self, VALUE color)
 static VALUE
 gdkpango_attr_emboss_color_value(VALUE self)
 {
-    return BOXED2RVAL(&(((GdkPangoAttrEmbossColor *)RVAL2ATTR(self))->color),
+    return BOXED2RVAL(&(((GdkPangoAttrEmbossColor *)RVAL2PANGOATTR(self))->color),
                       PANGO_TYPE_COLOR);
 }
 #endif
@@ -139,16 +139,14 @@ void
 Init_gtk_gdk_pango(VALUE mGdk)
 {
     VALUE klass;
-    PangoAttribute* tmpattr;
-    GdkColor color;
-
     VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGdk, "Pango");
     VALUE context = GTYPE2CLASS(PANGO_TYPE_CONTEXT);
     VALUE layout = GTYPE2CLASS(PANGO_TYPE_LAYOUT);
     VALUE layoutline = GTYPE2CLASS(PANGO_TYPE_LAYOUT_LINE);
-    VALUE pattr = ATTRTYPE2CLASS(CSTR2RVAL("Attribute"));
-    VALUE pattrbool = ATTRTYPE2CLASS(CSTR2RVAL("AttrBool"));
-    VALUE pattr_color = ATTRTYPE2CLASS(CSTR2RVAL("AttrColor"));
+    VALUE mPango = rb_const_get(rb_cObject, rb_intern("Pango"));
+    VALUE pattr = rb_const_get(mPango, rb_intern("Attribute"));
+    VALUE pattrbool = rb_const_get(mPango, rb_intern("AttrBool"));
+    VALUE pattr_color = rb_const_get(mPango, rb_intern("AttrColor"));
 
     RG_DEF_MODFUNC(context, -1);
 
@@ -159,25 +157,16 @@ Init_gtk_gdk_pango(VALUE mGdk)
 
     klass = rb_define_class_under(mGdk, "PangoAttrEmbossed", pattrbool);
     rb_define_method(klass, "initialize", gdkpango_attr_embossed_initialize, 1);
-    tmpattr = gdk_pango_attr_embossed_new(TRUE);
     rb_define_method(klass, "value", gdkpango_attr_embossed_value, 0);
-    RBPANGO_ADD_ATTRIBUTE(tmpattr->klass->type, klass);
-    pango_attribute_destroy(tmpattr);
 
     klass = rb_define_class_under(mGdk, "PangoAttrStipple", pattr);
     rb_define_method(klass, "initialize", gdkpango_attr_stipple_initialize, 1);
     rb_define_method(klass, "value", gdkpango_attr_stipple_value, 0);
-    tmpattr = gdk_pango_attr_stipple_new(NULL);
-    RBPANGO_ADD_ATTRIBUTE(tmpattr->klass->type, klass);
-    pango_attribute_destroy(tmpattr);
 
 #if GTK_CHECK_VERSION(2, 12, 0)
     klass = rb_define_class_under(mGdk, "PangoAttrEmbossColor", pattr_color);
     rb_define_method(klass, "initialize",
                      gdkpango_attr_emboss_color_initialize, 1);
     rb_define_method(klass, "value", gdkpango_attr_emboss_color_value, 0);
-    tmpattr = gdk_pango_attr_emboss_color_new(&color);
-    RBPANGO_ADD_ATTRIBUTE(tmpattr->klass->type, klass);
-    pango_attribute_destroy(tmpattr);
 #endif
 }

data/test/run-test.rb

@@ -4,17 +4,25 @@ ruby_gnome2_base = File.join(File.dirname(__FILE__), "..", "..")
 ruby_gnome2_base = File.expand_path(ruby_gnome2_base)
 
 glib_base = File.join(ruby_gnome2_base, "glib2")
+gobject_introspection_base = File.join(ruby_gnome2_base, "gobject-introspection")
+gio_base = File.join(ruby_gnome2_base, "gio2")
 atk_base = File.join(ruby_gnome2_base, "atk")
+cairo_gobject_base = File.join(ruby_gnome2_base, "cairo-gobject")
 pango_base = File.join(ruby_gnome2_base, "pango")
 gdk_pixbuf_base = File.join(ruby_gnome2_base, "gdk_pixbuf2")
 gtk_base = File.join(ruby_gnome2_base, "gtk2")
 
-[[glib_base, "glib2"],
- [atk_base, "atk"],
- [pango_base, "pango"],
- [gdk_pixbuf_base, "gdk_pixbuf2"],
- [gtk_base, "gtk2"]].each do |target, module_name|
-  if system("which make > /dev/null")
+[
+  [glib_base, "glib2"],
+  [gobject_introspection_base, "gobject-introspection"],
+  [gio_base, "gio2"],
+  [atk_base, "atk"],
+  [cairo_gobject_base, "cairo-gobject"],
+  [pango_base, "pango"],
+  [gdk_pixbuf_base, "gdk_pixbuf2"],
+  [gtk_base, "gtk2"],
+].each do |target, module_name|
+  if File.exist?("#{target}/Makefile") and system("which make > /dev/null")
     `make -C #{target.dump} > /dev/null` or exit(false)
   end
   $LOAD_PATH.unshift(File.join(target, "ext", module_name))

data/test/test_gtk_icon_theme.rb

@@ -29,7 +29,7 @@ class TestGtkIconTheme < Test::Unit::TestCase
     end
 
     def test_context
-      assert_operator(@theme.icons("Actions"), :include?, "find")
+      assert_operator(@theme.icons("Actions"), :include?, "edit-find")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtk2
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: x64-mingw32
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atk
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 description: Ruby/GTK2 is a Ruby binding of GTK+-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -1723,7 +1723,7 @@ files:
 - vendor/local/share/themes/Raleigh/gtk-2.0/gtkrc
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses:
-- LGPLv2.1+
+- LGPL-2.1+
 metadata: {}
 post_install_message: 
 rdoc_options: []