pkg-config 1.5.5 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31a13b597d85b52de9fb1c7cb25b442d8af2b571adf55e26cb76c4a143cee797
-  data.tar.gz: b7d6e2c8b5e44b240b84b5a473ae80b5c65d50bde5cdf5e72f92f7d4900d643b
+  metadata.gz: 0ce019f0f6ac801e5c218c7f9e721d5c428ffbef30e6bfdbae678a80c364a46b
+  data.tar.gz: '082d9fdd2413f734de37a5573a0747a3de8d46af22c1f904452e63765edc7d6b'
 SHA512:
-  metadata.gz: 3950c9fa255eb20116ce802c57a6e44b12ad40404c743d3f6a27b8825aac37206e116b828eac79dba5d60096358a94e0eee4556289bac6e489249b5a49bd9322
-  data.tar.gz: f22c2a0c7a0fba6081516280478d59f78729c0c82ac346c90b40b54c41bedc2820e62bd159851e8ace414e13fc243b137dbd8965e518c67f4654bd2c763fe1ee
+  metadata.gz: 6d0f96d09ec77da0d85688684eeeac8dd46095eca8fa2e296080d9f2bc65b46302ab846df62bbb8ae62c9da707488b24151b5c7ae58703c7bbee269479d7b30e
+  data.tar.gz: ceda5ab27054ea938d5136240d5005babe6cdb034ec9bf221a114419cf55a21168266b427e93b44759014458cd8851aa6c7587d74a7d2aac2535779d0d50e4f6

data/{NEWS → NEWS.md}

@@ -1,291 +1,323 @@
-= NEWS
+# NEWS
 
-== 1.5.5 - 2023-09-05
+## 1.5.7 - 2024-10-24
 
-=== Fixes
+### Improvements
+
+  * conda: Added support for `${CONDA_PREFIX}/share/pkgconfig`.
+
+### Fixes
+
+  * Fixed `Cflags` nomralization
+
+    * GH-25
+
+    * Reported by Jean byroot Boussier
+
+### Thanks
+
+  * Jean byroot Boussier
+
+## 1.5.6 - 2023-11-19
+
+### Improvements
+
+  * Added support for "<" and ">" operators in "Requires:".
+
+    GH-23
+
+    Patch by Daisuke Fujimura
+
+### Thanks
+
+  * Daisuke Fujimura
+
+## 1.5.5 - 2023-09-05
+
+### Fixes
 
   * Fixed a bug in 1.5.4 that success detection doesn't work.
 
-== 1.5.4 - 2023-09-05
+## 1.5.4 - 2023-09-05
 
-=== Improvements
+### Improvements
 
   * Added package version to unsatisfied version is only found case.
 
-== 1.5.3 - 2023-08-29
+## 1.5.3 - 2023-08-29
 
-=== Improvements
+### Improvements
 
   * Accepted spaces between "=" and ":". For example, "prefix = /usr"
     is accepted.
 
-== 1.5.2 - 2023-06-25
+## 1.5.2 - 2023-06-25
 
-=== Improvements
+### Improvements
 
   * Added support for conda.
 
-== 1.5.1 - 2022-11-23
+## 1.5.1 - 2022-11-23
 
-=== Improvements
+### Improvements
 
   * Improved the default search path. "/usr" in "/usr/bin/pkg-config"
     isn't used for buidling the default search path if "pkg-config
     --variable=pc_path pkg-config" is available.
     [Reported by Watson][GitHub:#22]
 
-== 1.5.0 - 2022-11-23
+## 1.5.0 - 2022-11-23
 
-=== Improvements
+### Improvements
 
   * Improved the default search path. "pkg-config --variable=pc_path
     pkg-config" is used as the default search path if it's available.
     [Reported by Watson][GitHub:#22]
 
-== 1.4.9 - 2022-07-31
+## 1.4.9 - 2022-07-31
 
 This is a bug fix release of 1.4.8. All 1.4.8 users should be upgraded
 to 1.4.9.
 
-=== Fixes
+### Fixes
 
   * Fixed a regression bug in 1.4.8 that PkgConfig.have_package can't
     detect nonexistent package.
 
-== 1.4.8 - 2022-07-30
+## 1.4.8 - 2022-07-30
 
-=== Improvements
+### Improvements
 
   * Added support for showing found package version.
 
-== 1.4.7 - 2022-01-16
+## 1.4.7 - 2022-01-16
 
-=== Improvements
+### Improvements
 
   * Added support for RubyInstaller2 3.1 or later.
     [Reported by golirev][GitHub:ruby-gnome/ruby-gnome#1457]
 
-=== Thanks
+### Thanks
 
   * golirev
 
-== 1.4.6 - 2021-04-12
+## 1.4.6 - 2021-04-12
 
-=== Improvements
+### Improvements
 
   * Improved support for .pc detection installed by Homebrew.
     [Reported by Evan Shea][GitHub:rcairo/rcairo#66]
 
-=== Thanks
+### Thanks
 
   * Evan Shea
 
-== 1.4.5 - 2021-02-04
+## 1.4.5 - 2021-02-04
 
-=== Improvements
+### Improvements
 
   * Added support for macOS 11.2.
     [Reported by Ludovic Moutury][GitHub:rcairo/rcairo#69]
 
-=== Thanks
+### Thanks
 
   * Ludovic Moutury
 
-== 1.4.4 - 2020-09-23
+## 1.4.4 - 2020-09-23
 
-=== Fixes
+### Fixes
 
   * Fixed a bug that NoMethodError instead of
     PackageConfig::NotFoundError is raised.
     [GitHub#21][Fixed by kojix2]
 
-=== Thanks
+### Thanks
 
   * kojix2
 
-== 1.4.3 - 2020-09-15
+## 1.4.3 - 2020-09-15
 
-=== Improvements
+### Improvements
 
   * Changed to use PackageConfig::NotFoundError instead of RuntimeError
     for exception on no .pc is found.
 
-== 1.4.2 - 2020-08-10
+## 1.4.2 - 2020-08-10
 
-=== Improvements
+### Improvements
 
   * Added support for detecting pkgconfig path on RubyInstaller
     without "ridk exec".
 
-== 1.4.1 - 2020-02-10
+## 1.4.1 - 2020-02-10
 
-=== Improvements
+### Improvements
 
   * Added support for cycled depended .pc such as freetype2.pc and
     harfbuzz.pc on PLD Linux.
     [Reported by Jakub Bogusz]
 
-=== Thanks
+### Thanks
 
   * Jakub Bogusz
 
-== 1.4.0 - 2019-10-24
+## 1.4.0 - 2019-10-24
 
-=== Improvements
+### Improvements
 
   * Improved Homebrew detection.
 
-== 1.3.9 - 2019-09-28
+## 1.3.9 - 2019-09-28
 
-=== Improvements
+### Improvements
 
   * Added support for absolute path in Requires.
     [GitHub#18][Reported by Josh Huckabee]
 
-=== Thanks
+### Thanks
 
   * Josh Huckabee
 
-== 1.3.8 - 2019-08-13
+## 1.3.8 - 2019-08-13
 
-=== Improvements
+### Improvements
 
   * Added support for -framework on macOS.
     [GitHub:ruby-gnome2/ruby-gnome2#1287][Reported by Viko]
 
-=== Thanks
+### Thanks
 
   * Viko
 
-== 1.3.7 - 2019-03-17
+## 1.3.7 - 2019-03-17
 
-=== Improvements
+### Improvements
 
   * Added support for alphabet and _ only version.
     [GitHub#17][Reported by xiejiangzhi]
 
-=== Thanks
+### Thanks
 
   * xiejiangzhi
 
-== 1.3.6 - 2019-03-09
+## 1.3.6 - 2019-03-09
 
-=== Improvements
+### Improvements
 
   * Added support for Homebrew environment without pkg-config formula.
 
-== 1.3.5 - 2019-03-08
+## 1.3.5 - 2019-03-08
 
-=== Fixes
+### Fixes
 
   * Fixed MSYS2 detection installed at non standard folder.
     [GitHub:ruby-gnome2/ruby-gnome2#1271][Reported by Simon Arnaud]
 
-=== Thanks
+### Thanks
 
   * Simon Arnaud
 
-== 1.3.4 - 2019-02-19
+## 1.3.4 - 2019-02-19
 
-=== Fixes
+### Fixes
 
   * Fixed 32bit MinGW Ruby detection.
     [GitHub:ruby-gnome2/ruby-gnome2#1274][Reported by noanoa07]
 
-=== Thanks
+### Thanks
 
   * noanoa07
 
-== 1.3.3 - 2019-02-10
+## 1.3.3 - 2019-02-10
 
-=== Improvements
+### Improvements
 
   * Improved MSYS2 detection on Windows.
     [GitHub#16][Reported by dsisnero]
 
-=== Thanks
+### Thanks
 
   * dsisnero
 
-== 1.3.2 - 2018-11-03
+## 1.3.2 - 2018-11-03
 
-=== Improvements
+### Improvements
 
   * Added support for Ruby installed by RubyInstaller for Windows with
     MSYS2-Devkit.
 
-== 1.3.1 - 2018-04-28
+## 1.3.1 - 2018-04-28
 
-=== Improvements
+### Improvements
 
   * Changed search order to find C flags.
     [GitHub#6][Reported by HIGUCHI Daisuke]
     * Before: Requires -> Requires.private
     * After: Requires.private -> Requires
 
-=== Thanks
+### Thanks
 
   * HIGUCHI Daisuke
 
-== 1.3.0 - 2018-04-10
+## 1.3.0 - 2018-04-10
 
-=== Improvements
+### Improvements
 
   * Added Ruby 2.0 on Ubuntu Trusty again.
 
-== 1.2.9 - 2018-01-13
+## 1.2.9 - 2018-01-13
 
-=== Improvements
+### Improvements
 
   * Added more default paths for OpenBSD.
     [GitHub#15][Reported by clintpachl]
 
-=== Thanks
+### Thanks
 
   * clintpachl
 
-== 1.2.8 - 2017-10-19
+## 1.2.8 - 2017-10-19
 
-=== Improvements
+### Improvements
 
   * Improved macOS environment detection.
     [Reported by Simeon Manolov]
 
-=== Thanks
+### Thanks
 
   * Simeon Manolov
 
-== 1.2.7 - 2017-08-16
+## 1.2.7 - 2017-08-16
 
-=== Improvements
+### Improvements
 
   * Improved Homebrew repository detection.
     [Reported by Wyatt Kirby]
 
-=== Thanks
+### Thanks
 
   * Wyatt Kirby
 
-== 1.2.6 - 2017-08-13
+## 1.2.6 - 2017-08-13
 
-=== Improvements
+### Improvements
 
   * Improved Homebrew repository detection.
 
-== 1.2.5 - 2017-08-10
+## 1.2.5 - 2017-08-10
 
-=== Improvements
+### Improvements
 
   * Supported Homebrew bundled .pc files.
     [GitHub:rcairo/rcairo#49][Reported by choboy11]
 
-=== Thanks
+### Thanks
 
   * choboy11
 
-== 1.2.4 - 2017-08-07
+## 1.2.4 - 2017-08-07
 
-=== Improvements
+### Improvements
 
   * Added `pkg-config` 0.29 or later compatible result support.
     [GitHub#13][Reported by HIGUCHI Daisuke]
@@ -293,88 +325,88 @@ to 1.4.9.
   * test: Updated expected value for the latest cairo.
     [GitHub#14][Patch by HIGUCHI Daisuke]
 
-=== Thanks
+### Thanks
 
   * HIGUCHI Daisuke
 
-== 1.2.3 - 2017-05-29
+## 1.2.3 - 2017-05-29
 
-=== Fixes
+### Fixes
 
   * Supported *-mingw32 Rubies without MSYS2 again.
 
-== 1.2.2 - 2017-05-29
+## 1.2.2 - 2017-05-29
 
-=== Improvements
+### Improvements
 
   * Supported path normalization for MSYS2.
 
-== 1.2.1 - 2017-05-29
+## 1.2.1 - 2017-05-29
 
-=== Improvements
+### Improvements
 
   * Supported MSYS2.
 
-== 1.2.0 - 2017-04-25
+## 1.2.0 - 2017-04-25
 
-=== Improvements
+### Improvements
 
   * Supported x32 environment. [GitHub#12][Reported by Elan Ruusamäe]
 
-=== Thanks
+### Thanks
 
   * Elan Ruusamäe
 
-== 1.1.9 - 2017-04-20
+## 1.1.9 - 2017-04-20
 
   * Supported C++ compiler.
 
-== 1.1.8 - 2017-04-19
+## 1.1.8 - 2017-04-19
 
   * Stopped to require mkmf.
 
-== 1.1.7 - 2015-01-16
+## 1.1.7 - 2015-01-16
 
   * Added path for FreeBSD to default paths.
     [Reported by Hajime UMEMOTO]
 
-=== Thanks
+### Thanks
 
   * Hajime UMEMOTO
 
-== 1.1.6 - 2014/11/12
+## 1.1.6 - 2014/11/12
 
   * Supported Ruby 2.1.
     [GitHub:ruby-gnome2/ruby-gnome2#262][Reported by Steve Wills]
 
-=== Thanks
+### Thanks
 
   * Steve Wills
 
-== 1.1.5 - 2013/12/29
+## 1.1.5 - 2013/12/29
 
   * Supported XQuartz.
     [GitHub:#10][Patch by Masafumi Yokoyama]
 
-=== Thanks
+### Thanks
 
   * Masafumi Yokoyama
 
-== 1.1.4 - 2012/08/02
+## 1.1.4 - 2012/08/02
 
   * Supported mswin64 as MSVC environment.
 
-== 1.1.3 - 2012/01/29
+## 1.1.3 - 2012/01/29
 
   * [GitHub #8] fix test broken by libpng version.
     (Patch by Bohuslav Kabrda.)
   * Used RbConfig instead of Config.
 
-=== Thanks
+### Thanks
 
   * Bohuslav Kabrda
 
-== 1.1.2 - 2011/07/04
+## 1.1.2 - 2011/07/04
 
   * [GitHub #2] fix test broken.
     (Reported by Mamoru Tasaka.)
@@ -387,65 +419,65 @@ to 1.4.9.
   * [GitHub #7] supported non i386 and amd64 architectures.
     (Reported by Antonio Terceiro.)
 
-=== Thanks
+### Thanks
 
   * Mamoru Tasaka
   * Antonio Terceiro
 
-== 1.1.1 - 2011/05/03
+## 1.1.1 - 2011/05/03
 
 * [ruby-gnome-devel-en] add
   /usr/lib/i386-linux-gnu/pkgconfig to the default paths.
   (Reported by Andrea B.C.)
 
-=== Thanks
+### Thanks
 
   * Funky Bibimba
 
-== 1.1.0 - 2011/04/03
+## 1.1.0 - 2011/04/03
 
 * [#3270846] add /usr/lib/x86_64-linux-gnu/pkgconfig to default paths.
   (Reported by Funky Bibimbap)
 
-=== Thanks
+### Thanks
 
   * Funky Bibimba
 
-== 1.0.8 - 2011/01/30
+## 1.0.8 - 2011/01/30
 
 * fix a bug that multiple PKGConfig.add_path doesn't work.
 
-== 1.0.7 - 2010/09/30
+## 1.0.7 - 2010/09/30
 
 * suppress warnings on Ruby 1.9.
 
-== 1.0.6 - 2010/09/23
+## 1.0.6 - 2010/09/23
 
 * add PKGConfig.libs_only_L.
 
-== 1.0.5 - 2010/09/23
+## 1.0.5 - 2010/09/23
 
 * suppress duplicated configure arguments processing.
 * use mkmf.rb message functions.
 
-== 1.0.4 - 2010/09/23
+## 1.0.4 - 2010/09/23
 
 * add PKGConfig.variable.
 
-== 1.0.3 - 2010/09/07
+## 1.0.3 - 2010/09/07
 
 * add path and override_variable customize API.
 * support description.
 
-== 1.0.2 - 2010/09/02
+## 1.0.2 - 2010/09/02
 
 * fix packaing miss.
 
-== 1.0.1 - 2010/09/02
+## 1.0.1 - 2010/09/02
 
 * support installing without gem.
 
-== 1.0.0 - 2010/09/02
+## 1.0.0 - 2010/09/02
 
 * Initial release!
 

data/lib/pkg-config/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.5.5"
+  VERSION = "1.5.7"
 end

data/lib/pkg-config.rb

@@ -173,6 +173,7 @@ class PackageConfig
         conda_prefix = ENV["CONDA_PREFIX"]
         if conda_prefix
           default_paths << File.join(conda_prefix, "lib", "pkgconfig")
+          default_paths << File.join(conda_prefix, "share", "pkgconfig")
         end
         default_paths << "/usr/local/lib64/pkgconfig"
         default_paths << "/usr/local/libx32/pkgconfig"
@@ -437,10 +438,10 @@ class PackageConfig
     begin
       loop do
         cflag = enumerator.next
-        normalized_cflags << cflag
+        normalized_cflags << cflag.dup
         case cflag
         when "-I"
-          normalized_cflags << enumerator.next
+          normalized_cflags.last << enumerator.next
         end
       end
     rescue StopIteration
@@ -520,7 +521,7 @@ class PackageConfig
 
   def parse_requires(requires)
     return [] if requires.nil?
-    requires_without_version = requires.gsub(/[<>]?=\s*[\d.a-zA-Z_-]+\s*/, "")
+    requires_without_version = requires.gsub(/(?:<|>|<=|>=|=)\s*[\d.a-zA-Z_-]+\s*/, "")
     requires_without_version.split(/[,\s]+/)
   end
 
@@ -645,7 +646,7 @@ module PKGConfig
         "yes (#{modversion(pkg)})"
       else
         if exist?(pkg)
-          "no (#{modversion(pkg)}"
+          "no (#{modversion(pkg)})"
         else
           "no (nonexistent)"
         end

data/test/test-pkg-config.rb

@@ -237,5 +237,30 @@ class PkgConfigTest < Test::Unit::TestCase
       assert_equal(["fribidi"],
                    parse_requires("fribidi >= fribidi_required_dep"))
     end
+  
+    def test_greater_than_or_equals_to
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi >= 1.0"))
+    end
+
+    def test_greater_than
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi > 1.0"))
+    end
+
+    def test_less_than_or_equals_to
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi <= 1.0"))
+    end
+
+    def test_less_than
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi < 1.0"))
+    end
+
+    def test_equals_to
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi = 1.0"))
+    end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.7
 platform: ruby
 authors:
 - Kouhei Sutou
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -62,7 +61,7 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - LGPL-2.1
-- NEWS
+- NEWS.md
 - README.rdoc
 - Rakefile
 - lib/pkg-config.rb
@@ -74,7 +73,6 @@ licenses:
 - LGPLv2+
 metadata:
   msys2_mingw_dependencies: pkg-config
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -89,8 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: A pkg-config implementation for Ruby
 test_files: