[DRE-commits] [ruby-pkg-config] 08/11: fix FTBFS: ERROR: Test "ruby1.9.1" failed (Closes: #735862)

[Daisuke Higuchi]

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 fc4c93b85e9f280a81c49d36f5a7e70b079fb472
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Thu Mar 13 22:44:11 2014 +0900

    fix FTBFS: ERROR: Test "ruby1.9.1" failed (Closes: #735862)
    
    pick up from upstream issues and modify for debian.
---
 ...bygem-pkg-config-1.1.3-cflags-result-sort.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/rubygem-pkg-config-1.1.3-cflags-result-sort.patch b/debian/patches/rubygem-pkg-config-1.1.3-cflags-result-sort.patch
new file mode 100644
index 0000000..b5cacb9
--- /dev/null
+++ b/debian/patches/rubygem-pkg-config-1.1.3-cflags-result-sort.patch
@@ -0,0 +1,24 @@
+Description: Fix test failure on test_cflags, test_cflags_only_I with
+ recent pkgconfig
+Origin: http://pkgs.fedoraproject.org/cgit/rubygem-pkg-config.git/commit/?id=982fedb13f4d09e137b3f0bbd0f6f684fb8cac5e
+Forwarded: https://github.com/ruby-gnome2/pkg-config/issues/6
+Author: TASAKA Mamoru <mtasaka at fedoraproject.org>
+Reviewed-by: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
+Last-Update: 2014-03-13
+
+--- pkg-config-1.1.3/test/test_pkg_config.rb.newpkgconfig	2012-08-02 14:18:08.216508255 +0900
++++ pkg-config-1.1.3/test/test_pkg_config.rb	2012-08-02 15:14:58.597886753 +0900
+@@ -109,7 +109,12 @@
+   def assert_pkg_config(package, pkg_config_args, actual)
+     result = pkg_config(package, *pkg_config_args)
+     result = nil if result.empty?
+-    assert_equal(result, actual)
++    begin
++      assert_equal(result, actual)
++    rescue Exception
++      puts "Did not match, retry with sorting"
++      assert_equal(result.gsub(/"/,"").split(" ").sort.uniq.join(" "), actual.gsub(/"/,"").split(" ").sort.uniq.join(" "))
++    end
+   end
+ 
+   def assert_override_variables(expected, override_variables)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..644dc57
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+rubygem-pkg-config-1.1.3-cflags-result-sort.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-pkg-config.git