[DRE-commits] [ruby-prawn] 03/06: Refresh patches
Cédric Boutillier
boutil at moszumanska.debian.org
Wed Jun 8 05:30:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
boutil pushed a commit to branch master
in repository ruby-prawn.
commit e8bf9917bbbe7b6a41305f39ea18c85e41078b29
Author: Cédric Boutillier <boutil at debian.org>
Date: Tue Jun 7 12:28:27 2016 +0200
Refresh patches
---
.../0200_replace_BASEDIR_data_by_DATADIR.patch | 30 ++++++++--------------
debian/patches/0400_use_system_fonts.patch | 24 +++++++++--------
.../0500_disable_tests_using_removed_files.patch | 18 ++++++-------
...0700_use_deterministic_keys_for_gradients.patch | 14 +++++-----
4 files changed, 40 insertions(+), 46 deletions(-)
diff --git a/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch b/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
index 438d9c4..8793e2e 100644
--- a/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
+++ b/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
@@ -1,6 +1,6 @@
Description: redefine BASEDIR and DATADIR
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2015-07-24
+Last-Update: 2016-06-07
--- a/lib/prawn.rb
+++ b/lib/prawn.rb
@@ -15,22 +15,14 @@ Last-Update: 2015-07-24
FLOAT_PRECISION = 1.0e-9
---- a/spec/acceptance/png.rb
-+++ b/spec/acceptance/png.rb
-@@ -3,11 +3,11 @@
- require_relative "../../lib/prawn"
+--- a/spec/acceptance/png_spec.rb
++++ b/spec/acceptance/png_spec.rb
+@@ -3,7 +3,7 @@
+ require_relative "../../spec/spec_helper"
- images = [
-- ["Type 0", "#{Prawn::BASEDIR}/data/images/web-links.png"],
-- ["Type 2", "#{Prawn::BASEDIR}/data/images/ruport.png"],
-- ["Type 3", "#{Prawn::BASEDIR}/data/images/indexed_color.png"],
-- ["Type 4", "#{Prawn::BASEDIR}/data/images/page_white_text.png"],
-- ["Type 6", "#{Prawn::BASEDIR}/data/images/dice.png"]
-+ ["Type 0", "#{Prawn::DATADIR}/images/web-links.png"],
-+ ["Type 2", "#{Prawn::DATADIR}/images/ruport.png"],
-+ ["Type 3", "#{Prawn::DATADIR}/images/indexed_color.png"],
-+ ["Type 4", "#{Prawn::DATADIR}/images/page_white_text.png"],
-+ ["Type 6", "#{Prawn::DATADIR}/images/dice.png"]
- ]
-
- Prawn::Document.generate("png_types.pdf", :page_size => "A5") do
+ describe "When making a pdf file with png images" do
+- image_dir = "#{Prawn::BASEDIR}/data/images"
++ image_dir = "#{Prawn::DATADIR}/images"
+ images = [
+ ["Type 0", "#{image_dir}/web-links.png"],
+ ["Type 0 with transparency", "#{image_dir}/ruport_type0.png"],
diff --git a/debian/patches/0400_use_system_fonts.patch b/debian/patches/0400_use_system_fonts.patch
index 888bd34..b35742c 100644
--- a/debian/patches/0400_use_system_fonts.patch
+++ b/debian/patches/0400_use_system_fonts.patch
@@ -1,9 +1,10 @@
Description: use system fonts when possible
Upstream ships embedded copies of several truetype fonts. Some of them are
available in Debian. These copies have been removed from the Debian source
- package, and system fonts are used instead.
+ package, and system fonts are used instead.
+ Skip a test expecting to not find € in gkai00mp.ttf
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2015-07-25
+Last-Update: 2016-06-07
--- a/spec/line_wrap_spec.rb
+++ b/spec/line_wrap_spec.rb
@@ -99,7 +100,7 @@ Last-Update: 2015-07-25
# Expect that the call to text will not raise an encoding error
@pdf.text(sjis_str)
-@@ -517,7 +517,7 @@
+@@ -511,7 +511,7 @@
end
def add_unicode_fonts(pdf)
@@ -215,26 +216,27 @@ Last-Update: 2015-07-25
@pdf.font_families["DejaVu Sans"] = {
normal: Prawn::Font.load(@pdf, io)
}
-@@ -344,15 +344,15 @@
+@@ -344,23 +344,23 @@
end
it "should return true when present in a TTF font" do
- font = @pdf.find_font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
+ font = @pdf.find_font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
- expect(font.glyph_present?("H")).to be_true
+ expect(font.glyph_present?("H")).to eq true
end
it "should return false when absent in a TTF font" do
- font = @pdf.find_font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
+ font = @pdf.find_font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
- expect(font.glyph_present?("再")).to be_false
+ expect(font.glyph_present?("再")).to eq false
- font = @pdf.find_font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf")
-+ font = @pdf.find_font("/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf")
- expect(font.glyph_present?("€")).to be_false
+- expect(font.glyph_present?("€")).to eq false
++ @pdf.font("/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf")
++ #expect(font.glyph_present?("€")).to eq false
end
end
-@@ -360,7 +360,7 @@
+
describe "TTF fonts" do
before do
create_pdf
@@ -254,7 +256,7 @@ Last-Update: 2015-07-25
end
--- a/spec/text_box_spec.rb
+++ b/spec/text_box_spec.rb
-@@ -74,7 +74,7 @@
+@@ -76,7 +76,7 @@
@pdf.text_direction(:rtl)
@pdf.text_direction = :rtl
@pdf.text_direction = :rtl
@@ -263,7 +265,7 @@ Last-Update: 2015-07-25
@pdf.text "写个小"
end
text = PDF::Inspector::Text.analyze(@pdf.render)
-@@ -811,7 +811,7 @@
+@@ -815,7 +815,7 @@
:height => 162.0,
:document => @pdf
}
diff --git a/debian/patches/0500_disable_tests_using_removed_files.patch b/debian/patches/0500_disable_tests_using_removed_files.patch
index ecba64a..e6c35a5 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: 2015-07-24
+Last-Update: 2016-06-07
--- a/spec/images_spec.rb
+++ b/spec/images_spec.rb
@@ -89,7 +89,7 @@ Last-Update: 2015-07-24
png = Prawn::Images::PNG.new(@img_data)
expect(png.transparency[:rgb]).to eq([0, 255, 0])
end
-@@ -109,7 +109,7 @@
+@@ -131,7 +131,7 @@
@img_data = File.binread(@filename)
end
@@ -98,7 +98,7 @@ Last-Update: 2015-07-24
png = Prawn::Images::PNG.new(@img_data)
expect(png.width).to eq(150)
-@@ -121,7 +121,7 @@
+@@ -143,7 +143,7 @@
expect(png.interlace_method).to eq(0)
end
@@ -107,7 +107,7 @@ Last-Update: 2015-07-24
png = Prawn::Images::PNG.new(@img_data)
data = Zlib::Inflate.inflate(File.binread(@data_filename))
expect(png.img_data).to eq(data)
-@@ -136,7 +136,7 @@
+@@ -158,7 +158,7 @@
@img_data = File.binread(@filename)
end
@@ -116,7 +116,7 @@ Last-Update: 2015-07-24
png = Prawn::Images::PNG.new(@img_data)
expect(png.width).to eq(16)
-@@ -148,14 +148,14 @@
+@@ -170,14 +170,14 @@
expect(png.interlace_method).to eq(0)
end
@@ -133,7 +133,7 @@ Last-Update: 2015-07-24
png = Prawn::Images::PNG.new(@img_data)
png.split_alpha_channel!
data = File.binread(@alpha_data_filename)
-@@ -171,7 +171,7 @@
+@@ -193,7 +193,7 @@
@img_data = File.binread(@filename)
end
@@ -142,7 +142,7 @@ Last-Update: 2015-07-24
png = Prawn::Images::PNG.new(@img_data)
expect(png.width).to eq(320)
-@@ -183,14 +183,14 @@
+@@ -205,14 +205,14 @@
expect(png.interlace_method).to eq(0)
end
@@ -159,7 +159,7 @@ Last-Update: 2015-07-24
png = Prawn::Images::PNG.new(@img_data)
png.split_alpha_channel!
data = File.binread(@alpha_data_filename)
-@@ -207,7 +207,7 @@
+@@ -229,7 +229,7 @@
@img_data = File.binread(@filename)
end
@@ -168,7 +168,7 @@ Last-Update: 2015-07-24
png = Prawn::Images::PNG.new(@img_data)
expect(png.width).to eq(32)
-@@ -219,14 +219,14 @@
+@@ -241,14 +241,14 @@
expect(png.interlace_method).to eq(0)
end
diff --git a/debian/patches/0700_use_deterministic_keys_for_gradients.patch b/debian/patches/0700_use_deterministic_keys_for_gradients.patch
index 6adde09..728fd54 100644
--- a/debian/patches/0700_use_deterministic_keys_for_gradients.patch
+++ b/debian/patches/0700_use_deterministic_keys_for_gradients.patch
@@ -7,20 +7,20 @@ Description: Use deterministic values for gradients
at 1.
Author: Jérémy Bobbio <lunar at debian.org>
Forwarded: https://github.com/prawnpdf/prawn/pull/844
-Last-Update: 2015-04-29
+Last-Update: 2016-06-07
--- a/lib/prawn/graphics/patterns.rb
+++ b/lib/prawn/graphics/patterns.rb
-@@ -60,7 +60,7 @@
- end
+@@ -78,7 +78,7 @@
+ def gradient_registry_key(gradient, opts)
+ _x1, _y1, x2, y2, transformation = gradient_coordinates(gradient, opts)
- def gradient_registry_key(gradient)
- if gradient[1].is_a?(Array) # axial
+ key = if gradient[1].is_a?(Array) # axial
[
- map_to_absolute(gradient[0]),
- map_to_absolute(gradient[1]),
-@@ -74,7 +74,16 @@
+ transformation,
+ x2, y2,
+@@ -92,7 +92,16 @@
gradient[3],
gradient[4], gradient[5]
]
--
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