pkg-config 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fe7a6584418f822bb6415828ff01b297c46ef30
-  data.tar.gz: ff5970916bf87d0386fb451a24d29cda7ec7bef8
+  metadata.gz: 8abe472bb4c19c7d3f913d28fa8c3c78f15d3d44
+  data.tar.gz: a26ecd64e1e9601d3d4683fa5dd27b04d9748fc8
 SHA512:
-  metadata.gz: 054b0b55943dc67f61a9d6c7a3777a974d4de7932d77a815205870cc32c1086fa9d65265702e8814cfc4ff02f098b105ac1fb6743197ae74637390b17f4e07ae
-  data.tar.gz: 8e4af11ebddb0daa108eb7c346dc4490f12f5bf89233e586b83f0c7ea14a607499aef6bab04068b0cea1ea6cf057d5b56dbef061224be4b197445fd354fc595a
+  metadata.gz: 55e3b289f3e02ed605cae8d23a65686674f58082511b3789c45ab77a029b0866b554783fd7348ff70cb8926f8e4dbcd4ea9c048ac6a71b61452a109d4e17e477
+  data.tar.gz: e1c2f07b3250a79d13fed264b8f5b86b756bb4462ed48295c10220d5b932ebc446198000243a937077f6c561b321dff8efd8fd2be1b050d6746accd2936609d7

data/Gemfile

@@ -1,6 +1,6 @@
 # -*- mode: ruby; coding: utf-8 -*-
 #
-# Copyright (C) 2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -13,8 +13,8 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-source :rubygems
+source "https://rubygems.org/"
 
 gemspec

data/NEWS

@@ -1,5 +1,23 @@
 = NEWS
 
+== 1.1.6 - 2014/11/12
+
+  * Supported Ruby 2.1.
+    [GitHub:ruby-gnome2/ruby-gnome2#262][Reported by Steve Wills]
+
+=== Thanks
+
+  * Steve Wills
+
+== 1.1.5 - 2013/12/29
+
+  * Supported XQuartz.
+    [GitHub:#10][Patch by Masafumi Yokoyama]
+
+=== Thanks
+
+  * Masafumi Yokoyama
+
 == 1.1.4 - 2012/08/02
 
   * Supported mswin64 as MSVC environment.

data/README.rdoc

@@ -47,7 +47,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 See LGPL-2.1 file for details.
 

data/Rakefile

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 task :default => :test
 

data/lib/pkg-config.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Kouhei Sutou <kou@cozmixng.org>
+# Copyright 2008-2013 Kouhei Sutou <kou@cozmixng.org>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -12,7 +12,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 begin
   require "pkg-config/version"
@@ -90,7 +90,11 @@ class PackageConfig
         rescue DL::DLError
           return nil
         end
-        extern "const char *dln_find_exe(const char *, const char *)"
+        begin
+          extern "const char *dln_find_exe(const char *, const char *)"
+        rescue DL::DLError
+          return nil
+        end
       end
       path = dln.dln_find_exe(pkg_config.to_s, nil)
       if path.nil? or path.size.zero?
@@ -192,12 +196,13 @@ class PackageConfig
 
   private
   def collect_cflags
-    all_cflags = all_required_packages.collect do |package|
+    cflags_set = [declaration("Cflags")]
+    cflags_set += all_required_packages.collect do |package|
       self.class.new(package, @options).cflags
     end
-    all_cflags = [declaration("Cflags")] + all_cflags
-    all_cflags = all_cflags.join(" ").gsub(/-I /, '-I').split.uniq
+    all_cflags = normalize_cflags(Shellwords.split(cflags_set.join(" ")))
     path_flags, other_flags = all_cflags.partition {|flag| /\A-I/ =~ flag}
+    path_flags = remove_duplicated_include_paths(path_flags)
     path_flags = path_flags.reject do |flag|
       flag == "-I/usr/include"
     end
@@ -209,6 +214,27 @@ class PackageConfig
     [path_flags, other_flags]
   end
 
+  def normalize_cflags(cflags)
+    normalized_cflags = []
+    enumerator = cflags.to_enum
+    begin
+      loop do
+        cflag = enumerator.next
+        normalized_cflags << cflag
+        case cflag
+        when "-I"
+          normalized_cflags << enumerator.next
+        end
+      end
+    rescue StopIteration
+    end
+    normalized_cflags
+  end
+
+  def remove_duplicated_include_paths(path_flags)
+    path_flags.uniq
+  end
+
   def collect_libs
     all_libs = required_packages.collect do |package|
       self.class.new(package, @options).libs

data/lib/pkg-config/version.rb

@@ -1,4 +1,4 @@
-# Copyright 2012 Kouhei Sutou <kou@cozmixng.org>
+# Copyright 2012-2013 Kouhei Sutou <kou@cozmixng.org>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -12,8 +12,8 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

data/test/run-test.rb

@@ -12,10 +12,5 @@ require "bundler/setup"
 require 'test-unit'
 
 $LOAD_PATH.unshift(lib_dir)
-$LOAD_PATH.unshift(test_dir)
 
-Dir.glob("test/**/test_*.rb") do |file|
-  require file.gsub(/(?:^test\/|\.rb$)/, '')
-end
-
-exit Test::Unit::AutoRunner.run(false)
+exit Test::Unit::AutoRunner.run(true)

metadata

@@ -1,69 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit-notify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: pkg-config can be used in your extconf.rb to properly detect need libraries
@@ -74,16 +60,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.rdoc
-- NEWS
 - Gemfile
-- Rakefile
 - LGPL-2.1
-- lib/pkg-config/version.rb
+- NEWS
+- README.rdoc
+- Rakefile
 - lib/pkg-config.rb
-- test/test_pkg_config.rb
+- lib/pkg-config/version.rb
 - test/run-test.rb
-homepage: https://github.com/rcairo/pkg-config
+- test/test_pkg_config.rb
+homepage: https://github.com/ruby-gnome2/pkg-config
 licenses:
 - LGPLv2+
 metadata: {}
@@ -93,21 +79,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: cairo
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A pkg-config implementation for Ruby
 test_files:
 - test/test_pkg_config.rb
 - test/run-test.rb
-has_rdoc: