Hello community,
here is the log from the commit of package rubygem-pkg-config for
openSUSE:Factory checked in at 2019-03-19 09:57:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-pkg-config (Old)
and /work/SRC/openSUSE:Factory/.rubygem-pkg-config.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-pkg-config"
Tue Mar 19 09:57:13 2019 rev:18 rq:685127 version:1.3.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-pkg-config/rubygem-pkg-config.changes
2018-12-10 12:26:04.078663026 +0100
+++
/work/SRC/openSUSE:Factory/.rubygem-pkg-config.new.28833/rubygem-pkg-config.changes
2019-03-19 09:57:15.816129872 +0100
@@ -1,0 +2,51 @@
+Thu Mar 14 11:01:19 UTC 2019 - Stephan Kulow <co...@suse.com>
+
+- updated to version 1.3.6
+ see installed NEWS
+
+ == 1.3.6 - 2019-03-09
+
+ === Improvements
+
+ * Added support for Homebrew environment without pkg-config formula.
+
+ == 1.3.5 - 2019-03-08
+
+ === Fixes
+
+ * Fixed MSYS2 detection installed at non standard folder.
+ [GitHub:ruby-gnome2/ruby-gnome2#1271][Reported by Simon Arnaud]
+
+ === Thanks
+
+ * Simon Arnaud
+
+-------------------------------------------------------------------
+Sat Mar 2 15:30:46 UTC 2019 - Stephan Kulow <co...@suse.com>
+
+- updated to version 1.3.4
+ see installed NEWS
+
+ == 1.3.4 - 2019-02-19
+
+ === Fixes
+
+ * Fixed 32bit MinGW Ruby detection.
+ [GitHub:ruby-gnome2/ruby-gnome2#1274][Reported by noanoa07]
+
+ === Thanks
+
+ * noanoa07
+
+ == 1.3.3 - 2019-02-10
+
+ === Improvements
+
+ * Improved MSYS2 detection on Windows.
+ [GitHub#16][Reported by dsisnero]
+
+ === Thanks
+
+ * dsisnero
+
+-------------------------------------------------------------------
Old:
----
pkg-config-1.3.2.gem
New:
----
pkg-config-1.3.6.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-pkg-config.spec ++++++
--- /var/tmp/diff_new_pack.TTCM6R/_old 2019-03-19 09:57:16.320129686 +0100
+++ /var/tmp/diff_new_pack.TTCM6R/_new 2019-03-19 09:57:16.324129685 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-pkg-config
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
#
Name: rubygem-pkg-config
-Version: 1.3.2
+Version: 1.3.6
Release: 0
%define mod_name pkg-config
%define mod_full_name %{mod_name}-%{version}
++++++ pkg-config-1.3.2.gem -> pkg-config-1.3.6.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NEWS new/NEWS
--- old/NEWS 2018-11-03 12:50:57.000000000 +0100
+++ new/NEWS 2019-03-09 11:11:57.000000000 +0100
@@ -1,5 +1,44 @@
= NEWS
+== 1.3.6 - 2019-03-09
+
+=== Improvements
+
+ * Added support for Homebrew environment without pkg-config formula.
+
+== 1.3.5 - 2019-03-08
+
+=== Fixes
+
+ * Fixed MSYS2 detection installed at non standard folder.
+ [GitHub:ruby-gnome2/ruby-gnome2#1271][Reported by Simon Arnaud]
+
+=== Thanks
+
+ * Simon Arnaud
+
+== 1.3.4 - 2019-02-19
+
+=== Fixes
+
+ * Fixed 32bit MinGW Ruby detection.
+ [GitHub:ruby-gnome2/ruby-gnome2#1274][Reported by noanoa07]
+
+=== Thanks
+
+ * noanoa07
+
+== 1.3.3 - 2019-02-10
+
+=== Improvements
+
+ * Improved MSYS2 detection on Windows.
+ [GitHub#16][Reported by dsisnero]
+
+=== Thanks
+
+ * dsisnero
+
== 1.3.2 - 2018-11-03
=== Improvements
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/pkg-config/version.rb
new/lib/pkg-config/version.rb
--- old/lib/pkg-config/version.rb 2018-11-03 12:50:57.000000000 +0100
+++ new/lib/pkg-config/version.rb 2019-03-09 11:11:57.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright 2012-2018 Kouhei Sutou <k...@cozmixng.org>
+# Copyright 2012-2019 Kouhei Sutou <k...@cozmixng.org>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -15,5 +15,5 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
module PKGConfig
- VERSION = "1.3.2"
+ VERSION = "1.3.6"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/pkg-config.rb new/lib/pkg-config.rb
--- old/lib/pkg-config.rb 2018-11-03 12:50:57.000000000 +0100
+++ new/lib/pkg-config.rb 2019-03-09 11:11:57.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright 2008-2018 Kouhei Sutou <k...@cozmixng.org>
+# Copyright 2008-2019 Kouhei Sutou <k...@cozmixng.org>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -34,6 +34,11 @@
@native_pkg_config ||= guess_native_pkg_config
end
+ @native_pkg_config_prefix = nil
+ def native_pkg_config_prefix
+ @native_pkg_config_prefix ||= compute_native_pkg_config_prefix
+ end
+
@custom_override_variables = nil
def custom_override_variables
@custom_override_variables ||= with_config("override-variables", "")
@@ -41,6 +46,7 @@
def clear_configure_args_cache
@native_pkg_config = nil
+ @native_pkg_config_prefix = nil
@custom_override_variables = nil
end
@@ -54,10 +60,12 @@
end
def guess_native_pkg_config
- pkg_config = with_config("pkg-config", ENV["PKG_CONFIG"] || "pkg-config")
+ exeext = RbConfig::CONFIG["EXEEXT"]
+ default_pkg_config = ENV["PKG_CONFIG"] || "pkg-config#{exeext}"
+ pkg_config = with_config("pkg-config", default_pkg_config)
pkg_config = Pathname.new(pkg_config)
unless pkg_config.absolute?
- found_pkg_config = search_pkg_config_from_path(pkg_config)
+ found_pkg_config = search_executable_from_path(pkg_config)
pkg_config = found_pkg_config if found_pkg_config
end
unless pkg_config.absolute?
@@ -67,10 +75,10 @@
pkg_config
end
- def search_pkg_config_from_path(pkg_config)
+ def search_executable_from_path(name)
(ENV["PATH"] || "").split(SEPARATOR).each do |path|
- try_pkg_config = Pathname(path) + pkg_config
- return try_pkg_config if try_pkg_config.exist?
+ try_name = Pathname(path) + name
+ return try_name if try_name.executable?
end
nil
end
@@ -110,6 +118,20 @@
Pathname(path.to_s)
end
end
+
+ def compute_native_pkg_config_prefix
+ pkg_config = native_pkg_config
+ return nil unless pkg_config.absolute?
+
+ pkg_config_prefix = pkg_config.parent.parent
+ if File::ALT_SEPARATOR
+ normalized_pkg_config_prefix =
+
pkg_config_prefix.to_s.split(File::ALT_SEPARATOR).join(File::SEPARATOR)
+ Pathname(normalized_pkg_config_prefix)
+ else
+ pkg_config_prefix
+ end
+ end
end
attr_reader :paths
@@ -230,26 +252,18 @@
end
def normalize_path_flags(path_flags, flag_option)
+ return path_flags unless /-mingw32\z/ === RUBY_PLATFORM
+
+ pkg_config_prefix = self.class.native_pkg_config_prefix
+ return path_flags unless pkg_config_prefix
+
+ mingw_dir = pkg_config_prefix.basename.to_s
path_flags.collect do |path_flag|
- path = path_flag.sub(flag_option, "")
- prefix = ""
- case RUBY_PLATFORM
- when "x86-mingw32"
- ruby_prefix = RbConfig::CONFIG["prefix"]
- candidates = Dir.glob("#{ruby_prefix}/msys{32,64,*}")
- candidates.concat(Dir.glob("c:/msys{32,64,*}"))
- prefix = candidates.first
- when "x64-mingw32"
- ruby_prefix = RbConfig::CONFIG["prefix"]
- candidates = Dir.glob("#{ruby_prefix}/msys{64,*}")
- candidates.concat(Dir.glob("c:/msys{64,*}"))
- prefix = candidates.first
- end
- if /\A[a-z]:/i === path
- "#{flag_option}#{path}"
- else
- "#{flag_option}#{prefix}#{path}"
+ path = path_flag.sub(/\A#{Regexp.escape(flag_option)}/, "")
+ path = path.sub(/\A\/#{Regexp.escape(mingw_dir)}/i) do
+ pkg_config_prefix.to_s
end
+ "#{flag_option}#{path}"
end
end
@@ -361,43 +375,40 @@
"/opt/X11/lib/pkgconfig",
"/usr/share/pkgconfig",
]
- case RUBY_PLATFORM
- when "x86-mingw32"
- prefix = RbConfig::CONFIG["prefix"]
- default_paths.concat(Dir.glob("#{prefix}/msys*/mingw32/lib/pkgconfig"))
- default_paths.concat(Dir.glob("c:/msys*/mingw32/lib/pkgconfig"))
- when "x64-mingw32"
- prefix = RbConfig::CONFIG["prefix"]
- default_paths.concat(Dir.glob("#{prefix}/msys*/mingw64/lib/pkgconfig"))
- default_paths.concat(Dir.glob("c:/msys*/mingw64/lib/pkgconfig"))
- end
libdir = ENV["PKG_CONFIG_LIBDIR"]
default_paths.unshift(libdir) if libdir
- pkg_config = self.class.native_pkg_config
- return default_paths.join(SEPARATOR) unless pkg_config.absolute?
-
- pkg_config_prefix = pkg_config.parent.parent
- pkg_config_arch_depended_paths =
- Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s)
paths = []
- paths.concat(pkg_config_arch_depended_paths)
- paths << (pkg_config_prefix + "lib64/pkgconfig").to_s
- paths << (pkg_config_prefix + "libx32/pkgconfig").to_s
- paths << (pkg_config_prefix + "lib/pkgconfig").to_s
- paths << (pkg_config_prefix + "libdata/pkgconfig").to_s
+ pkg_config_prefix = self.class.native_pkg_config_prefix
+ if pkg_config_prefix
+ pkg_config_arch_depended_paths =
+ Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s)
+ paths.concat(pkg_config_arch_depended_paths)
+ paths << (pkg_config_prefix + "lib64/pkgconfig").to_s
+ paths << (pkg_config_prefix + "libx32/pkgconfig").to_s
+ paths << (pkg_config_prefix + "lib/pkgconfig").to_s
+ paths << (pkg_config_prefix + "libdata/pkgconfig").to_s
+ end
if /-darwin\d[\d\.]*\z/ =~ RUBY_PLATFORM and
/\A(\d+\.\d+)/ =~ `sw_vers -productVersion`
mac_os_version = $1
homebrew_repository_candidates = []
- brew_path = pkg_config_prefix + "bin" + "brew"
- if brew_path.exist?
- escaped_brew_path = Shellwords.escape(brew_path.to_s)
- homebrew_repository = `#{escaped_brew_path} --repository`.chomp
- homebrew_repository_candidates << Pathname.new(homebrew_repository)
+ if pkg_config_prefix
+ brew_path = pkg_config_prefix + "bin" + "brew"
+ if brew_path.exist?
+ escaped_brew_path = Shellwords.escape(brew_path.to_s)
+ homebrew_repository = `#{escaped_brew_path} --repository`.chomp
+ homebrew_repository_candidates << Pathname.new(homebrew_repository)
+ else
+ homebrew_repository_candidates << pkg_config_prefix + "Homebrew"
+ homebrew_repository_candidates << pkg_config_prefix
+ end
else
- homebrew_repository_candidates << pkg_config_prefix + "Homebrew"
- homebrew_repository_candidates << pkg_config_prefix
+ brew = self.class.__send__(:search_executable_from_path, "brew")
+ if brew
+ homebrew_repository = `brew --repository`.chomp
+ homebrew_repository_candidates << Pathname(homebrew_repository)
+ end
end
homebrew_repository_candidates.each do |candidate|
path = candidate +
"Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2018-11-03 12:50:57.000000000 +0100
+++ new/metadata 2019-03-09 11:11:57.000000000 +0100
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: pkg-config
version: !ruby/object:Gem::Version
- version: 1.3.2
+ version: 1.3.6
platform: ruby
authors:
- Kouhei Sutou
autorequire:
bindir: bin
cert_chain: []
-date: 2018-11-03 00:00:00.000000000 Z
+date: 2019-03-09 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: test-unit
@@ -72,7 +72,8 @@
homepage: https://github.com/ruby-gnome2/pkg-config
licenses:
- LGPLv2+
-metadata: {}
+metadata:
+ msys2_mingw_dependencies: pkg-config
post_install_message:
rdoc_options: []
require_paths:
@@ -88,7 +89,7 @@
- !ruby/object:Gem::Version
version: '0'
requirements: []
-rubyforge_project: cairo
+rubyforge_project:
rubygems_version: 2.7.6
signing_key:
specification_version: 4
