[DRE-commits] [ruby-merb-haml] 02/09: Add haml4.patch to port merb-haml to version 4 of ruby-haml.

[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-merb-haml.

commit 8084befc8d92d610d7f0779d5ff5a9492e8fad9c
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jul 9 07:06:08 2014 +0200

    Add haml4.patch to port merb-haml to version 4 of ruby-haml.
---
 debian/changelog           |  1 +
 debian/patches/haml4.patch | 21 +++++++++++++++++++++
 debian/patches/series      |  2 ++
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 386efe3..906bff3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ruby-merb-haml (1.1.3-3) UNRELEASED; urgency=medium
   * Use the rake method to run the tests.
     It adds spec/ to the loadpath automatically and the spec_helper.rb file is
     found without additional directory information (Closes: #747690)
+  * Add haml4.patch to port merb-haml to version 4 of ruby-haml.
 
  -- Cédric Boutillier <boutil at debian.org>  Wed, 09 Jul 2014 06:48:12 +0200
 
diff --git a/debian/patches/haml4.patch b/debian/patches/haml4.patch
new file mode 100644
index 0000000..bc43e14
--- /dev/null
+++ b/debian/patches/haml4.patch
@@ -0,0 +1,21 @@
+Description: port to Haml 4
+ the precompiled_with_ambles method moved from Haml::Engine to Haml::Compiler,
+ and every Engine instance has a compiler attribute of that class.
+ This is a port of the change of the def_method method in Haml from version 3
+ to 4.
+Origin: vendor
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: https://github.com/wycats/merb/pull/7
+Last-Update: 2014-07-09
+
+--- a/lib/merb-haml/template.rb
++++ b/lib/merb-haml/template.rb
+@@ -49,7 +49,7 @@
+ 
+       setup = "@_engine = 'haml'"
+ 
+-      object.send(method, "def #{name}(_haml_locals = {}); #{setup}; #{precompiled_with_ambles(local_names)}; end",
++      object.send(method, "def #{name}(_haml_locals = {}); #{setup}; #{compiler.precompiled_with_ambles(local_names)}; end",
+                   @options[:filename], 0)
+     end
+  
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2bed9bc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+debian-changes
+haml4.patch

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