glib2 3.2.1-x64-mingw32 → 3.2.2-x64-mingw32

data/ext/glib2/rbgobject.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
  *  Copyright (C) 2003,2006  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
@@ -134,6 +134,8 @@ typedef struct {
     RGMarkFunc mark;
     RGFreeFunc free;
     int flags; /* RGObjClassFlag */
+    gchar *name;
+    rb_data_type_t *data_type;
 } RGObjClassInfo;
 
 /* rbgobject.c */
@@ -170,8 +172,17 @@ extern gboolean rbgobj_gc_mark_instance(gpointer instance);
 
 
 /* rbgobj_type.c */
+extern const RGObjClassInfo *rbgobj_class_info_lookup(VALUE klass);
+extern const RGObjClassInfo *rbgobj_class_info_lookup_by_gtype(GType gtype);
+extern RGObjClassInfo *rbgobj_class_info_define(GType gtype,
+                                                const gchar *name,
+                                                VALUE module,
+                                                VALUE parent);
+/* deprecated */
 extern const RGObjClassInfo *rbgobj_lookup_class(VALUE klass);
+/* deprecated */
 extern const RGObjClassInfo *rbgobj_lookup_class_by_gtype(GType gtype, VALUE parent);
+/* deprecated */
 extern const RGObjClassInfo *rbgobj_lookup_class_by_gtype_full(GType gtype,
 							       VALUE parent,
 							       gboolean create_object);

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

@@ -1,6 +1,4 @@
-# -*- ruby -*-
-#
-# Copyright (C) 2013-2015  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
@@ -21,6 +19,7 @@ require "open-uri"
 module GNOME2
   module Rake
     class ExternalPackage < Struct.new(:name,
+                                       :download_name,
                                        :base_name,
                                        :archive_base_name,
                                        :label,
@@ -47,8 +46,13 @@ module GNOME2
         resolve_value(super) || "gz"
       end
 
+      def download_name
+        resolve_value(super) || name
+      end
+
       def base_name
-        resolve_value(super) || "#{name}-#{version}"
+        resolve_value(super) ||
+          "#{name.split('/').last}-#{version.gsub(/\Av/, '')}"
       end
 
       def archive_base_name
@@ -113,6 +117,8 @@ module GNOME2
           latest_version_webkitgtk
         when :icu
           latest_version_icu
+        when :github
+          latest_version_github
         else
           nil
         end
@@ -132,20 +138,23 @@ module GNOME2
         when :gnome
           base_url = gnome_base_url
           release_series = version.gsub(/\A(\d+\.\d+)(?:[^\d].*)?\z/, '\1')
-          base_url << "/#{name}/#{release_series}"
+          base_url << "/#{download_name}/#{release_series}"
         when :freedesktop
           base_url = freedesktop_base_url
-          base_url << "/#{name}/release"
+          base_url << "/#{download_name}/release"
         when :freedesktop_gstreamer
           base_url = freedesktop_gstreamer_base_url
-          base_url << "/#{name}"
+          base_url << "/#{download_name}"
         when :gnu
           base_url = gnu_base_url
-          base_url << "/#{name}"
+          base_url << "/#{download_name}"
         when :webkitgtk
           base_url = webkitgtk_base_url
         when :icu
           base_url = "#{icu_base_url}/#{version}"
+        when :github
+          base_url = github_base_url
+          base_url << "/#{download_name}/releases/download/#{version}"
         else
           base_url = nil
         end
@@ -176,6 +185,10 @@ module GNOME2
         "http://download.icu-project.org/files/icu4c"
       end
 
+      def github_base_url
+        "https://github.com"
+      end
+
       def sort_versions(versions)
         versions.sort_by do |version|
           version.split(".").collect(&:to_i)
@@ -183,7 +196,7 @@ module GNOME2
       end
 
       def latest_version_gnome
-        base_url = "#{gnome_base_url}/#{name}"
+        base_url = "#{gnome_base_url}/#{download_name}"
         minor_versions = []
         open(base_url) do |index|
           index.read.scan(/<a (.+?)>/) do |content,|
@@ -217,7 +230,7 @@ module GNOME2
       end
 
       def latest_version_freedesktop
-        base_url = "#{freedesktop_base_url}/#{name}/release"
+        base_url = "#{freedesktop_base_url}/#{download_name}/release"
         versions = []
         open(base_url) do |index|
           index.read.scan(/<a (.+?)>/) do |content,|
@@ -233,7 +246,7 @@ module GNOME2
       end
 
       def latest_version_freedesktop_gstreamer
-        base_url = "#{freedesktop_gstreamer_base_url}/#{name}"
+        base_url = "#{freedesktop_gstreamer_base_url}/#{download_name}"
         versions = []
         open(base_url) do |index|
           index.read.scan(/<a (.+?)>/) do |content,|
@@ -255,7 +268,7 @@ module GNOME2
       end
 
       def latest_version_gnu
-        base_url = "#{gnu_base_url}/#{name}"
+        base_url = "#{gnu_base_url}/#{download_name}"
         versions = []
         open(base_url) do |index|
           index.read.scan(/<a (.+?)>/) do |content,|
@@ -301,6 +314,13 @@ module GNOME2
         sort_versions(versions).last
       end
 
+      def latest_version_github
+        latest_url = "#{github_base_url}/#{download_name}/releases/latest"
+        open(latest_url) do |latest_page|
+          return latest_page.base_uri.path.split("/").last
+        end
+      end
+
       class WindowsConfiguration < Struct.new(:build,
                                               :include_paths,
                                               :library_paths,

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

@@ -49,32 +49,7 @@ module GNOME2
       private
       def define_build_tasks
         namespace :build do
-          prepare_task_names = []
-          namespace :prepare do
-            prepare_task_names << "pkg_config"
-            task :pkg_config do
-              depended_packages = @package.windows.build_dependencies
-              use_packages = [@package.name] + depended_packages
-              pkg_config_path = use_packages.collect do |package|
-                "../#{package}/#{@package.windows.relative_binary_dir}/lib/pkgconfig"
-              end
-              ENV["PKG_CONFIG_PATH"] = pkg_config_path.collect do |path|
-                File.expand_path(path)
-              end.join(":")
-              ENV["PKG_CONFIG_LIBDIR"] = rcairo_pkgconfig_path
-            end
-
-            prepare_task_names << "pkg_config_for_build"
-            task :pkg_config_for_build do
-              # XXX: Is it needless?
-              # ENV["PKG_CONFIG_FOR_BUILD"] = "env - pkg-config"
-            end
-          end
-
-          full_prepare_task_names = prepare_task_names.collect do |name|
-            "windows:builder:build:prepare:#{name}"
-          end
-          task :prepare => full_prepare_task_names
+          task :prepare
 
           build_packages.each do |package|
             namespace package.name do
@@ -118,6 +93,7 @@ module GNOME2
           sh("tar", "xf", tar_full_path.to_s)
         end
 
+        env = build_env
         package_dir_path =
           package_tmp_dir + package.base_name + package.base_dir_in_package
         Dir.chdir(package_dir_path.to_s) do
@@ -137,30 +113,29 @@ module GNOME2
             make_n_jobs = ENV["MAKE_N_JOBS"]
             build_make_args << "-j#{make_n_jobs}" if make_n_jobs
           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"
+          # env["GI_SCANNER_DEBUG"] = "save-temps"
           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),
+              meson(env, package, source_dir)
+              sh(env.merge(make_args_to_env(build_make_args)),
                  "nice", "ninja") or exit(false)
-              sh(make_args_to_env(install_make_args),
+              sh(env.merge(make_args_to_env(install_make_args)),
                  "ninja", "install") or exit(false)
             end
           else
             if File.exist?("Makefile.in")
-              configure(package)
+              configure(env, package)
             else
-              cmake(package)
+              cmake(env, 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)
+            sh(env, "nice", "make", *build_make_args) or exit(false)
+            sh(env, "make", "install", *install_make_args) or exit(false)
           end
 
           package_license_dir = license_dir + package.name
@@ -182,20 +157,46 @@ module GNOME2
         end
       end
 
-      def configure(package)
-        sh("./autogen.sh") if package.windows.need_autogen?
-        sh("autoreconf", "--install", "--force") if package.windows.need_autoreconf?
-        sh("./configure",
+      def build_env
+        path = "#{g_ir_scanner_bin_dir}:#{ENV["PATH"]}"
+        env = {
+          "GI_HOST_OS" => "nt",
+          "MSYSTEM" => "MINGW64",
+          "GREP_OPTIONS" => "--text",
+          "PATH" => path,
+        }
+        depended_packages = @package.windows.build_dependencies
+        use_packages = [@package.name] + depended_packages
+        pkg_config_path = use_packages.collect do |package|
+          "../#{package}/#{@package.windows.relative_binary_dir}/lib/pkgconfig"
+        end
+        env["PKG_CONFIG_PATH"] = pkg_config_path.collect do |path|
+          File.expand_path(path)
+        end.join(":")
+        env["PKG_CONFIG_LIBDIR"] = rcairo_pkgconfig_path
+        env
+      end
+
+      def configure(env, package)
+        sh(env, "./autogen.sh") if package.windows.need_autogen?
+        if package.windows.need_autoreconf?
+          sh(env, "autoreconf", "--install", "--force")
+        end
+        sh(env, "env")
+        sh(env,
+           "./configure",
            cc_env(package),
            dlltool_env,
            "CPPFLAGS=#{cppflags(package)}",
            "LDFLAGS=#{ldflags(package)}",
            "--prefix=#{dist_dir}",
            "--host=#{@package.windows.build_host}",
+           # "--target=#{@package.windows.build_host}",
+           # "--build=x86_64-pc-linux-gnu",
            *package.windows.configure_args) or exit(false)
       end
 
-      def meson(package, source_dir)
+      def meson(env, package, source_dir)
         cross_file = Tempfile.new("meson-cross-file")
         cross_file.puts(<<-CROSS_FILE)
 [host_machine]
@@ -213,21 +214,22 @@ 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),
-           },
+        sh(env.merge({
+                       "CPPFLAGS" => cppflags(package),
+                       "LDFLAGS" => ldflags(package),
+                     }),
            "meson",
            source_dir,
            ".",
            "--prefix=#{dist_dir}",
+           "--libdir=lib",
            "--cross-file=#{cross_file.path}",
            *package.windows.meson_args) or exit(false)
       end
 
-      def cmake(package)
-        sh("cmake",
+      def cmake(env, package)
+        sh(env,
+           "cmake",
            ".",
            "-DCMAKE_INSTALL_PREFIX=#{dist_dir}",
            "-DCMAKE_SYSTEM_NAME=Windows",
@@ -270,8 +272,7 @@ pkgconfig = '/usr/bin/pkg-config'
       end
 
       def rcairo_dir
-        suffix = @package.windows.build_architecture_suffix
-        @package.project_root_dir.parent + "rcairo.#{suffix}"
+        @package.project_root_dir.parent + "rcairo"
       end
 
       def rcairo_pkgconfig_path

data/lib/mkmf-gnome2.rb

@@ -431,17 +431,7 @@ end
 def check_cairo(options={})
   rcairo_source_dir = options[:rcairo_source_dir]
   if rcairo_source_dir.nil?
-    suffix = nil
-    if windows_platform?
-      case RUBY_PLATFORM
-      when /\Ax86-mingw/
-        suffix = "win32"
-      when /\Ax64-mingw/
-        suffix = "win64"
-      end
-    end
     rcairo_source_base_dir = "rcairo"
-    rcairo_source_base_dir << ".#{suffix}" if suffix
     top_dir = options[:top_dir]
     if top_dir
       rcairo_source_dir = File.join(top_dir, "..", rcairo_source_base_dir)

data/vendor/local/bin/gdbus-codegen

@@ -37,7 +37,19 @@ else:
     # parent directory to the python path.
     path = os.path.join(filedir, '..')
 
-sys.path.insert(0, os.path.abspath(path))
+# Canonicalize, then do further testing
+path = os.path.abspath(path)
+
+# If the above path detection failed, use the hard-coded datadir. This can
+# happen when, for instance, bindir and datadir are not in the same prefix or
+# on Windows where we cannot make any guarantees about the directory structure.
+#
+# In these cases our installation cannot be relocatable, but at least we should
+# be able to find the codegen module.
+if not os.path.isfile(os.path.join(path, 'codegen', 'codegen_main.py')):
+    path = os.path.join('/home/vagrant/ruby-gnome2/glib2/vendor/local/share', 'glib-2.0')
+
+sys.path.insert(0, path)
 from codegen import codegen_main
 
 sys.exit(codegen_main.codegen_main())

data/vendor/local/bin/glib-genmarshal

@@ -22,7 +22,7 @@ import os
 import re
 import sys
 
-VERSION_STR = '''glib-genmarshal version 2.54.1
+VERSION_STR = '''glib-genmarshal version 2.56.0
 glib-genmarshal comes with ABSOLUTELY NO WARRANTY.
 You may redistribute copies of glib-genmarshal under the terms of
 the GNU General Public License which can be found in the
@@ -162,9 +162,17 @@ def print_info(msg):
     print_color(msg, color=Color.GREEN, prefix='INFO')
 
 
+def generate_licensing_comment(outfile):
+    outfile.write('/* This file is generated by glib-genmarshal, do not '
+                  'modify it. This code is licensed under the same license as '
+                  'the containing project. Note that it links to GLib, so '
+                  'must comply with the LGPL linking clauses. */\n')
+
+
 def generate_header_preamble(outfile, prefix='', std_includes=True, use_pragma=False):
     '''Generate the preamble for the marshallers header file'''
-    outfile.write('/* This file is generated, all changes will be lost */\n')
+    generate_licensing_comment(outfile)
+
     if use_pragma:
         outfile.write('#pragma once\n')
         outfile.write('\n')
@@ -193,6 +201,8 @@ def generate_header_postamble(outfile, prefix='', use_pragma=False):
 
 def generate_body_preamble(outfile, std_includes=True, include_headers=None, cpp_defines=None, cpp_undefines=None):
     '''Generate the preamble for the marshallers source file'''
+    generate_licensing_comment(outfile)
+
     for header in (include_headers or []):
         outfile.write('#include "{}"\n'.format(header))
     if include_headers:
@@ -1024,19 +1034,20 @@ if __name__ == '__main__':
             elif args.body:
                 if args.verbose:
                     print_info('Generating definition for {}'.format(line.strip()))
-                if compatibility_mode:
-                    generate_std_alias = False
-                    if args.stdinc:
-                        std_marshaller = generate_marshaller_name(STD_PREFIX, retval, params)
-                        if std_marshaller in GOBJECT_MARSHALLERS:
-                            if args.verbose:
-                                print_info('Skipping default marshaller {}'.format(line.strip()))
-                            generate_std_alias = True
+                generate_std_alias = False
+                if args.stdinc:
+                    std_marshaller = generate_marshaller_name(STD_PREFIX, retval, params)
+                    if std_marshaller in GOBJECT_MARSHALLERS:
+                        if args.verbose:
+                            print_info('Skipping default marshaller {}'.format(line.strip()))
+                        generate_std_alias = True
                 marshaller = generate_marshaller_name(args.prefix, retval, params)
-                if compatibility_mode and generate_std_alias:
-                    generate_marshaller_alias(args.output, marshaller, std_marshaller,
-                                              source_location=location,
-                                              include_va=args.valist_marshallers)
+                if generate_std_alias:
+                    # We need to generate the alias if we are in compatibility mode
+                    if compatibility_mode:
+                        generate_marshaller_alias(args.output, marshaller, std_marshaller,
+                                                  source_location=location,
+                                                  include_va=args.valist_marshallers)
                 else:
                     generate_marshallers_body(args.output, retval, params,
                                               prefix=args.prefix,