Hello community,
here is the log from the commit of package rubygem-pkg-config for
openSUSE:Factory checked in at 2017-09-13 21:34:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-pkg-config (Old)
and /work/SRC/openSUSE:Factory/.rubygem-pkg-config.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-pkg-config"
Wed Sep 13 21:34:37 2017 rev:13 rq:523549 version:1.2.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-pkg-config/rubygem-pkg-config.changes
2017-06-07 09:52:09.270400244 +0200
+++
/work/SRC/openSUSE:Factory/.rubygem-pkg-config.new/rubygem-pkg-config.changes
2017-09-13 21:34:41.881362632 +0200
@@ -1,0 +2,48 @@
+Mon Sep 11 12:46:53 UTC 2017 - [email protected]
+
+- updated to version 1.2.7
+ see installed NEWS
+
+ == 1.2.7 - 2017-08-16
+
+ === Improvements
+
+ * Improved Homebrew repository detection.
+ [Reported by Wyatt Kirby]
+
+ === Thanks
+
+ * Wyatt Kirby
+
+ == 1.2.6 - 2017-08-13
+
+ === Improvements
+
+ * Improved Homebrew repository detection.
+
+ == 1.2.5 - 2017-08-10
+
+ === Improvements
+
+ * Supported Homebrew bundled .pc files.
+ [GitHub:rcairo/rcairo#49][Reported by choboy11]
+
+ === Thanks
+
+ * choboy11
+
+ == 1.2.4 - 2017-08-07
+
+ === Improvements
+
+ * Added `pkg-config` 0.29 or later compatible result support.
+ [GitHub#13][Reported by HIGUCHI Daisuke]
+
+ * test: Updated expected value for the latest cairo.
+ [GitHub#14][Patch by HIGUCHI Daisuke]
+
+ === Thanks
+
+ * HIGUCHI Daisuke
+
+-------------------------------------------------------------------
Old:
----
pkg-config-1.2.3.gem
New:
----
pkg-config-1.2.7.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-pkg-config.spec ++++++
--- /var/tmp/diff_new_pack.3wEl7h/_old 2017-09-13 21:34:43.497135296 +0200
+++ /var/tmp/diff_new_pack.3wEl7h/_new 2017-09-13 21:34:43.501134733 +0200
@@ -24,7 +24,7 @@
#
Name: rubygem-pkg-config
-Version: 1.2.3
+Version: 1.2.7
Release: 0
%define mod_name pkg-config
%define mod_full_name %{mod_name}-%{version}
@@ -33,7 +33,7 @@
BuildRequires: %{ruby}
BuildRequires: ruby-macros >= 5
Url: https://github.com/ruby-gnome2/pkg-config
-Source: http://rubygems.org/gems/%{mod_full_name}.gem
+Source: https://rubygems.org/gems/%{mod_full_name}.gem
Source1: gem2rpm.yml
Summary: A pkg-config implementation for Ruby
License: LGPL-2.1+
++++++ pkg-config-1.2.3.gem -> pkg-config-1.2.7.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NEWS new/NEWS
--- old/NEWS 2017-05-29 14:44:22.000000000 +0200
+++ new/NEWS 2017-08-16 03:39:45.000000000 +0200
@@ -1,5 +1,47 @@
= NEWS
+== 1.2.7 - 2017-08-16
+
+=== Improvements
+
+ * Improved Homebrew repository detection.
+ [Reported by Wyatt Kirby]
+
+=== Thanks
+
+ * Wyatt Kirby
+
+== 1.2.6 - 2017-08-13
+
+=== Improvements
+
+ * Improved Homebrew repository detection.
+
+== 1.2.5 - 2017-08-10
+
+=== Improvements
+
+ * Supported Homebrew bundled .pc files.
+ [GitHub:rcairo/rcairo#49][Reported by choboy11]
+
+=== Thanks
+
+ * choboy11
+
+== 1.2.4 - 2017-08-07
+
+=== Improvements
+
+ * Added `pkg-config` 0.29 or later compatible result support.
+ [GitHub#13][Reported by HIGUCHI Daisuke]
+
+ * test: Updated expected value for the latest cairo.
+ [GitHub#14][Patch by HIGUCHI Daisuke]
+
+=== Thanks
+
+ * HIGUCHI Daisuke
+
== 1.2.3 - 2017-05-29
=== Fixes
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 2017-05-29 14:44:22.000000000 +0200
+++ new/lib/pkg-config/version.rb 2017-08-16 03:39:45.000000000 +0200
@@ -15,5 +15,5 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
module PKGConfig
- VERSION = "1.2.3"
+ VERSION = "1.2.7"
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 2017-05-29 14:44:22.000000000 +0200
+++ new/lib/pkg-config.rb 2017-08-16 03:39:45.000000000 +0200
@@ -208,7 +208,10 @@
private
def collect_cflags
cflags_set = [declaration("Cflags")]
- cflags_set += all_required_packages.collect do |package|
+ cflags_set += required_packages.collect do |package|
+ self.class.new(package, @options).cflags
+ end
+ cflags_set += private_required_packages.collect do |package|
self.class.new(package, @options).cflags
end
all_cflags = normalize_cflags(Shellwords.split(cflags_set.join(" ")))
@@ -355,21 +358,41 @@
when "x64-mingw32"
default_paths.concat(Dir.glob("c:/msys*/mingw64/lib/pkgconfig"))
end
- default_path = default_paths.join(SEPARATOR)
libdir = ENV["PKG_CONFIG_LIBDIR"]
- default_path = [libdir, default_path].join(SEPARATOR) if libdir
+ default_paths.unshift(libdir) if libdir
pkg_config = self.class.native_pkg_config
- return default_path unless pkg_config.absolute?
+ return default_paths.join(SEPARATOR) unless pkg_config.absolute?
+
pkg_config_prefix = pkg_config.parent.parent
- pkg_config_arch_depended_path =
- Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s).join(SEPARATOR)
- [pkg_config_arch_depended_path,
- (pkg_config_prefix + "lib64/pkgconfig").to_s,
- (pkg_config_prefix + "libx32/pkgconfig").to_s,
- (pkg_config_prefix + "lib/pkgconfig").to_s,
- (pkg_config_prefix + "libdata/pkgconfig").to_s,
- default_path].join(SEPARATOR)
+ 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
+ if /-darwin\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)
+ else
+ homebrew_repository_candidates << pkg_config_prefix + "Homebrew"
+ homebrew_repository_candidates << pkg_config_prefix
+ end
+ homebrew_repository_candidates.each do |candidate|
+ path = candidate +
"Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"
+ paths << path.to_s if path.exist?
+ end
+ end
+ paths.concat(default_paths)
+ paths.join(SEPARATOR)
end
def required_packages
@@ -377,6 +400,12 @@
@name == package
end.uniq
end
+
+ def private_required_packages
+ requires_private.reject do |package|
+ @name == package
+ end.uniq
+ end
def all_required_packages
(requires_private + requires.reverse).reject do |package|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2017-05-29 14:44:22.000000000 +0200
+++ new/metadata 2017-08-16 03:39:45.000000000 +0200
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: pkg-config
version: !ruby/object:Gem::Version
- version: 1.2.3
+ version: 1.2.7
platform: ruby
authors:
- Kouhei Sutou
autorequire:
bindir: bin
cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: test-unit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/test_pkg_config.rb new/test/test_pkg_config.rb
--- old/test/test_pkg_config.rb 2017-05-29 14:44:22.000000000 +0200
+++ new/test/test_pkg_config.rb 2017-08-16 03:39:45.000000000 +0200
@@ -9,6 +9,13 @@
@cairo_png = PackageConfig.new("cairo-png", options)
end
+ def only_pkg_config_version(major, minor)
+ pkg_config_version = `pkg-config --version`.chomp
+ current_major, current_minor =
pkg_config_version.split(".").collect(&:to_i)
+ return if ([major, minor] <=> [current_major, current_minor]) <= 0
+ omit("Require pkg-config #{pkg_config_version} or later")
+ end
+
def test_exist?
assert(system('pkg-config --exists cairo'))
assert(@cairo.exist?)
@@ -19,11 +26,13 @@
def test_cflags
assert_pkg_config("cairo", ["--cflags"], @cairo.cflags)
+ only_pkg_config_version(0, 29)
assert_pkg_config("cairo-png", ["--cflags"], @cairo_png.cflags)
end
def test_cflags_only_I
assert_pkg_config("cairo", ["--cflags-only-I"], @cairo.cflags_only_I)
+ only_pkg_config_version(0, 29)
assert_pkg_config("cairo-png", ["--cflags-only-I"],
@cairo_png.cflags_only_I)
end
@@ -45,7 +54,7 @@
@cairo_png.msvc_syntax = true
result = pkg_config("cairo-png", "--libs-only-l")
- msvc_result = result.gsub(/-l(cairo|png[0-9]+)\b/, '\1.lib')
+ msvc_result = result.gsub(/-l(cairo|png[0-9]+|z)\b/, '\1.lib')
assert_not_equal(msvc_result, result)
assert_equal(msvc_result, @cairo_png.libs_only_l)
end
