[DRE-commits] [SCM] ruby-prawn.git branch, master, updated. upstream/1.0.0_rc1-44-g6e97afc

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 3b27378818d61169d8e6b6b43d37ab86f780838b
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue Nov 22 10:17:36 2011 +0100

    patch: directly require ttfunk

diff --git a/debian/patches/0102_simply_require_ttfunk.patch b/debian/patches/0102_simply_require_ttfunk.patch
new file mode 100644
index 0000000..9a1da86
--- /dev/null
+++ b/debian/patches/0102_simply_require_ttfunk.patch
@@ -0,0 +1,23 @@
+--- a/lib/prawn/core.rb
++++ b/lib/prawn/core.rb
+@@ -6,19 +6,7 @@
+ # This is free software. Please see the LICENSE and COPYING files for details.
+ 
+ require "set"
+-
+-%w[ttfunk/lib].each do |dep|
+-  $LOAD_PATH.unshift(File.dirname(__FILE__) + "/../../vendor/#{dep}")
+-end
+-
+-begin
+-  require 'ttfunk'
+-rescue LoadError
+-  puts "Failed to load ttfunk. If you are running Prawn from git:"
+-  puts "  git submodule init"
+-  puts "  git submodule update"
+-  exit
+-end
++require 'ttfunk'
+ 
+ module Prawn
+   extend self

-- 
ruby-prawn.git