[DRE-commits] [ruby-kramdown] 06/07: add fix-datadir-path.patch to detect installed data files and refresh skip_missing_math_engines.patch

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-kramdown.

commit ee786212a1b9095020c038e844868e7e8ef91476
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jun 8 23:03:49 2016 +0200

    add fix-datadir-path.patch to detect installed data files and refresh skip_missing_math_engines.patch
---
 debian/patches/fix-datadir-path.patch          | 16 ++++++++++++++++
 debian/patches/series                          |  1 +
 debian/patches/skip_missing_math_engines.patch |  4 ++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/patches/fix-datadir-path.patch b/debian/patches/fix-datadir-path.patch
new file mode 100644
index 0000000..a0a8a54
--- /dev/null
+++ b/debian/patches/fix-datadir-path.patch
@@ -0,0 +1,16 @@
+Description: fix config class to find installed data
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: https://github.com/gettalong/kramdown/pull/345
+Last-Update: 2016-06-08
+
+--- a/lib/kramdown/document.rb
++++ b/lib/kramdown/document.rb
+@@ -53,7 +53,7 @@
+     unless defined?(@@data_dir)
+       require 'rbconfig'
+       @@data_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'data', 'kramdown'))
+-      @@data_dir = File.expand_path(File.join(Config::CONFIG["datadir"], "kramdown")) if !File.exists?(@@data_dir)
++      @@data_dir = File.expand_path(File.join(RbConfig::CONFIG["datadir"], "kramdown")) if !File.exists?(@@data_dir)
+       raise "kramdown data directory not found! This is a bug, please report it!" unless File.directory?(@@data_dir)
+     end
+     @@data_dir
diff --git a/debian/patches/series b/debian/patches/series
index 179da66..bbd4d85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 skip_missing_math_engines.patch
+fix-datadir-path.patch
diff --git a/debian/patches/skip_missing_math_engines.patch b/debian/patches/skip_missing_math_engines.patch
index ebd2a65..05e1b92 100644
--- a/debian/patches/skip_missing_math_engines.patch
+++ b/debian/patches/skip_missing_math_engines.patch
@@ -1,7 +1,7 @@
 Description" Skip tests with math using unavailable math engines
 Forwarded: no
 Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2015-07-20
+Last-Update: 2016-06-08
 
 --- a/test/test_files.rb
 +++ b/test/test_files.rb
@@ -22,7 +22,7 @@ Last-Update: 2015-07-20
                       ].compact
  
    # Generate test methods for kramdown-to-xxx conversion
-@@ -295,7 +303,16 @@
+@@ -301,7 +309,16 @@
                         ('test/testcases/span/03_codespan/rouge/disabled.text' if RUBY_VERSION < '2.0'),
                         ('test/testcases/block/06_codeblock/rouge/simple.text' if RUBY_VERSION < '2.0'), #bc of rouge
                         ('test/testcases/block/06_codeblock/rouge/disabled.text' if RUBY_VERSION < '2.0'), #bc of rouge

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