[DRE-commits] [ruby-pkg-config] 02/05: Fix test failure on --libs-only-l with libz (Closes: #870850)

Daisuke Higuchi dai at moszumanska.debian.org
Sun Aug 6 14:20:52 UTC 2017


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 d9c6a85ba644bf4b9c278e0a565117351972276f
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Sun Aug 6 23:14:48 2017 +0900

    Fix test failure on --libs-only-l with libz (Closes: #870850)
---
 debian/patches/fix_libz_bug870850.patch | 19 +++++++++++++++++++
 debian/patches/series                   |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/fix_libz_bug870850.patch b/debian/patches/fix_libz_bug870850.patch
new file mode 100644
index 0000000..367cbd3
--- /dev/null
+++ b/debian/patches/fix_libz_bug870850.patch
@@ -0,0 +1,19 @@
+Description: Fix test failure on --libs-only-l with libz
+Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
+Bug-Debian: https://bugs.debian.org/870850
+Forwarded: https://github.com/ruby-gnome2/pkg-config/pull/14
+Last-Update: 2017-08-06
+
+Index: ruby-pkg-config/test/test_pkg_config.rb
+===================================================================
+--- ruby-pkg-config.orig/test/test_pkg_config.rb
++++ ruby-pkg-config/test/test_pkg_config.rb
+@@ -45,7 +45,7 @@ class PkgConfigTest < Test::Unit::TestCa
+ 
+     @cairo_png.msvc_syntax = true
+     result = pkg_config("cairo-png", "--libs-only-l")
+-    msvc_result = result.gsub(/-l(cairo|png[0-9]+)\b/, '\1.lib')
++    msvc_result = result.gsub(/-l(cairo|png[0-9]+|z)\b/, '\1.lib')
+     assert_not_equal(msvc_result, result)
+     assert_equal(msvc_result, @cairo_png.libs_only_l)
+   end
diff --git a/debian/patches/series b/debian/patches/series
index 644dc57..0ac296a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 rubygem-pkg-config-1.1.3-cflags-result-sort.patch
+fix_libz_bug870850.patch
+debian-changes

-- 
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