glib2 3.3.2 → 3.3.3

data/ext/glib2/rbgobj_valuearray.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
  *  Copyright (C) 2006  Sjoerd Simons
  *
  *  This library is free software; you can redistribute it and/or
@@ -83,7 +83,7 @@ value_array_from_ruby(const VALUE from, GValue *to)
 
     args.ary = rb_ary_to_ary(from);
     args.n = RARRAY_LEN(args.ary);
-    args.result = g_value_array_new(args.n);
+    args.result = g_value_array_new((guint)args.n);
 
     rb_rescue(value_array_from_ruby_body, (VALUE)&args,
               value_array_from_ruby_rescue, (VALUE)&args);

data/ext/glib2/rbgutil_list.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  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
@@ -181,7 +181,7 @@ rval2glist_body(VALUE data)
 {
     struct rval2glist_args *args = (struct rval2glist_args *)data;
     VALUE rb_array;
-    int i, n;
+    long i, n;
 
     rb_array = rbg_to_array(args->rb_array);
     n = RARRAY_LEN(rb_array);
@@ -229,7 +229,7 @@ rval2gslist_body(VALUE data)
 {
     struct rval2gslist_args *args = (struct rval2gslist_args *)data;
     VALUE rb_array;
-    int i, n;
+    long i, n;
 
     rb_array = rbg_to_array(args->rb_array);
     n = RARRAY_LEN(rb_array);

data/glib2.gemspec

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2018-2019  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
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.files += Dir.glob("sample/**/*")
   s.files += Dir.glob("test/**/*")
 
-  s.add_runtime_dependency("pkg-config", ">= 1.2.2")
+  s.add_runtime_dependency("pkg-config", ">= 1.3.5")
   s.add_runtime_dependency("native-package-installer", ">= 1.0.3")
   s.add_development_dependency("test-unit", ">= 2")
 

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2019  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
@@ -14,8 +14,6 @@
 # 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 "open-uri"
-
 module GNOME2
   module Rake
     class ExternalPackage < Struct.new(:name,
@@ -104,24 +102,8 @@ module GNOME2
       end
 
       def latest_version
-        case download_site
-        when :gnome
-          latest_version_gnome
-        when :freedesktop
-          latest_version_freedesktop
-        when :freedesktop_gstreamer
-          latest_version_freedesktop_gstreamer
-        when :gnu
-          latest_version_gnu
-        when :webkitgtk
-          latest_version_webkitgtk
-        when :icu
-          latest_version_icu
-        when :github
-          latest_version_github
-        else
-          nil
-        end
+        warn("this feature is no longer supported.")
+        nil
       end
 
       private
@@ -133,194 +115,6 @@ module GNOME2
         end
       end
 
-      def download_site_base_url
-        case download_site
-        when :gnome
-          base_url = gnome_base_url
-          release_series = version.gsub(/\A(\d+\.\d+)(?:[^\d].*)?\z/, '\1')
-          base_url << "/#{download_name}/#{release_series}"
-        when :freedesktop
-          base_url = freedesktop_base_url
-          base_url << "/#{download_name}/release"
-        when :freedesktop_gstreamer
-          base_url = freedesktop_gstreamer_base_url
-          base_url << "/#{download_name}"
-        when :gnu
-          base_url = gnu_base_url
-          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
-        base_url
-      end
-
-      def gnome_base_url
-        "http://ftp.gnome.org/pub/gnome/sources"
-      end
-
-      def freedesktop_base_url
-        "https://www.freedesktop.org/software"
-      end
-
-      def freedesktop_gstreamer_base_url
-        "https://gstreamer.freedesktop.org/src"
-      end
-
-      def gnu_base_url
-        "https://ftp.gnu.org/pub/gnu"
-      end
-
-      def webkitgtk_base_url
-        "https://webkitgtk.org/releases"
-      end
-
-      def icu_base_url
-        "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)
-        end
-      end
-
-      def latest_version_gnome
-        base_url = "#{gnome_base_url}/#{download_name}"
-        minor_versions = []
-        open(base_url) do |index|
-          index.read.scan(/<a (.+?)>/) do |content,|
-            case content
-            when /href="(\d+(?:\.\d+)*)\/?"/
-              minor_version = $1
-              next if development_minor_version_gnome?(minor_version)
-              minor_versions << minor_version
-            end
-          end
-        end
-        return nil if minor_versions.empty?
-
-        latest_minor_version = sort_versions(minor_versions).last
-        versions = []
-        open("#{base_url}/#{latest_minor_version}") do |index|
-          index.read.scan(/<a (.+?)>/) do |content,|
-            case content
-            when /href="#{Regexp.escape(name)}-
-                        (\d+(?:\.\d+)*)
-                        \.tar\.#{Regexp.escape(compression_method)}"/x
-              versions << $1
-            end
-          end
-        end
-        sort_versions(versions).last
-      end
-
-      def development_minor_version_gnome?(minor_version)
-        minor_version.split(".").last.to_i.odd?
-      end
-
-      def latest_version_freedesktop
-        base_url = "#{freedesktop_base_url}/#{download_name}/release"
-        versions = []
-        open(base_url) do |index|
-          index.read.scan(/<a (.+?)>/) do |content,|
-            case content
-            when /href="#{Regexp.escape(name)}-
-                        (\d+(?:\.\d+)*)
-                        \.tar\.#{Regexp.escape(compression_method)}"/x
-              versions << $1
-            end
-          end
-        end
-        sort_versions(versions).last
-      end
-
-      def latest_version_freedesktop_gstreamer
-        base_url = "#{freedesktop_gstreamer_base_url}/#{download_name}"
-        versions = []
-        open(base_url) do |index|
-          index.read.scan(/<a (.+?)>/) do |content,|
-            case content
-            when /href="#{Regexp.escape(name)}-
-                        (\d+(?:\.\d+)*)
-                        \.tar\.#{Regexp.escape(compression_method)}"/x
-              version = $1
-              next if development_version_freedesktop_gstreamer?(version)
-              versions << version
-            end
-          end
-        end
-        sort_versions(versions).last
-      end
-
-      def development_version_freedesktop_gstreamer?(version)
-        version.split(".")[1].to_i.odd?
-      end
-
-      def latest_version_gnu
-        base_url = "#{gnu_base_url}/#{download_name}"
-        versions = []
-        open(base_url) do |index|
-          index.read.scan(/<a (.+?)>/) do |content,|
-            case content
-            when /href="#{Regexp.escape(name)}-
-                        (\d+(?:\.\d+)*)
-                        \.tar\.#{Regexp.escape(compression_method)}"/x
-              version = $1
-              versions << version
-            end
-          end
-        end
-        sort_versions(versions).last
-      end
-
-      def latest_version_webkitgtk
-        base_url = webkitgtk_base_url
-        versions = []
-        open(base_url) do |index|
-          index.read.scan(/<a (.+?)>/) do |content,|
-            case content
-            when /href="#{Regexp.escape(name)}-
-                        (\d+(?:\.\d+)*)
-                        \.tar\.#{Regexp.escape(compression_method)}"/x
-              versions << $1
-            end
-          end
-        end
-        sort_versions(versions).last
-      end
-
-      def latest_version_icu
-        base_url = icu_base_url
-        versions = []
-        open(base_url) do |index|
-          index.read.scan(/<a (.+?)>/) do |content,|
-            case content
-            when /href="(\d+(?:\.\d+)+)\/"/x
-              versions << $1
-            end
-          end
-        end
-        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/native-binary-build-task.rb

@@ -1,6 +1,4 @@
-# -*- ruby -*-
-#
-# Copyright (C) 2013-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2019  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
@@ -16,107 +14,14 @@
 # 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 "rake"
-
 module GNOME2
   module Rake
     class NativeBinaryBuildTask
-      include ::Rake::DSL
-
       def initialize(package)
         @package = package
       end
 
       def define
-        namespace :native do
-          namespace :builder do
-            task :before
-            define_build_tasks
-            build_tasks = build_packages.collect do |package|
-              "native:builder:build:#{package.name}"
-            end
-            task :build => build_tasks
-            task :after
-          end
-
-          desc "Build binaries for build environment"
-          task :build => [
-            "native:builder:before",
-            "native:builder:build",
-            "native:builder:after",
-          ]
-        end
-      end
-
-      private
-      def define_build_tasks
-        namespace :build do
-          build_packages.each do |package|
-            namespace package.name do
-              download_task = "source:downloader:download:#{package.name}"
-              built_file = package.native.built_file
-              if built_file
-                built_file = dist_dir + built_file
-                file built_file.to_s do
-                  ::Rake::Task[download_task].invoke
-                  build_package_task_body(package)
-                end
-                task :build => built_file.to_s
-              else
-                task :build => [download_task] do
-                  build_package_task_body(package)
-                end
-              end
-            end
-            desc "Build #{package.label} and install it into #{dist_dir}."
-            task package.name => "native:builder:build:#{package.name}:build"
-          end
-        end
-      end
-
-      def build_package_task_body(package)
-        package_tmp_dir = @package.tmp_dir + "native" + package.name
-        rm_rf(package_tmp_dir)
-        mkdir_p(package_tmp_dir)
-
-        tar_full_path = @package.download_dir + package.archive_base_name
-        Dir.chdir(package_tmp_dir.to_s) do
-          sh("tar", "xf", tar_full_path.to_s) or exit(false)
-        end
-
-        package_dir_path =
-          package_tmp_dir + package.base_name + package.base_dir_in_package
-        Dir.chdir(package_dir_path.to_s) do
-          package.native.patches.each do |patch|
-            sh("patch -p1 < #{@package.patches_dir}/#{patch}")
-          end
-          build_dir = "build"
-          env = []
-          env << "PKG_CONFIG_PATH=#{pkg_config_path}"
-          env << "GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
-          sh("env",
-             *env,
-             "meson",
-             build_dir,
-             "--prefix=#{dist_dir}",
-             "--libdir=lib") or exit(false)
-          sh("env", *env, "nice", "ninja", "-C", build_dir) or exit(false)
-          sh("env", *env, "ninja", "-C", build_dir, "install") or exit(false)
-        end
-      end
-
-      def build_packages
-        @package.external_packages.select do |package|
-          package.native.build?
-        end
-      end
-
-      def dist_dir
-        @package.native.absolute_binary_dir
-      end
-
-      def pkg_config_path
-        dist_dir + "lib/pkgconfig"
       end
     end
   end

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

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-# Copyright(C) 2011-2015 Ruby-GNOME2 Project.
+# Copyright(C) 2011-2019 Ruby-GNOME2 Project.
 #
 # This program is licenced under the same license of Ruby-GNOME2.
 
@@ -9,7 +7,6 @@ require "pathname"
 
 require "rubygems"
 require "rubygems/package_task"
-require "rake/extensiontask"
 require "gnome2/rake/package"
 require "gnome2/rake/external-package"
 require "gnome2/rake/source-download-task"
@@ -48,15 +45,13 @@ module GNOME2
       end
 
       def cross_compiling(&block)
+        warn("cross compile support is dropped.")
         @cross_compiling_hooks << block
       end
 
       def define
         task :default => :build
         define_spec
-        define_source_tasks
-        define_native_tasks
-        define_windows_tasks
         define_package_tasks
       end
 
@@ -127,12 +122,9 @@ module GNOME2
         @dependency_configuration = DependencyConfiguration.new(self)
       end
 
-      def cross_platform
-        "#{windows.build_architecture}-mingw32"
-      end
-
       def define_spec
         @spec ||= Gem::Specification.new do |s|
+          warn("spec generation is deprecated. Use .gemspec instead.")
           s.name                  = @name
           s.summary               = @summary
           s.description           = @description
@@ -161,146 +153,6 @@ module GNOME2
         end
       end
 
-      def define_source_tasks
-        define_source_download_tasks
-      end
-
-      def define_source_download_tasks
-        task = SourceDownloadTask.new(@package)
-        task.define
-      end
-
-      def define_native_tasks
-        define_native_build_tasks
-      end
-
-      def define_native_build_tasks
-        task = NativeBinaryBuildTask.new(@package)
-        task.define
-      end
-
-      def define_windows_tasks
-        define_windows_extension_task
-        define_windows_download_task
-        define_windows_build_task
-        define_windows_version_update_task
-      end
-
-      def so_base_name
-        @name.gsub(/-/, "_")
-      end
-
-      def define_windows_extension_task
-        ::Rake::ExtensionTask.new(so_base_name, @spec) do |ext|
-          ext.cross_platform = cross_platform
-          ext.ext_dir = "ext/#{@name}"
-          ext.cross_compile = true
-          ext.cross_compiling do |spec|
-            if /mingw|mswin/ =~ spec.platform.to_s
-              spec.metadata.delete("msys2_mingw_dependencies")
-
-              windows_binary_dir = @package.windows.relative_binary_dir
-              windows_files = []
-              if windows_binary_dir.exist?
-                Find.find(windows_binary_dir.to_s) do |path|
-                  next unless File.file?(path)
-                  next if /\.zip\z/ =~ path
-                  windows_files << path
-                end
-              end
-              spec.files += windows_files
-              stage_path = "#{ext.tmp_dir}/#{ext.cross_platform}/stage"
-              windows_files.each do |windows_file|
-                stage_windows_file = "#{stage_path}/#{windows_file}"
-                stage_windows_binary_dir = File.dirname(stage_windows_file)
-                directory stage_windows_binary_dir
-                stage_windows_file_dependencies = [
-                  stage_windows_binary_dir,
-                  windows_file,
-                ]
-                file stage_windows_file => stage_windows_file_dependencies do
-                  cp windows_file, stage_windows_file
-                end
-              end
-            end
-            @cross_compiling_hooks.each do |hook|
-              hook.call(spec)
-            end
-          end
-        end
-
-        extconf_rb = "ext/#{@name}/extconf.rb"
-        unless File.exist?(extconf_rb)
-          native_task_name = "native:#{@name}:#{cross_platform}"
-          if ::Rake::Task.task_defined?(native_task_name)
-            ::Rake::Task[native_task_name].prerequisites.clear
-          end
-        end
-      end
-
-      def define_windows_download_task
-        task = WindowsBinaryDownloadTask.new(@package)
-        task.define
-      end
-
-      def define_windows_build_task
-        windows_binary_build_task.define
-      end
-
-      def define_windows_version_update_task
-        namespace :windows do
-          namespace :version do
-            task_names = []
-            namespace :update do
-              @package.external_packages.each do |package|
-                task_names << package.name
-                task package.name do
-                  latest_version = package.latest_version || package.version
-                  if package.version != latest_version
-                    update_package_version(package, latest_version)
-                  end
-                end
-              end
-            end
-
-            full_task_names = task_names.collect do |name|
-              "windows:version:update:#{name}"
-            end
-            desc "Update Windows package versions"
-            task :update => full_task_names
-          end
-        end
-      end
-
-      def update_package_version(package, latest_version)
-        rakefile_path = ::Rake.application.rakefile
-        rakefile_content = File.read(rakefile_path)
-        updated_rakefile_content = ""
-        in_package = false
-        escaped_name = Regexp.escape(package.name)
-        escaped_version = Regexp.escape(package.version)
-        rakefile_content.each_line do |line|
-          case line
-          when /:name => "#{escaped_name}",/
-            in_package = true
-            updated_rakefile_content << line
-          when /:version => "#{escaped_version}",/
-            if in_package
-              updated_rakefile_content << line.gsub(/#{escaped_version}/,
-                                                    latest_version)
-              in_package = false
-            else
-              updated_rakefile_content << line
-            end
-          else
-            updated_rakefile_content << line
-          end
-        end
-        File.open(rakefile_path, "w") do |rakefile|
-          rakefile.write(updated_rakefile_content)
-        end
-      end
-
       def define_package_tasks
         Gem::PackageTask.new(@spec) do |pkg|
         end