[DRE-commits] [ruby-pkg-config] 01/11: Imported Upstream version 1.1.3
Daisuke Higuchi
dai at moszumanska.debian.org
Thu Mar 13 13:52:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
dai pushed a commit to branch master
in repository ruby-pkg-config.
commit 43e95cd1c66d6d6b65c3b6aef6504bdc48ee65ed
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date: Thu Mar 13 22:18:45 2014 +0900
Imported Upstream version 1.1.3
---
.gitignore | 3 ++
NEWS | 87 ++++++++++++++++++++++++++++++++
lib/pkg-config.rb | 6 +--
metadata.yml | 129 ------------------------------------------------
test/test_pkg_config.rb | 4 +-
5 files changed, 94 insertions(+), 135 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1a34106
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/pkg/
+/doc/
+/Gemfile.lock
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..f8f9221
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,87 @@
+= NEWS
+
+== 1.1.3 - 2012/01/29
+
+ * [GitHub #8] fix test broken by libpng version.
+ (Patch by Bohuslav Kabrda.)
+ * Used RbConfig instead of Config.
+
+=== Thanks
+
+ * Bohuslav Kabrda
+
+== 1.1.2 - 2011/07/04
+
+ * [GitHub #2] fix test broken.
+ (Reported by Mamoru Tasaka.)
+ * [GitHub #4] update project descripton.
+ (Patch by Antonio Terceiro.)
+ * [GitHub #4] use setup.rb instead of extconf.rb.
+ (Patch by Antonio Terceiro.)
+ * [GitHub #3] add Copyright notice to README.
+ (Suggested by Antonio Terceiro.)
+ * [GitHub #7] supported non i386 and amd64 architectures.
+ (Reported by Antonio Terceiro.)
+
+=== Thanks
+
+ * Mamoru Tasaka
+ * Antonio Terceiro
+
+== 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
+
+ * Funky Bibimba
+
+== 1.1.0 - 2011/04/03
+
+* [#3270846] add /usr/lib/x86_64-linux-gnu/pkgconfig to default paths.
+ (Reported by Funky Bibimbap)
+
+=== Thanks
+
+ * Funky Bibimba
+
+== 1.0.8 - 2011/01/30
+
+* fix a bug that multiple PKGConfig.add_path doesn't work.
+
+== 1.0.7 - 2010/09/30
+
+* suppress warnings on Ruby 1.9.
+
+== 1.0.6 - 2010/09/23
+
+* add PKGConfig.libs_only_L.
+
+== 1.0.5 - 2010/09/23
+
+* suppress duplicated configure arguments processing.
+* use mkmf.rb message functions.
+
+== 1.0.4 - 2010/09/23
+
+* add PKGConfig.variable.
+
+== 1.0.3 - 2010/09/07
+
+* add path and override_variable customize API.
+* support description.
+
+== 1.0.2 - 2010/09/02
+
+* fix packaing miss.
+
+== 1.0.1 - 2010/09/02
+
+* support installing without gem.
+
+== 1.0.0 - 2010/09/02
+
+* Initial release!
+
diff --git a/lib/pkg-config.rb b/lib/pkg-config.rb
index 2958ca9..3d40abc 100644
--- a/lib/pkg-config.rb
+++ b/lib/pkg-config.rb
@@ -88,7 +88,7 @@ class PackageConfig
extern "const char *dln_find_exe(const char *, const char *)"
end
path = dln.dln_find_exe(pkg_config.to_s, nil)
- if path.size.zero?
+ if path.nil? or path.size.zero?
nil
else
Pathname(path.to_s)
@@ -316,7 +316,7 @@ class PackageConfig
end
module PKGConfig
- VERSION = "1.1.2"
+ VERSION = "1.1.3"
@@paths = []
@@override_variables = {}
@@ -331,7 +331,7 @@ module PKGConfig
end
def msvc?
- /mswin32/.match(RUBY_PLATFORM) and /^cl\b/.match(Config::CONFIG['CC'])
+ /mswin32/.match(RUBY_PLATFORM) and /^cl\b/.match(RbConfig::CONFIG['CC'])
end
def package_config(package)
diff --git a/metadata.yml b/metadata.yml
deleted file mode 100644
index 7cc65c9..0000000
--- a/metadata.yml
+++ /dev/null
@@ -1,129 +0,0 @@
---- !ruby/object:Gem::Specification
-name: pkg-config
-version: !ruby/object:Gem::Version
- hash: 23
- prerelease:
- segments:
- - 1
- - 1
- - 2
- version: 1.1.2
-platform: ruby
-authors:
-- Kouhei Sutou
-autorequire:
-bindir: bin
-cert_chain: []
-
-date: 2011-07-04 00:00:00 Z
-dependencies:
-- !ruby/object:Gem::Dependency
- version_requirements: &id001 !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 3
- segments:
- - 0
- version: "0"
- name: test-unit
- prerelease: false
- type: :development
- requirement: *id001
-- !ruby/object:Gem::Dependency
- version_requirements: &id002 !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 3
- segments:
- - 0
- version: "0"
- name: test-unit-notify
- prerelease: false
- type: :development
- requirement: *id002
-- !ruby/object:Gem::Dependency
- version_requirements: &id003 !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 3
- segments:
- - 0
- version: "0"
- name: rake
- prerelease: false
- type: :development
- requirement: *id003
-- !ruby/object:Gem::Dependency
- version_requirements: &id004 !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 3
- segments:
- - 0
- version: "0"
- name: jeweler
- prerelease: false
- type: :development
- requirement: *id004
-description: pkg-config can be used in your extconf.rb to properly detect need libraries for compiling Ruby native extensions
-email:
-- kou at cozmixng.org
-executables: []
-
-extensions: []
-
-extra_rdoc_files:
-- README.rdoc
-files:
-- Gemfile
-- LGPL-2.1
-- Rakefile
-- lib/pkg-config.rb
-- setup.rb
-- README.rdoc
-- test/test_pkg_config.rb
-- test/run-test.rb
-homepage: http://github.com/rcairo/pkg-config
-licenses:
-- LGPLv2+
-post_install_message:
-rdoc_options: []
-
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 3
- segments:
- - 0
- version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 3
- segments:
- - 0
- version: "0"
-requirements: []
-
-rubyforge_project: cairo
-rubygems_version: 1.7.2
-signing_key:
-specification_version: 3
-summary: A pkg-config implementation for Ruby
-test_files:
-- test/test_pkg_config.rb
-- test/run-test.rb
diff --git a/test/test_pkg_config.rb b/test/test_pkg_config.rb
index 4cb5834..61903eb 100644
--- a/test/test_pkg_config.rb
+++ b/test/test_pkg_config.rb
@@ -17,13 +17,11 @@ class PkgConfigTest < Test::Unit::TestCase
end
def test_cflags
- omit("this is known bug in 1.1.2") if PKGConfig::VERSION == "1.1.2"
assert_pkg_config("cairo", ["--cflags"], @cairo.cflags)
assert_pkg_config("cairo-png", ["--cflags"], @cairo_png.cflags)
end
def test_cflags_only_I
- omit("this is known bug in 1.1.2") if PKGConfig::VERSION == "1.1.2"
assert_pkg_config("cairo", ["--cflags-only-I"], @cairo.cflags_only_I)
assert_pkg_config("cairo-png", ["--cflags-only-I"], @cairo_png.cflags_only_I)
end
@@ -46,7 +44,7 @@ class PkgConfigTest < Test::Unit::TestCase
@cairo_png.msvc_syntax = true
result = pkg_config("cairo-png", "--libs-only-l")
- msvc_result = result.gsub(/-l(cairo|png12)\b/, '\1.lib')
+ msvc_result = result.gsub(/-l(cairo|png[0-9]+)\b/, '\1.lib')
assert_not_equal(msvc_result, result)
assert_equal(msvc_result, @cairo_png.libs_only_l)
end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-pkg-config.git
More information about the Pkg-ruby-extras-commits
mailing list