[DRE-commits] [ruby-prawn] 02/08: refresh patches
Cédric Boutillier
boutil at moszumanska.debian.org
Wed Apr 29 14:37:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
boutil pushed a commit to branch master
in repository ruby-prawn.
commit 391e4e0474316f4d43d6641e386ced6c6ff6e1eb
Author: Cédric Boutillier <boutil at debian.org>
Date: Wed Apr 29 11:15:24 2015 +0200
refresh patches
---
.../0100_remove_bundler_rubygems_stuff.patch | 9 ++--
debian/patches/0300_fix_paths.patch | 4 +-
debian/patches/0400_use_system_fonts.patch | 59 +++++++++++++---------
debian/patches/0405_use_system_fonts_manual.patch | 6 +--
.../0500_disable_tests_using_removed_files.patch | 18 +++----
5 files changed, 53 insertions(+), 43 deletions(-)
diff --git a/debian/patches/0100_remove_bundler_rubygems_stuff.patch b/debian/patches/0100_remove_bundler_rubygems_stuff.patch
index 986dcee..fc3d212 100644
--- a/debian/patches/0100_remove_bundler_rubygems_stuff.patch
+++ b/debian/patches/0100_remove_bundler_rubygems_stuff.patch
@@ -1,10 +1,10 @@
Description: remove rubygems and bundler stuff from specs
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-04-14
+Last-Update: 2015-04-29
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
-@@ -2,17 +2,6 @@
+@@ -2,17 +2,7 @@
puts "Prawn specs: Running on Ruby Version: #{RUBY_VERSION}"
@@ -18,7 +18,8 @@ Last-Update: 2014-04-14
- end
-end
-
--$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
- require "prawn"
+-require_relative "../lib/prawn"
++require "prawn"
Prawn.debug = true
+ Prawn::Font::AFM.hide_m17n_warning = true
diff --git a/debian/patches/0300_fix_paths.patch b/debian/patches/0300_fix_paths.patch
index 225e504..ba1c619 100644
--- a/debian/patches/0300_fix_paths.patch
+++ b/debian/patches/0300_fix_paths.patch
@@ -1,10 +1,10 @@
Description: fix fonts path to use only prawn's fonts directory
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-04-14
+Last-Update: 2015-04-29
--- a/lib/prawn/font/afm.rb
+++ b/lib/prawn/font/afm.rb
-@@ -28,9 +28,7 @@
+@@ -34,9 +34,7 @@
@metrics_path ||= m.split(':')
else
@metrics_path ||= [
diff --git a/debian/patches/0400_use_system_fonts.patch b/debian/patches/0400_use_system_fonts.patch
index 6735117..dfa0946 100644
--- a/debian/patches/0400_use_system_fonts.patch
+++ b/debian/patches/0400_use_system_fonts.patch
@@ -3,7 +3,7 @@ Description: use system fonts when possible
available in Debian. These copies have been removed from the Debian source
package, and system fonts are used instead.
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-09-29
+Last-Update: 2015-04-29
--- a/spec/line_wrap_spec.rb
+++ b/spec/line_wrap_spec.rb
@@ -34,16 +34,16 @@ Last-Update: 2014-09-29
@line_wrap = Prawn::Text::Formatted::LineWrap.new
string = "hello#{Prawn::Text::SHY}world"
-@@ -139,7 +139,7 @@
- :document => @pdf)
- string.should == "helloworld hiearth"
+@@ -154,7 +154,7 @@
+ it "should not display soft hyphens except at the end of a line " +
+ "for more than one element in format_array", :issue => 347 do
- @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
+ @pdf.font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
@line_wrap = Prawn::Text::Formatted::LineWrap.new
- string1 = "hello#{Prawn::Text::SHY}world "
-@@ -169,7 +169,7 @@
+ string1 = @pdf.font.normalize_encoding("hello#{Prawn::Text::SHY}world ")
+@@ -184,7 +184,7 @@
:document => @pdf)
string.should == "hello"
@@ -52,7 +52,7 @@ Last-Update: 2014-09-29
@line_wrap = Prawn::Text::Formatted::LineWrap.new
enough_width_for_hello_world = 68
-@@ -208,7 +208,7 @@
+@@ -223,7 +223,7 @@
expected.force_encoding(Encoding::UTF_8)
string.should == expected
@@ -90,7 +90,7 @@ Last-Update: 2014-09-29
@pdf.text str
text = PDF::Inspector::Text.analyze(@pdf.render)
-@@ -323,7 +323,7 @@
+@@ -322,7 +322,7 @@
it "should_not raise_error an exception when a shift-jis string is rendered" do
datafile = "#{Prawn::DATADIR}/shift_jis_text.txt"
sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets }
@@ -99,7 +99,7 @@ Last-Update: 2014-09-29
# Expect that the call to text will not raise an encoding error
@pdf.text(sjis_str)
-@@ -425,7 +425,7 @@
+@@ -526,7 +526,7 @@
def add_unicode_fonts(pdf)
@@ -121,16 +121,16 @@ Last-Update: 2014-09-29
@pdf.character_spacing(0) do
--- a/spec/formatted_text_box_spec.rb
+++ b/spec/formatted_text_box_spec.rb
-@@ -20,7 +20,7 @@
+@@ -19,7 +19,7 @@
+ end
- it "should not raise an Encoding::CompatibilityError when keeping a TTF and an " +
- "AFM font together" do
+ it "should not raise an Encoding::CompatibilityError when keeping a TTF and an AFM font together" do
- file = "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
+ file = "/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf"
+
@pdf.font_families["Kai"] = {
:normal => { :file => file, :font => "Kai" }
- }
-@@ -109,7 +109,7 @@
+@@ -87,7 +87,7 @@
"a Chinese font and set of Chinese glyphs not in the current font" do
it "should change the font to the Chinese font for the Chinese glyphs" do
create_pdf
@@ -139,7 +139,7 @@ Last-Update: 2014-09-29
@pdf.font_families["Kai"] = {
:normal => { :file => file, :font => "Kai" }
}
-@@ -137,7 +137,7 @@
+@@ -115,7 +115,7 @@
"an AFM font and Win-Ansi glyph not in the current Chinese font" do
it "should change the font to the AFM font for the Win-Ansi glyph" do
create_pdf
@@ -148,7 +148,7 @@ Last-Update: 2014-09-29
@pdf.font_families["Kai"] = {
:normal => { :file => file, :font => "Kai" }
}
-@@ -166,7 +166,7 @@
+@@ -144,7 +144,7 @@
"level font" do
it "should use the fragment level font except for glyphs not in that font" do
create_pdf
@@ -157,7 +157,7 @@ Last-Update: 2014-09-29
@pdf.font_families["Kai"] = {
:normal => { :file => file, :font => "Kai" }
}
-@@ -193,7 +193,7 @@
+@@ -177,7 +177,7 @@
describe "Text::Formatted::Box" do
before(:each) do
create_pdf
@@ -166,6 +166,15 @@ Last-Update: 2014-09-29
@pdf.font_families["Kai"] = {
:normal => { :file => file, :font => "Kai" }
}
+@@ -244,7 +244,7 @@
+ "with glyphs not in the primary or the fallback fonts" do
+
+ it "should raise an exception" do
+- file = "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
++ file = "/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf"
+ create_pdf
+ formatted_text = [{ :text => "hello world. 世界你好。" }]
+
--- a/spec/font_spec.rb
+++ b/spec/font_spec.rb
@@ -50,7 +50,7 @@
@@ -177,7 +186,7 @@ Last-Update: 2014-09-29
@pdf.width_of("\nhello world\n").should ==
@pdf.width_of("hello world")
-@@ -146,7 +146,7 @@
+@@ -171,7 +171,7 @@
end
it "should accept Pathname objects for font files" do
@@ -186,7 +195,7 @@ Last-Update: 2014-09-29
@pdf.font_families["DejaVu Sans"] = {
:normal => file
}
-@@ -161,7 +161,7 @@
+@@ -186,7 +186,7 @@
end
it "should accept IO objects for font files" do
@@ -195,7 +204,7 @@ Last-Update: 2014-09-29
@pdf.font_families["DejaVu Sans"] = {
normal: Prawn::Font.load(@pdf, io)
}
-@@ -316,15 +316,15 @@
+@@ -341,15 +341,15 @@
end
it "should return true when present in a TTF font" do
@@ -214,7 +223,7 @@ Last-Update: 2014-09-29
font.glyph_present?("€").should be_false
end
end
-@@ -333,7 +333,7 @@
+@@ -358,7 +358,7 @@
before do
create_pdf
@@ -223,7 +232,7 @@ Last-Update: 2014-09-29
end
it "should calculate string width taking into account accented characters" do
-@@ -437,7 +437,7 @@
+@@ -462,7 +462,7 @@
describe "#character_count(text)" do
it "should work on TTF fonts" do
create_pdf
@@ -243,7 +252,7 @@ Last-Update: 2014-09-29
@pdf.text "写个小"
end
text = PDF::Inspector::Text.analyze(@pdf.render)
-@@ -832,7 +832,7 @@
+@@ -813,7 +813,7 @@
:height => 162.0,
:document => @pdf
}
@@ -254,7 +263,7 @@ Last-Update: 2014-09-29
text_box.render
--- a/spec/document_spec.rb
+++ b/spec/document_spec.rb
-@@ -256,7 +256,7 @@
+@@ -260,7 +260,7 @@
doc_uncompressed = Prawn::Document.new
doc_compressed = Prawn::Document.new(:compress => true)
[doc_compressed, doc_uncompressed].each do |pdf|
@@ -265,7 +274,7 @@ Last-Update: 2014-09-29
--- a/spec/text_at_spec.rb
+++ b/spec/text_at_spec.rb
-@@ -108,7 +108,7 @@
+@@ -136,7 +136,7 @@
it "should not raise an exception when a shift-jis string is rendered" do
datafile = "#{Prawn::DATADIR}/shift_jis_text.txt"
sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets }
diff --git a/debian/patches/0405_use_system_fonts_manual.patch b/debian/patches/0405_use_system_fonts_manual.patch
index 749a907..dd7c34b 100644
--- a/debian/patches/0405_use_system_fonts_manual.patch
+++ b/debian/patches/0405_use_system_fonts_manual.patch
@@ -3,7 +3,7 @@ Description: use system fonts when possible
These copies have been removed from the Debian source package, and system
fonts are used instead.
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-04-14
+Last-Update: 2015-04-29
--- a/manual/text/single_usage.rb
+++ b/manual/text/single_usage.rb
@@ -29,7 +29,7 @@ Last-Update: 2014-04-14
move_down 20
--- a/manual/text/right_to_left_text.rb
+++ b/manual/text/right_to_left_text.rb
-@@ -17,7 +17,7 @@
+@@ -21,7 +21,7 @@
# set the direction document-wide
self.text_direction = :rtl
@@ -52,7 +52,7 @@ Last-Update: 2014-04-14
--- a/manual/text/utf8.rb
+++ b/manual/text/utf8.rb
@@ -21,7 +21,7 @@
- text "Let's try them with another font."
+ text "For full internationalized text support, we need to use TTF fonts:"
move_down 20
- font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf") do
diff --git a/debian/patches/0500_disable_tests_using_removed_files.patch b/debian/patches/0500_disable_tests_using_removed_files.patch
index 887196d..33ed13b 100644
--- a/debian/patches/0500_disable_tests_using_removed_files.patch
+++ b/debian/patches/0500_disable_tests_using_removed_files.patch
@@ -3,7 +3,7 @@ Description: disable some specs after removal of some files from the source pack
non-free fonts. These are disabled because they cannot be run since these
files have been removed from the Debian source package.
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-04-14
+Last-Update: 2015-04-29
--- a/spec/images_spec.rb
+++ b/spec/images_spec.rb
@@ -90,7 +90,7 @@ Last-Update: 2014-04-14
png = Prawn::Images::PNG.new(@img_data)
png.transparency[:rgb].should == [0, 255, 0]
end
-@@ -108,7 +108,7 @@
+@@ -116,7 +116,7 @@
@img_data = File.binread(@filename)
end
@@ -99,7 +99,7 @@ Last-Update: 2014-04-14
png = Prawn::Images::PNG.new(@img_data)
png.width.should == 150
-@@ -120,7 +120,7 @@
+@@ -128,7 +128,7 @@
png.interlace_method.should == 0
end
@@ -108,7 +108,7 @@ Last-Update: 2014-04-14
png = Prawn::Images::PNG.new(@img_data)
data = Zlib::Inflate.inflate(File.binread(@data_filename))
png.img_data.should == data
-@@ -136,7 +136,7 @@
+@@ -144,7 +144,7 @@
@img_data = File.binread(@filename)
end
@@ -117,7 +117,7 @@ Last-Update: 2014-04-14
png = Prawn::Images::PNG.new(@img_data)
png.width.should == 16
-@@ -148,14 +148,14 @@
+@@ -156,14 +156,14 @@
png.interlace_method.should == 0
end
@@ -134,7 +134,7 @@ Last-Update: 2014-04-14
png = Prawn::Images::PNG.new(@img_data)
png.split_alpha_channel!
data = File.binread(@alpha_data_filename)
-@@ -172,7 +172,7 @@
+@@ -180,7 +180,7 @@
@img_data = File.binread(@filename)
end
@@ -143,7 +143,7 @@ Last-Update: 2014-04-14
png = Prawn::Images::PNG.new(@img_data)
png.width.should == 320
-@@ -184,14 +184,14 @@
+@@ -192,14 +192,14 @@
png.interlace_method.should == 0
end
@@ -160,7 +160,7 @@ Last-Update: 2014-04-14
png = Prawn::Images::PNG.new(@img_data)
png.split_alpha_channel!
data = File.binread(@alpha_data_filename)
-@@ -209,7 +209,7 @@
+@@ -217,7 +217,7 @@
@img_data = File.binread(@filename)
end
@@ -169,7 +169,7 @@ Last-Update: 2014-04-14
png = Prawn::Images::PNG.new(@img_data)
png.width.should == 32
-@@ -221,14 +221,14 @@
+@@ -229,14 +229,14 @@
png.interlace_method.should == 0
end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-prawn.git
More information about the Pkg-ruby-extras-commits
mailing list