[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@34c32c9 [master] poppler: support cairo integration again

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-07-26 14:17:11 +0900 (Wed, 26 Jul 2017)

  New Revision: 34c32c9264835b5122219f799ce2b02176058b41
  https://github.com/ruby-gnome2/ruby-gnome2/commit/34c32c9264835b5122219f799ce2b02176058b41

  Message:
    poppler: support cairo integration again

  Copied files:
    poppler/lib/poppler/cairo.rb
      (from poppler/lib/poppler.rb)
  Modified files:
    poppler/lib/poppler.rb
    poppler/lib/poppler/loader.rb

  Modified: poppler/lib/poppler.rb (+1 -0)
===================================================================
--- poppler/lib/poppler.rb    2017-07-24 11:26:39 +0900 (2837e57)
+++ poppler/lib/poppler.rb    2017-07-26 14:17:11 +0900 (d5c7a94)
@@ -16,6 +16,7 @@
 
 require "gobject-introspection"
 require "gio2"
+require "cairo-gobject"
 
 base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
 vendor_dir = base_dir + "vendor" + "local"

  Copied: poppler/lib/poppler/cairo.rb (+6 -19) 60%
===================================================================
--- poppler/lib/poppler.rb    2017-07-24 11:26:39 +0900 (2837e57)
+++ poppler/lib/poppler/cairo.rb    2017-07-26 14:17:11 +0900 (5e3dfb3)
@@ -14,23 +14,10 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "gobject-introspection"
-require "gio2"
-
-base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
-vendor_dir = base_dir + "vendor" + "local"
-vendor_bin_dir = vendor_dir + "bin"
-GLib.prepend_dll_path(vendor_bin_dir)
-vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
-GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
-
-require "poppler/loader"
-
-module Poppler
-  LOG_DOMAIN = "Poppler"
-  GLib::Log.set_log_domain(LOG_DOMAIN)
-
-  loader = Loader.new(self)
-  loader.load("Poppler")
-
+module Cairo
+  class Context
+    def render_poppler_page(page, options={})
+      page.render(self)
+    end
+  end
 end

  Modified: poppler/lib/poppler/loader.rb (+1 -0)
===================================================================
--- poppler/lib/poppler/loader.rb    2017-07-24 11:26:39 +0900 (4e4e05a)
+++ poppler/lib/poppler/loader.rb    2017-07-26 14:17:11 +0900 (b0f7284)
@@ -28,6 +28,7 @@ module Poppler
       require "poppler/version"
 
       require "poppler/annot-callout-line"
+      require "poppler/cairo"
       require "poppler/color"
       require "poppler/document"