pkg-config 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4657b85e9f8971fcb4c962494770ad50f66f0517904e815f62a49b60bbced375
-  data.tar.gz: fcd422845f64d152fa196a94a62b0d3c0136f2ca9dd1ab6f3beacbe692994dfc
+  metadata.gz: a47d4bf798e1d6eb5ad3c16fad3ab29dead0f05b2d41e39d98ecb3b3642ac6ea
+  data.tar.gz: 3ca7a21d13ffba40247e65134cbac57a07690c69312898af8e29fd5394616293
 SHA512:
-  metadata.gz: ba1320c3c3f5f51ae3b5b51cf665d58d7c9f2c7b4fb384b329917d381d6dfc0f8908bf6408ddee6617c39cd5d3e96da4d6acf444852cfd805a883e45b7f2c5cd
-  data.tar.gz: d05605e7648547cca52dbe9f0f474d84645b0d6905a7af766984c52818d346b23b5249cf20991f590430483dd65c2698fa9bee3d35430485d53b4be7e6490558
+  metadata.gz: 21d73b0dd4803571c903e01410c1d199297af2d3c17a5254197511285f1f1807875c70d819e06cc1b28a6158c715111be694aae997799432af1eb4c41e657aaf
+  data.tar.gz: 31a9e5bae18a521b65c6ba3b82cffb3197cd076e0318682b44b2f71c65dbd80fe40369ba09125ed3a4b2ad2ce1b9c39a11237922e798583fe94ed060bb329e06

data/NEWS

@@ -1,5 +1,16 @@
 = NEWS
 
+== 1.3.8 - 2019-08-13
+
+=== Improvements
+
+  * Added support for -framework on macOS.
+    [GitHub:ruby-gnome2/ruby-gnome2#1287][Reported by Viko]
+
+=== Thanks
+
+  * Viko
+
 == 1.3.7 - 2019-03-17
 
 === Improvements

data/lib/pkg-config.rb

@@ -293,8 +293,8 @@ class PackageConfig
       self.class.new(package, @options).libs
     end
     all_libs = [declaration("Libs")] + all_libs
-    all_libs = all_libs.join(" ").gsub(/-([Ll]) /, '\1').split.uniq
-    path_flags, other_flags = all_libs.partition {|flag| /\A-L/ =~ flag}
+    all_flags = split_lib_flags(all_libs.join(" "))
+    path_flags, other_flags = all_flags.partition {|flag| /\A-L/ =~ flag}
     path_flags = normalize_path_flags(path_flags, "-L")
     path_flags = path_flags.reject do |flag|
       /\A-L\/usr\/lib(?:64|x32)?\z/ =~ flag
@@ -314,6 +314,29 @@ class PackageConfig
     [path_flags, other_flags]
   end
 
+  def split_lib_flags(libs_command_line)
+    all_flags = {}
+    flags = []
+    in_option = false
+    libs_command_line.gsub(/-([Ll]) /, '\1').split.each do |arg|
+      if in_option
+        flags << arg
+        in_option = false
+      else
+        case arg
+        when /-[lL]/
+          next if all_flags.key?(arg)
+          all_flags[arg] = true
+          flags << arg
+          in_option = true
+        else
+          flags << arg
+        end
+      end
+    end
+    flags
+  end
+
   IDENTIFIER_RE = /[a-zA-Z\d_\.]+/
   def parse_pc
     raise ".pc for #{@name} doesn't exist." unless exist?

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.3.7"
+  VERSION = "1.3.8"
 end

data/test/test_pkg_config.rb

@@ -36,10 +36,61 @@ class PkgConfigTest < Test::Unit::TestCase
     assert_pkg_config("cairo-png", ["--cflags-only-I"], @cairo_png.cflags_only_I)
   end
 
+  def split_lib_flags(libs_command_line)
+    @cairo.__send__(:split_lib_flags, libs_command_line)
+  end
+
+  def test_split_libs
+    assert_equal([
+                   "-L/usr/local/Cellar/gtk+3/3.24.10/lib",
+                   "-L/usr/local/Cellar/pango/1.44.3/lib",
+                   "-L/usr/local/Cellar/harfbuzz/2.5.3/lib",
+                   "-L/usr/local/Cellar/gdk-pixbuf/2.38.1_1/lib",
+                   "-L/usr/local/Cellar/cairo/1.16.0_2/lib",
+                   "-L/usr/local/Cellar/glib/2.60.6/lib",
+                   "-L/usr/local/opt/gettext/lib",
+                   "-lgdk-3",
+                   "-framework", "Cocoa",
+                   "-framework", "Carbon",
+                   "-framework", "CoreGraphics",
+                   "-lpangocairo-1.0",
+                   "-lpango-1.0",
+                   "-lharfbuzz",
+                   "-lgdk_pixbuf-2.0",
+                   "-lcairo-gobject",
+                   "-lcairo",
+                   "-lgobject-2.0",
+                   "-lglib-2.0",
+                   "-lintl"
+                 ],
+                 split_lib_flags("-L/usr/local/Cellar/gtk+3/3.24.10/lib " +
+                                 "-L/usr/local/Cellar/pango/1.44.3/lib " +
+                                 "-L/usr/local/Cellar/harfbuzz/2.5.3/lib " +
+                                 "-L/usr/local/Cellar/gdk-pixbuf/2.38.1_1/lib " +
+                                 "-L/usr/local/Cellar/cairo/1.16.0_2/lib " +
+                                 "-L/usr/local/Cellar/glib/2.60.6/lib " +
+                                 "-L/usr/local/opt/gettext/lib " +
+                                 "-lgdk-3 " +
+                                 "-framework Cocoa " +
+                                 "-framework Carbon " +
+                                 "-framework CoreGraphics " +
+                                 "-lpangocairo-1.0 " +
+                                 "-lpango-1.0 " +
+                                 "-lharfbuzz " +
+                                 "-lgdk_pixbuf-2.0 " +
+                                 "-lcairo-gobject " +
+                                 "-lcairo " +
+                                 "-lgobject-2.0 " +
+                                 "-lglib-2.0 " +
+                                 "-lintl"))
+  end
+
   def test_libs
     assert_pkg_config("cairo", ["--libs"], @cairo.libs)
     assert_pkg_config("cairo-png", ["--libs"], @cairo_png.libs)
+  end
 
+  def test_libs_msvc
     @cairo.msvc_syntax = true
     result = pkg_config("cairo", "--libs")
     msvc_result = result.gsub(/-lcairo\b/, "cairo.lib")
@@ -51,7 +102,9 @@ class PkgConfigTest < Test::Unit::TestCase
   def test_libs_only_l
     assert_pkg_config("cairo", ["--libs-only-l"], @cairo.libs_only_l)
     assert_pkg_config("cairo-png", ["--libs-only-l"], @cairo_png.libs_only_l)
+  end
 
+  def test_libs_only_l_msvc
     @cairo_png.msvc_syntax = true
     result = pkg_config("cairo-png", "--libs-only-l")
     msvc_result = result.gsub(/-l(cairo|png[0-9]+|z)\b/, '\1.lib')
@@ -62,7 +115,9 @@ class PkgConfigTest < Test::Unit::TestCase
   def test_libs_only_L
     assert_pkg_config("cairo", ["--libs-only-L"], @cairo.libs_only_L)
     assert_pkg_config("cairo-png", ["--libs-only-L"], @cairo_png.libs_only_L)
+  end
 
+  def test_libs_only_L_msvc
     @cairo_png.msvc_syntax = true
     result = pkg_config("cairo-png", "--libs-only-L")
     msvc_result = result.gsub(/-L/, '/libpath:')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-17 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: A pkg-config implementation for Ruby