glib2 3.1.8 → 3.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f45d4e148fd64d2406fd51ab2b95504c21bbf3d
-  data.tar.gz: 1454d6783265e478f6889d4c9b2a9c6ed7f3f29d
+  metadata.gz: c1c8eb28db7aee6ac06f5a721e2f16b7c49e1d9f
+  data.tar.gz: 98d3afb3b78d83dc43a9a57d308cf9308b8a31a5
 SHA512:
-  metadata.gz: 277661596c6b0efda513736a9f1bbceda1e8828d9f02faa9576bc2ffec5237e60dbfc64395b9ed4173763f58b9404fe2318e37a63e22949ff8ae1dda39854255
-  data.tar.gz: 30bff9269886f0d45a210373e75cb74d6a0dca59679eaaa664f1506b401e1b5badefa0f91d4ce8a54d3a920bf883639e076c42971fc17a38e24be5f3ef9d74c9
+  metadata.gz: 0fdd234ca217c0ac8a5a193b8b10baf64506a116c0838fe43ee70e996531ff16ec0f4a7beb96e40c529a7abd9d188d9ebe2aa9f57979e8258a6bb0364e49bf36
+  data.tar.gz: 5585355516dee22a8f55c8c78fc5e38ee5e4dcb8755570947b57c71a8b25230a17c27b7a2c62a6f37b9ffb4789bb91e744f304b6bd86d23c139c14af5571f134

data/Rakefile

@@ -88,12 +88,12 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.52.3",
+      :version => "2.54.1",
       :compression_method => "xz",
       :windows => {
         :need_autoreconf => true,
         :patches => [
-          "glib-2.48.0-add-missing-exeext.diff",
+          "glib-2.54.1-add-missing-exeext.diff",
         ],
         :built_file => "bin/libglib-2.0-0.dll",
       },
@@ -171,7 +171,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib-networking",
       :download_site => :gnome,
       :label => "glib-networking",
-      :version => "2.50.0",
+      :version => "2.54.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -185,7 +185,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
   ]
   package.cross_compiling do |spec|
     if /mingw|mswin/ =~ spec.platform.to_s
-      spec.add_runtime_dependency("cairo", ">= 1.12.8")
+      spec.add_runtime_dependency("cairo", ">= 1.15.9")
     end
   end
 end

data/ext/glib2/rbglib.h

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

data/lib/gnome2/rake/external-package.rb

@@ -305,6 +305,7 @@ module GNOME2
                                               :include_paths,
                                               :library_paths,
                                               :configure_args,
+                                              :meson_args,
                                               :cmake_args,
                                               :cc_args,
                                               :patches,
@@ -338,6 +339,10 @@ module GNOME2
           super || []
         end
 
+        def meson_args
+          super || []
+        end
+
         def cmake_args
           super || []
         end

data/lib/gnome2/rake/windows-binary-build-task.rb

@@ -4,6 +4,8 @@
 
 require "open-uri"
 require "pathname"
+require "tempfile"
+require "tmpdir"
 
 module GNOME2
   module Rake
@@ -122,11 +124,6 @@ module GNOME2
           package.windows.patches.each do |patch|
             sh("patch -p1 < #{@package.patches_dir}/#{patch}")
           end
-          if File.exist?("configure")
-            configure(package)
-          else
-            cmake(package)
-          end
           common_make_args = []
           common_make_args << "MAKE=make"
           common_make_args << "GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
@@ -142,11 +139,29 @@ module GNOME2
           end
           ENV["GREP_OPTIONS"] = "--text"
           # ENV["GI_SCANNER_DEBUG"] = "save-temps"
-          # build_make_args << "--debug"
-          # build_make_args << "V=1"
-          # build_make_args << "VERBOSE=1"
-          sh("nice", "make", *build_make_args) or exit(false)
-          sh("make", "install", *install_make_args) or exit(false)
+          if File.exist?("meson.build") and not File.exist?("Makefile.am")
+            source_dir = Dir.pwd
+            build_dir = "build"
+            mkdir_p(build_dir)
+            Dir.chdir(build_dir) do
+              meson(package, source_dir)
+              sh(make_args_to_env(build_make_args),
+                 "nice", "ninja") or exit(false)
+              sh(make_args_to_env(install_make_args),
+                 "ninja", "install") or exit(false)
+            end
+          else
+            if File.exist?("Makefile.in")
+              configure(package)
+            else
+              cmake(package)
+            end
+            # build_make_args << "--debug"
+            # build_make_args << "V=1"
+            # build_make_args << "VERBOSE=1"
+            sh("nice", "make", *build_make_args) or exit(false)
+            sh("make", "install", *install_make_args) or exit(false)
+          end
 
           package_license_dir = license_dir + package.name
           mkdir_p(package_license_dir)
@@ -180,6 +195,37 @@ module GNOME2
            *package.windows.configure_args) or exit(false)
       end
 
+      def meson(package, source_dir)
+        cross_file = Tempfile.new("meson-cross-file")
+        cross_file.puts(<<-CROSS_FILE)
+[host_machine]
+system = 'windows'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'littel'
+
+[binaries]
+c = '/usr/bin/#{cc(package)}'
+cpp = '/usr/bin/#{cxx(package)}'
+ar = '/usr/bin/#{ar}'
+strip = '/usr/bin/#{strip}'
+dlltool = '/usr/bin/#{dlltool}'
+pkgconfig = '/usr/bin/pkg-config'
+        CROSS_FILE
+        cross_file.close
+        sh({
+             "PATH" => "#{g_ir_scanner_bin_dir}:#{ENV["PATH"]}",
+             "CPPFLAGS" => cppflags(package),
+             "LDFLAGS" => ldflags(package),
+           },
+           "meson",
+           source_dir,
+           ".",
+           "--prefix=#{dist_dir}",
+           "--cross-file=#{cross_file.path}",
+           *package.windows.meson_args) or exit(false)
+      end
+
       def cmake(package)
         sh("cmake",
            ".",
@@ -255,10 +301,27 @@ module GNOME2
         cxx_command_line.compact.join(" ")
       end
 
+      def ar
+        "#{@package.windows.build_host}-ar"
+      end
+
+      def strip
+        "#{@package.windows.build_host}-strip"
+      end
+
       def dlltool
         "#{@package.windows.build_host}-dlltool"
       end
 
+      def g_ir_scanner_bin_dir
+        "#{@package.project_root_dir}/gobject-introspection/" +
+          "#{@package.native.relative_binary_dir}/bin"
+      end
+
+      def g_ir_scanner
+        "#{g_ir_scanner_bin_dir}/g-ir-scanner"
+      end
+
       def cppflags(package)
         include_paths = package.windows.include_paths
         if @package.windows.build_dependencies.include?("glib2")
@@ -300,11 +363,18 @@ module GNOME2
         paths
       end
 
+      def make_args_to_env(make_args)
+        env = {}
+        make_args.each do |arg|
+          key, value = arg.split("=", 2)
+          env[key] = value
+        end
+        env
+      end
+
       def add_gobject_introspection_make_args(package, common_make_args)
         return unless use_gobject_introspection?(package)
 
-        g_ir_scanner = "#{@package.project_root_dir}/gobject-introspection/"
-        g_ir_scanner << "#{@package.native.relative_binary_dir}/bin/g-ir-scanner"
         introspection_scanner = "INTROSPECTION_SCANNER=#{g_ir_scanner}"
         common_make_args << introspection_scanner
 

data/test/run-test.rb

@@ -22,7 +22,7 @@ top = File.expand_path(File.join(base, ".."))
 $LOAD_PATH.unshift(top)
 require 'test/glib-test-init'
 
-if system("which make > /dev/null")
+if File.exist?("#{top}/Makefile") and system("which make > /dev/null")
   system("cd #{top.dump} && make > /dev/null") or exit(1)
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.1.8
+  version: 3.1.9
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-15 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Ruby/GLib2 is a Ruby binding of GLib-2.x.