[DRE-commits] [SCM] ruby-mkrf.git branch, master, updated. debian/0.2.3+dfsg-1-16-g7135191

Cédric Boutillier boutil at debian.org
Mon Jun 24 21:21:35 UTC 2013


The following commit has been merged in the master branch:
commit 61b7e3afb568d647e37a3c7dcdb8de32cfce7308
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Jun 24 23:12:12 2013 +0200

    disable a check in tests which fails with libxml2 >= 2.9 (deprecated code)

diff --git a/debian/patches/0601_disable_docbCreateFileParserCtxt_check.patch b/debian/patches/0601_disable_docbCreateFileParserCtxt_check.patch
new file mode 100644
index 0000000..46ad2a6
--- /dev/null
+++ b/debian/patches/0601_disable_docbCreateFileParserCtxt_check.patch
@@ -0,0 +1,21 @@
+Description: skip check of docbCreateFileParserCtxt presence
+ This is marked as deprecated in libxml2 and has been removed from 2.9
+Author: Cédric Boutillier <boutil at debian.org>
+Origin: vendor
+Last-Update: 2013-06-24
+
+--- a/test/sample_files/libxml-ruby-0.3.8/ext/xml/extconf.rb
++++ b/test/sample_files/libxml-ruby-0.3.8/ext/xml/extconf.rb
+@@ -42,8 +42,9 @@
+     crash('Your version of libxml2 is too old.  Please upgrade.')
+   end
+ 
+-  unless g.has_function? 'docbCreateFileParserCtxt'
+-    crash('Need docbCreateFileParserCtxt')
+-  end
++  # this module is deprecated in recent libxml2
++  #unless g.has_function? 'docbCreateFileParserCtxt'
++  #  crash('Need docbCreateFileParserCtxt')
++  #end
+ 
+ end
diff --git a/debian/patches/series b/debian/patches/series
index 740a829..c330ea7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@
 0400_use_correct_ruby_version_in_tests.patch
 0500_replace_config_by_rbconfig.patch
 0600_fix_test_libxml.patch
+0601_disable_docbCreateFileParserCtxt_check.patch
 0610_fix_test_syck.patch
 0700_fix_link_command_order.patch
 9900_debug_test_failures.patch

-- 
ruby-mkrf.git



More information about the Pkg-ruby-extras-commits mailing list