[DRE-commits] [ruby-fast-gettext] 01/01: re-add 0004-Properly-handle-PO-files-encoding-in-PoFile.to_mo_fi.patch

[Michael Moll]

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

mmoll-guest pushed a commit to branch master
in repository ruby-fast-gettext.

commit e28926d76c1996f85b0cb66f756af4ddecc9b5f5
Author: Michael Moll <Michael Moll kvedulv at kvedulv.de>
Date:   Tue Sep 13 18:09:35 2016 +0200

    re-add 0004-Properly-handle-PO-files-encoding-in-PoFile.to_mo_fi.patch
    
    and skip tests that became untestable because of the initial patch
---
 debian/changelog                                   |  1 -
 ...ndle-PO-files-encoding-in-PoFile.to_mo_fi.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cdcf778..076fe1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ ruby-fast-gettext (1.2.0-1) unstable; urgency=medium
   * Team upload.
   * New upstream release
   * Refresh patches
-  * Delete 0004-Properly-handle-PO-files-encoding-in-PoFile.to_mo_fi.patch
 
  -- Michael Moll <kvedulv at kvedulv.de>  Tue, 06 Sep 2016 01:35:24 +0200
 
diff --git a/debian/patches/0004-Properly-handle-PO-files-encoding-in-PoFile.to_mo_fi.patch b/debian/patches/0004-Properly-handle-PO-files-encoding-in-PoFile.to_mo_fi.patch
new file mode 100644
index 0000000..0cd0ee6
--- /dev/null
+++ b/debian/patches/0004-Properly-handle-PO-files-encoding-in-PoFile.to_mo_fi.patch
@@ -0,0 +1,41 @@
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
+Date: Mon, 5 May 2014 18:43:48 +0200
+Subject: Properly handle PO files encoding in PoFile.to_mo_file
+
+---
+ lib/fast_gettext/po_file.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: ruby-fast-gettext/lib/fast_gettext/po_file.rb
+===================================================================
+--- ruby-fast-gettext.orig/lib/fast_gettext/po_file.rb
++++ ruby-fast-gettext/lib/fast_gettext/po_file.rb
+@@ -32,7 +32,7 @@ module FastGettext
+       parser.report_warning = options.fetch(:report_warning, true)
+ 
+       mo_file = FastGettext::GetText::MOFile.new
+-      parser.parse(File.read(file), mo_file)
++      parser.parse_file(file, mo_file)
+       mo_file
+     end
+   end
+Index: ruby-fast-gettext/spec/fast_gettext/po_file_spec.rb
+===================================================================
+--- ruby-fast-gettext.orig/spec/fast_gettext/po_file_spec.rb
++++ ruby-fast-gettext/spec/fast_gettext/po_file_spec.rb
+@@ -40,6 +40,7 @@ describe FastGettext::PoFile do
+   end
+ 
+   it "loads the file when a translation is touched for the first time" do
++    skip
+     File.should_receive(:read).once.with(de_file).and_call_original
+ 
+     de['car']
+@@ -50,6 +51,7 @@ describe FastGettext::PoFile do
+     let(:de) { FastGettext::PoFile.new(de_file, :eager_load => true) }
+ 
+     it "loads the file when new instance is created" do
++      skip
+       File.should_receive(:read).once.with(de_file).and_call_original
+       FastGettext::PoFile.new(de_file, :eager_load => true)
+     end
diff --git a/debian/patches/series b/debian/patches/series
index da8abaf..ca02ed6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 0001-fix-rspec-requires.patch
 0002-skip-safe-mode-test.patch
 0003-fix-tests-with-ruby-calls.patch
+0004-Properly-handle-PO-files-encoding-in-PoFile.to_mo_fi.patch
 0005-remove-bogus-tests.patch
 0006-Use-IO-each_line-instead-of-IO-lines-in-poparser.patch
 0007-Add-metadata.yml-from-upstream-gem.patch

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