glib2 3.3.5 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 850b247e82c86d02a35c85cf8d1aaee52e9d70e6110b0c396d9aefd8790b5091
-  data.tar.gz: fc56bbd50779dfdc0ec2e4988b9520dc03d1db1df02b2d951e629c9970ca85dc
+  metadata.gz: 6000c75c32082135d97743216ec310e05ef4c89ea66ee3f67706a0448195794a
+  data.tar.gz: 5133d35c621fbd5e4c936fbab7129a14d5c4c46d292cb341b2ac5139204a1162
 SHA512:
-  metadata.gz: 2db84e8af48258d0af296234343855018056858752243d2344d743e8db202854642082734817888b31b68a08308eb8b6a9d9601e33746ce40e7aa9baec352f44
-  data.tar.gz: b7de7750096509f6e959944c7399e948379396519b5ea42f809ce6e913116661211d039c36b9a017630b46dbe82dde6a6f1b48416dfa282b3b5c8cb099fd2b6a
+  metadata.gz: 71a773116025f627c8c5d7dfb928cfe3a7023925d988057bd7855385518ff218f88aaa68bbe10d9ae2ed8444c71889ea90926caa191703129ffbfd0f01cfc125
+  data.tar.gz: fad1f907ec5cf31204a41545c5873bbbd03566f578465e52ff6ceaecba8a0deaa7beaa82c00ade674d7876d5c68caf70be6177b5ef6a49d2ff50a555b506d313

data/ext/glib2/rbglib.h

@@ -36,7 +36,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 3
 #define RBGLIB_MINOR_VERSION 3
-#define RBGLIB_MICRO_VERSION 5
+#define RBGLIB_MICRO_VERSION 6
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC

data/lib/mkmf-gnome2.rb

@@ -190,16 +190,6 @@ def add_depend_package_path(target_name, target_source_dir, target_build_dir)
     $INCFLAGS = "-I#{target_source_dir} #{$INCFLAGS}"
   end
 
-  if windows_platform?
-    target_base_dir = Pathname.new(target_source_dir).parent.parent
-    target_binary_base_dir = target_base_dir + "vendor" + "local"
-    if target_binary_base_dir.exist?
-      $INCFLAGS = "-I#{target_binary_base_dir}/include #{$INCFLAGS}"
-      target_pkg_config_dir = target_binary_base_dir + "lib" + "pkgconfig"
-      PKGConfig.add_path(target_pkg_config_dir.to_s)
-    end
-  end
-
   return unless File.exist?(target_build_dir)
   if target_source_dir != target_build_dir
     $INCFLAGS = "-I#{target_build_dir} #{$INCFLAGS}"
@@ -436,19 +426,15 @@ def check_cairo(options={})
   end
 
   unless rcairo_source_dir.nil?
-    if windows_platform?
-      options = {}
-      build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}"
-      if File.exist?(File.join(rcairo_source_dir, build_dir))
-        options[:target_build_dir] = build_dir
-      end
-      add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options)
-      $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
+    options = {}
+    build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}"
+    if File.exist?(File.join(rcairo_source_dir, build_dir))
+      options[:target_build_dir] = build_dir
     end
-    $INCFLAGS += " -I#{rcairo_source_dir}/ext/cairo"
+    add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options)
   end
 
-  PKGConfig.have_package('cairo') and have_header('rb_cairo.h')
+  PKGConfig.have_package("cairo") and have_header("rb_cairo.h")
 end
 
 def install_missing_native_package(native_package_info)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.3.6
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config