gdk3 3.2.5-x86-mingw32 → 3.2.6-x86-mingw32

data/README.md

@@ -0,0 +1,25 @@
+# Ruby/GDK3
+
+Ruby/GDK3 is a Ruby binding of GDK 3.
+
+## Requirements
+
+* Ruby/GLib2, Ruby/ATK, Ruby/Pango and Ruby/GdkPixbuf2 in
+  [Ruby-GNOME2](https://ruby-gnome2.osdn.jp/)
+* [rcairo](https://github.com/rcairo/rcairo)
+* [GTK+](https://www.gtk.org/) 3.4.2 or later
+
+## Install
+
+    gem install gdk3
+
+## License
+
+Copyright (c) 2002-2013 Ruby-GNOME2 Project Team
+
+This program is free software. You can distribute/modify this program
+under the terms of the GNU LESSER GENERAL PUBLIC LICENSE Version 2.1.
+
+## Project Website
+
+https://ruby-gnome2.osdn.jp/

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2011-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,9 +19,10 @@
 $LOAD_PATH.unshift("./../glib2/lib")
 require "gnome2/rake/package-task"
 
-package_task = GNOME2::Rake::PackageTask.new do |package|
-  package.summary = "Ruby/GDK3 is a Ruby binding of GDK-3.x."
-  package.description = "Ruby/GDK3 is a Ruby binding of GDK-3.x."
+package_name = File.basename(__dir__)
+spec = Gem::Specification.load("#{package_name}.gemspec")
+
+GNOME2::Rake::PackageTask.define(spec, __dir__) do |package|
   package.dependency.gem.runtime = [
     "pango",
     "gdk_pixbuf2",
@@ -59,7 +60,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "gtk+",
       :download_site => :gnome,
       :label => "GTK+",
-      :version => "3.22.29",
+      :version => "3.22.30",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -100,4 +101,3 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
     },
   ]
 end
-package_task.define

data/gdk3.gemspec

@@ -0,0 +1,41 @@
+# -*- ruby -*-
+#
+# Copyright (C) 2018  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require_relative "../glib2/version"
+
+Gem::Specification.new do |s|
+  s.name          = "gdk3"
+  s.summary       = "Ruby/GDK3 is a Ruby binding of GDK-3.x."
+  s.description   = "Ruby/GDK3 is a Ruby binding of GDK-3.x."
+  s.author        = "The Ruby-GNOME2 Project Team"
+  s.email         = "ruby-gnome2-devel-en@lists.sourceforge.net"
+  s.homepage      = "https://ruby-gnome2.osdn.jp/"
+  s.licenses      = ["LGPL-2.1+"]
+  s.version       = ruby_glib2_version
+  s.extensions    = ["dependency-check/Rakefile"]
+  s.require_paths = ["lib"]
+  s.files = [
+    "COPYING.LIB",
+    "README.md",
+    "Rakefile",
+    "#{s.name}.gemspec",
+    "dependency-check/Rakefile",
+  ]
+  s.files += Dir.glob("lib/**/*.rb")
+  s.files += Dir.glob("test/**/*")
+end

data/lib/gdk3/cursor.rb

@@ -16,6 +16,19 @@
 
 module Gdk
   class Cursor
+    @caches = {}
+    class << self
+      def new(*args)
+        first_arg = args.first
+        case first_arg
+        when String, Symbol, CursorType
+          @caches[first_arg] ||= super
+        else
+          super
+        end
+      end
+    end
+
     alias_method :initialize_raw, :initialize
     def initialize(*args)
       if args.last.is_a?(Hash)

data/lib/gdk3/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2017  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2018  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -270,13 +270,16 @@ module Gdk
     def load_struct_info(info)
       return if info.gtype_struct?
 
-      options = {}
       case info.name
       when /\AEvent/
-        options[:parent] = event_class
+        name = rubyish_class_name(info)
+        klass = Class.new(event_class)
+        @base_module.const_set(name, klass)
+        load_fields(info, klass)
+        load_methods(info, klass)
+      else
+        define_struct(info)
       end
-
-      define_struct(info, options)
     end
 
     def define_enum(info)
@@ -336,5 +339,20 @@ module Gdk
         end
       end
     end
+
+    def may_be_cached?(constructor_info, klass)
+      case klass.name
+      when "Gdk::Cursor"
+        case constructor_info.name
+        when "new_from_name", "new_for_display"
+          true
+          # false
+        else
+          false
+        end
+      else
+        false
+      end
+    end
   end
 end

data/test/test-gdk-cursor.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2018  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -23,6 +23,14 @@ class TestGdkCursor < Test::Unit::TestCase
       assert_equal(Gdk::CursorType::ARROW, cursor.cursor_type)
     end
 
+    test "type - multiple" do
+      3.times do |i|
+        cursor = Gdk::Cursor.new(:arrow)
+        assert_equal([i, Gdk::CursorType::ARROW],
+                     [i, cursor.cursor_type])
+      end
+    end
+
     test "pixbuf" do
       pixbuf = GdkPixbuf::Pixbuf.new(:file => fixture_path("ruby-gnome2-logo.png"))
       cursor = Gdk::Cursor.new(pixbuf, 0, 0)
@@ -40,5 +48,13 @@ class TestGdkCursor < Test::Unit::TestCase
       cursor = Gdk::Cursor.new("cross")
       assert_equal(Gdk::CursorType::CURSOR_IS_PIXMAP, cursor.cursor_type)
     end
+
+    test "name - multiple" do
+      3.times do |i|
+        cursor = Gdk::Cursor.new("cross")
+        assert_equal([i, Gdk::CursorType::CURSOR_IS_PIXMAP],
+                     [i, cursor.cursor_type])
+      end
+    end
   end
 end

data/vendor/local/include/gtk-3.0/gdk/gdkversionmacros.h

@@ -26,7 +26,7 @@
 
 #define GDK_MAJOR_VERSION (3)
 #define GDK_MINOR_VERSION (22)
-#define GDK_MICRO_VERSION (29)
+#define GDK_MICRO_VERSION (30)
 
 #ifndef _GDK_EXTERN
 #define _GDK_EXTERN extern

data/vendor/local/include/gtk-3.0/gtk/gtklistbox.h

@@ -55,7 +55,7 @@ struct _GtkListBox
  * @row_selected: Class handler for the #GtkListBox::row-selected signal
  * @row_activated: Class handler for the #GtkListBox::row-activated signal
  * @activate_cursor_row: Class handler for the #GtkListBox::activate-cursor-row signal
- * @toggle_cursor_row: Class handler for the #GtkListBox::activate-cursor-row signal
+ * @toggle_cursor_row: Class handler for the #GtkListBox::toggle-cursor-row signal
  * @move_cursor: Class handler for the #GtkListBox::move-cursor signal
  * @selected_rows_changed: Class handler for the #GtkListBox::selected-rows-changed signal
  * @select_all: Class handler for the #GtkListBox::select-all signal

data/vendor/local/include/gtk-3.0/gtk/gtkversion.h

@@ -64,7 +64,7 @@
  * application compile time, rather than from the library linked
  * against at application run time.
  */
-#define GTK_MICRO_VERSION (29)
+#define GTK_MICRO_VERSION (30)
 
 /**
  * GTK_BINARY_AGE:
@@ -73,7 +73,7 @@
  * application compile time, rather than from the library linked
  * against at application run time.
  */
-#define GTK_BINARY_AGE    (2229)
+#define GTK_BINARY_AGE    (2230)
 
 /**
  * GTK_INTERFACE_AGE:
@@ -82,7 +82,7 @@
  * application compile time, rather than from the library linked
  * against at application run time.
  */
-#define GTK_INTERFACE_AGE (29)
+#define GTK_INTERFACE_AGE (30)
 
 /**
  * GTK_CHECK_VERSION:

data/vendor/local/lib/gtk-3.0/3.0.0/immodules.cache

@@ -1,6 +1,6 @@
 # GTK+ Input Method Modules file
 # Automatically generated file, do not edit
-# Created by Z:/home/vagrant/ruby-gnome2/gdk3/tmp/windows/gtk+/gtk+-3.22.29/gtk/.libs/gtk-query-immodules-3.0.exe from gtk+-3.22.29
+# Created by Z:/home/vagrant/ruby-gnome2/gdk3/tmp/windows/gtk+/gtk+-3.22.30/gtk/.libs/gtk-query-immodules-3.0.exe from gtk+-3.22.30
 #
 # ModulesPath = /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/gtk-3.0/3.0.0/i686-w64-mingw32/immodules;/home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/gtk-3.0/3.0.0/immodules;/home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/gtk-3.0/i686-w64-mingw32/immodules;/home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/gtk-3.0/immodules
 #

data/vendor/local/lib/libgailutil-3.la

@@ -17,7 +17,7 @@ old_library=''
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -R/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk3/vendor/local/lib /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libgtk-3.la -L/home/vagrant/ruby-gnome2/pango/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib -L/home/vagrant/ruby-gnome2/atk/vendor/local/lib -lcomdlg32 -lwinspool -lcomctl32 /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libgdk-3.la -limm32 -lshell32 -ldwmapi -lsetupapi -lcfgmgr32 /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangocairo-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangowin32-1.0.la -lusp10 /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangoft2-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libharfbuzz.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpango-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgthread-2.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libfribidi.la /home/vagrant/rcairo/vendor/local/lib/libcairo-gobject.la /home/vagrant/rcairo/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo/vendor/local/lib/libxml2.la /home/vagrant/rcairo/vendor/local/lib/libfreetype.la -lgdi32 -lmsimg32 /home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib/libgdk_pixbuf-2.0.la /home/vagrant/rcairo/vendor/local/lib/libpng16.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgio-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi -lz /home/vagrant/ruby-gnome2/atk/vendor/local/lib/libatk-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib/libffi.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libpcre.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libiconv.la /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libepoxy.la -lopengl32'
+dependency_libs=' -R/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk3/vendor/local/lib /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libgtk-3.la -L/home/vagrant/ruby-gnome2/pango/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib -L/home/vagrant/ruby-gnome2/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib -L/home/vagrant/ruby-gnome2/atk/vendor/local/lib -lcomdlg32 -lwinspool -lcomctl32 /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libgdk-3.la -limm32 -lshell32 -ldwmapi -lsetupapi -lcfgmgr32 /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangocairo-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangowin32-1.0.la -lusp10 /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangoft2-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libharfbuzz.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpango-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgthread-2.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libfribidi.la /home/vagrant/rcairo/vendor/local/lib/libcairo-gobject.la /home/vagrant/rcairo/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo/vendor/local/lib/libxml2.la /home/vagrant/rcairo/vendor/local/lib/libfreetype.la -lgdi32 -lmsimg32 /home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib/libgdk_pixbuf-2.0.la /home/vagrant/rcairo/vendor/local/lib/libpng16.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgio-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi -lz /home/vagrant/ruby-gnome2/atk/vendor/local/lib/libatk-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib/libffi.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libpcre.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libiconv.la /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libepoxy.la -lopengl32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

data/vendor/local/lib/libgdk-3.la

@@ -17,7 +17,7 @@ old_library=''
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -R/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk3/vendor/local/lib -limm32 -lshell32 -ldwmapi -lsetupapi -lcfgmgr32 -L/home/vagrant/ruby-gnome2/pango/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangocairo-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangowin32-1.0.la -lusp10 /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangoft2-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libharfbuzz.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpango-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgthread-2.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libfribidi.la /home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib/libgdk_pixbuf-2.0.la /home/vagrant/rcairo/vendor/local/lib/libcairo-gobject.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgio-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib/libffi.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libglib-2.0.la -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libpcre.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libiconv.la /home/vagrant/rcairo/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo/vendor/local/lib/libxml2.la -lws2_32 /home/vagrant/rcairo/vendor/local/lib/libfreetype.la /home/vagrant/rcairo/vendor/local/lib/libpng16.la -lgdi32 -lmsimg32 -lz /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libepoxy.la -lopengl32'
+dependency_libs=' -R/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk3/vendor/local/lib -limm32 -lshell32 -ldwmapi -lsetupapi -lcfgmgr32 -L/home/vagrant/ruby-gnome2/pango/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib -L/home/vagrant/ruby-gnome2/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangocairo-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangowin32-1.0.la -lusp10 /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangoft2-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libharfbuzz.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpango-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgthread-2.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libfribidi.la /home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib/libgdk_pixbuf-2.0.la /home/vagrant/rcairo/vendor/local/lib/libcairo-gobject.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgio-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib/libffi.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libglib-2.0.la -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libpcre.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libiconv.la /home/vagrant/rcairo/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo/vendor/local/lib/libxml2.la -lws2_32 /home/vagrant/rcairo/vendor/local/lib/libfreetype.la /home/vagrant/rcairo/vendor/local/lib/libpng16.la -lgdi32 -lmsimg32 -lz /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libepoxy.la -lopengl32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libgdk-3.
 current=2200
 age=2200
-revision=29
+revision=30
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libgtk-3.la

@@ -17,7 +17,7 @@ old_library=''
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -R/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk3/vendor/local/lib /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libgdk-3.la -L/home/vagrant/ruby-gnome2/pango/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib -lshell32 -ldwmapi -lsetupapi -lcfgmgr32 -L/home/vagrant/ruby-gnome2/atk/vendor/local/lib /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangocairo-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangowin32-1.0.la -lusp10 /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangoft2-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libharfbuzz.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpango-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgthread-2.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libfribidi.la /home/vagrant/rcairo/vendor/local/lib/libcairo-gobject.la /home/vagrant/rcairo/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo/vendor/local/lib/libxml2.la /home/vagrant/rcairo/vendor/local/lib/libfreetype.la -lmsimg32 /home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib/libgdk_pixbuf-2.0.la /home/vagrant/rcairo/vendor/local/lib/libpng16.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgio-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi -lz /home/vagrant/ruby-gnome2/atk/vendor/local/lib/libatk-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib/libffi.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libglib-2.0.la -lws2_32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libpcre.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libiconv.la /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libepoxy.la -lopengl32 -limm32 -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32'
+dependency_libs=' -R/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk3/vendor/local/lib /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libgdk-3.la -L/home/vagrant/ruby-gnome2/pango/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib -L/home/vagrant/ruby-gnome2/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib -lshell32 -ldwmapi -lsetupapi -lcfgmgr32 -L/home/vagrant/ruby-gnome2/atk/vendor/local/lib /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangocairo-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangowin32-1.0.la -lusp10 /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangoft2-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libharfbuzz.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpango-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgthread-2.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libfribidi.la /home/vagrant/rcairo/vendor/local/lib/libcairo-gobject.la /home/vagrant/rcairo/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo/vendor/local/lib/libxml2.la /home/vagrant/rcairo/vendor/local/lib/libfreetype.la -lmsimg32 /home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib/libgdk_pixbuf-2.0.la /home/vagrant/rcairo/vendor/local/lib/libpng16.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgio-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi -lz /home/vagrant/ruby-gnome2/atk/vendor/local/lib/libatk-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib/libffi.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libglib-2.0.la -lws2_32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libpcre.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libiconv.la /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libepoxy.la -lopengl32 -limm32 -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libgtk-3.
 current=2200
 age=2200
-revision=29
+revision=30
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libgtkreftestprivate.la

@@ -17,7 +17,7 @@ old_library=''
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -R/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk3/vendor/local/lib -L/home/vagrant/ruby-gnome2/pango/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libgtk-3.la /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libgdk-3.la -L/home/vagrant/ruby-gnome2/atk/vendor/local/lib -lcomdlg32 -lwinspool -lcomctl32 -limm32 -lshell32 -ldwmapi -lsetupapi -lcfgmgr32 /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangocairo-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangowin32-1.0.la -lusp10 /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangoft2-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libharfbuzz.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpango-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgthread-2.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libfribidi.la /home/vagrant/rcairo/vendor/local/lib/libcairo-gobject.la /home/vagrant/rcairo/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo/vendor/local/lib/libxml2.la /home/vagrant/rcairo/vendor/local/lib/libfreetype.la -lgdi32 -lmsimg32 /home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib/libgdk_pixbuf-2.0.la /home/vagrant/rcairo/vendor/local/lib/libpng16.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgio-2.0.la -ldnsapi -liphlpapi -lz /home/vagrant/ruby-gnome2/atk/vendor/local/lib/libatk-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib/libffi.la /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libepoxy.la -lopengl32 /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgmodule-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libpcre.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libiconv.la'
+dependency_libs=' -R/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk3/vendor/local/lib -L/home/vagrant/ruby-gnome2/pango/vendor/local/lib -L/home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib -L/home/vagrant/ruby-gnome2/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libgtk-3.la /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libgdk-3.la -L/home/vagrant/ruby-gnome2/atk/vendor/local/lib -lcomdlg32 -lwinspool -lcomctl32 -limm32 -lshell32 -ldwmapi -lsetupapi -lcfgmgr32 /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangocairo-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangowin32-1.0.la -lusp10 /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpangoft2-1.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libharfbuzz.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libpango-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgthread-2.0.la /home/vagrant/ruby-gnome2/pango/vendor/local/lib/libfribidi.la /home/vagrant/rcairo/vendor/local/lib/libcairo-gobject.la /home/vagrant/rcairo/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo/vendor/local/lib/libxml2.la /home/vagrant/rcairo/vendor/local/lib/libfreetype.la -lgdi32 -lmsimg32 /home/vagrant/ruby-gnome2/gdk_pixbuf2/vendor/local/lib/libgdk_pixbuf-2.0.la /home/vagrant/rcairo/vendor/local/lib/libpng16.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgio-2.0.la -ldnsapi -liphlpapi -lz /home/vagrant/ruby-gnome2/atk/vendor/local/lib/libatk-1.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/../lib/libffi.la /home/vagrant/ruby-gnome2/gdk3/vendor/local/lib/libepoxy.la -lopengl32 /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgmodule-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libpcre.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libiconv.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

data/vendor/local/lib/pkgconfig/gail-3.0.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: Gail
 Description: GNOME Accessibility Implementation Library
-Version: 3.22.29
+Version: 3.22.30
 Requires: atk gtk+-3.0
 Libs: -L${libdir} -lgailutil-3
 Cflags: -I${includedir}/gail-3.0

data/vendor/local/lib/pkgconfig/gdk-3.0.pc

@@ -6,7 +6,7 @@ targets=win32
 
 Name: GDK
 Description: GTK+ Drawing Kit
-Version: 3.22.29
+Version: 3.22.30
 Requires: pangowin32 pangocairo gdk-pixbuf-2.0 >= 2.30.0 cairo >= 1.14.0 cairo-gobject >= 1.14.0
 Requires.private: gio-2.0 >= 2.49.4     cairo-win32 epoxy >= 1.0 
 Libs: -L${libdir} -lgdk-3  -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi -lsetupapi -lcfgmgr32

data/vendor/local/lib/pkgconfig/gdk-win32-3.0.pc

@@ -6,7 +6,7 @@ targets=win32
 
 Name: GDK
 Description: GTK+ Drawing Kit
-Version: 3.22.29
+Version: 3.22.30
 Requires: pangowin32 pangocairo gdk-pixbuf-2.0 >= 2.30.0 cairo >= 1.14.0 cairo-gobject >= 1.14.0
 Requires.private: gio-2.0 >= 2.49.4     cairo-win32 epoxy >= 1.0 
 Libs: -L${libdir} -lgdk-3  -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi -lsetupapi -lcfgmgr32

data/vendor/local/lib/pkgconfig/gtk+-3.0.pc

@@ -9,7 +9,7 @@ gtk_host=i686-w64-mingw32
 
 Name: GTK+
 Description: GTK+ Graphical UI Library
-Version: 3.22.29
+Version: 3.22.30
 Requires: gdk-3.0 atk >= 2.15.1 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0 gio-2.0 >= 2.49.4
 Requires.private: atk   epoxy >= 1.0
 Libs: -L${libdir} -lgtk-3 

data/vendor/local/lib/pkgconfig/gtk+-win32-3.0.pc

@@ -9,7 +9,7 @@ gtk_host=i686-w64-mingw32
 
 Name: GTK+
 Description: GTK+ Graphical UI Library
-Version: 3.22.29
+Version: 3.22.30
 Requires: gdk-3.0 atk >= 2.15.1 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0 gio-2.0 >= 2.49.4
 Requires.private: atk   epoxy >= 1.0
 Libs: -L${libdir} -lgtk-3 

data/vendor/local/share/aclocal/gtk-3.0.m4

@@ -25,23 +25,15 @@ AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run
 
   no_gtk=""
 
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  PKG_PROG_PKG_CONFIG([0.16])
 
-  if test x$PKG_CONFIG != xno ; then
-    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo "*** pkg-config too old; version 0.7 or better required."
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
+  if test -z "$PKG_CONFIG"; then
     no_gtk=yes
   fi
 
   AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
 
-  if test x$PKG_CONFIG != xno ; then
+  if test -n "$PKG_CONFIG"; then
     ## don't try to run the test against uninstalled libtool libs
     if $PKG_CONFIG --uninstalled $pkg_config_args; then
 	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
@@ -152,7 +144,7 @@ main ()
      ifelse([$2], , :, [$2])
   else
      AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
+     if test -z "$PKG_CONFIG"; then
        echo "*** A new enough version of pkg-config was not found."
        echo "*** See http://pkgconfig.sourceforge.net"
      else
@@ -201,7 +193,8 @@ AC_DEFUN([GTK_CHECK_BACKEND],
   min_gtk_version=ifelse([$2],,3.0.0,$2)
   pkg_config_args="$pkg_config_args >= $min_gtk_version"
 
-  AC_PATH_PROG(PKG_CONFIG, [pkg-config], [AC_MSG_ERROR([No pkg-config found])])
+  PKG_PROG_PKG_CONFIG([0.16])
+  AS_IF([test -z "$PKG_CONFIG"], [AC_MSG_ERROR([No pkg-config found])])
 
   if $PKG_CONFIG $pkg_config_args ; then
     target_found=yes