pkg-config 1.2.5 → 1.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: '09358e3bde84ec7d5a2a90f63c7645fb157826c1'
4
- data.tar.gz: e51b468a0e04475368df7a1812dc8261fb1bd2e2
3
+ metadata.gz: 4853ef3274189b7494ef228d87db6c067576f7d8
4
+ data.tar.gz: b9d10332ab8bf6e2d9f2e03df87d3507704be760
5
5
  SHA512:
6
- metadata.gz: 35f46161d07e06730e9411e4a0c5fee1a75e60c186af40dbcde8200f2a4093f3d4c35ed2f8ed8d4ff0ae4860144a8fb2c06b86e962ebf231bfc462fb44f136ec
7
- data.tar.gz: 88a56de322a6d128145b5a07835a37a786b98bece0a90968badfdbd4c1a17a4c49b5f2482e91fd878b0c5300959f26bfb42f0cecc411a9667ff44b4e4ab1d46a
6
+ metadata.gz: 0f24dac3a3f4efda1a9332f25262bcd991bd048c57e6f308ed5221d94e87d16c8ce41303dae5d011f937262a36df2d8b5cbfb4a0a958ef192782c28bf3030064
7
+ data.tar.gz: 0b29180c716c7a27987c30ea544f897d90b043bbd0ba1c0051f1262077847ef2a4de27426d6f32c5e7585a4fc835a13cde48d35dc59c16f80fb8248d41e296ab
data/NEWS CHANGED
@@ -1,5 +1,11 @@
1
1
  = NEWS
2
2
 
3
+ == 1.2.6 - 2017-08-13
4
+
5
+ === Improvements
6
+
7
+ * Improved Homebrew repository detection.
8
+
3
9
  == 1.2.5 - 2017-08-10
4
10
 
5
11
  === Improvements
@@ -15,5 +15,5 @@
15
15
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
  module PKGConfig
18
- VERSION = "1.2.5"
18
+ VERSION = "1.2.6"
19
19
  end
data/lib/pkg-config.rb CHANGED
@@ -376,9 +376,20 @@ class PackageConfig
376
376
  if /-darwin\d+\z/ =~ RUBY_PLATFORM and
377
377
  /\A(\d+\.\d+)\./ =~ `sw_vers -productVersion`
378
378
  mac_os_version = $1
379
- path = pkg_config_prefix +
380
- "Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"
381
- paths << path.to_s if path.exist?
379
+ homebrew_repository_candidates = []
380
+ brew_path = pkg_config_prefix + "bin" + "brew"
381
+ if brew_path.exist?
382
+ escaped_brew_path = Shellwords.escape(brew_path.to_s)
383
+ homebrew_repository = `#{escaped_brew_path} --repository`.chomp
384
+ homebrew_repository_candidates << Pathname.new(homebrew_repository)
385
+ else
386
+ homebrew_repository_candidates << pkg_config_prefix + "Homebrew"
387
+ homebrew_repository_candidates << pkg_config_prefix
388
+ end
389
+ homebrew_repository_candidates.each do |candidate|
390
+ path = candidate + "Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"
391
+ paths << path.to_s if path.exist?
392
+ end
382
393
  end
383
394
  paths.concat(default_paths)
384
395
  paths.join(SEPARATOR)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pkg-config
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.5
4
+ version: 1.2.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kouhei Sutou
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-08-10 00:00:00.000000000 Z
11
+ date: 2017-08-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: test-unit