ruby-gnome2-cvs — Ruby-GNOME2 CVS update announce.

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@98744ce [master] test: add missing method call again

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

Kouhei Sutou	2017-07-23 15:18:47 +0900 (Sun, 23 Jul 2017)

  New Revision: 98744cee6bd0dbe39114715adc215fab5f26977e
  https://github.com/ruby-gnome2/ruby-gnome2/commit/98744cee6bd0dbe39114715adc215fab5f26977e

  Message:
    test: add missing method call again

  Modified files:
    poppler/test/test-annotation.rb

  Modified: poppler/test/test-annotation.rb (+1 -1)
===================================================================
--- poppler/test/test-annotation.rb    2017-07-23 15:04:44 +0900 (1a2629b)
+++ poppler/test/test-annotation.rb    2017-07-23 15:18:47 +0900 (9da2cd6)
@@ -1,7 +1,7 @@
 class TestAnnotation < Test::Unit::TestCase
   def test_type
     only_poppler_version(0, 7, 2)
-    assert_kind_of(Poppler::AnnotType, annotation)
+    assert_kind_of(Poppler::AnnotType, annotation.type)
   end
 
   def test_contents

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@9d768bd [master] poppler: support Poppler::Document.new(path)

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

Kouhei Sutou	2017-07-23 15:04:44 +0900 (Sun, 23 Jul 2017)

  New Revision: 9d768bd517387107fd303d74d12b4ebc52ba89b1
  https://github.com/ruby-gnome2/ruby-gnome2/commit/9d768bd517387107fd303d74d12b4ebc52ba89b1

  Message:
    poppler: support Poppler::Document.new(path)

  Modified files:
    poppler/lib/poppler/document.rb

  Modified: poppler/lib/poppler/document.rb (+62 -5)
===================================================================
--- poppler/lib/poppler/document.rb    2017-07-23 15:04:22 +0900 (ebcad8f)
+++ poppler/lib/poppler/document.rb    2017-07-23 15:04:44 +0900 (0b635b2)
@@ -16,12 +16,69 @@
 
 module Poppler
   class Document
-    # TODO :
-    # new_from_file
-    # new_from_data
-    # new_from_gstream
-    # new_from_gfile (should we ?)
+    alias_method :initialize_raw, :initialize
+    def initialize(*args)
+      if args.size == 1 and args[0].is_a?(Hash)
+        options = args[0]
+        data = options[:data]
+        uri = options[:uri]
+        path = options[:path]
+        stream = options[:stream]
+        length = options[:length]
+        file = options[:file]
+        password = options[:password]
+
+        if data
+          initialize_new_from_data(data, password)
+        elsif uri
+          initialize_new_from_file(uri, password)
+        elsif path
+          uri = ensure_uri(path)
+          initialize_new_from_file(uri, password)
+        elsif stream
+          if length.nil?
+            raise(ArgumentError,
+                  "must specify :length for :stream: #{options.inspect}")
+          end
+          initialize_new_from_stream(stream, length, password)
+        elsif file
+          if file.is_a?(String)
+            initialize(path: file, password: password)
+          else
+            initialize_new_from_gfile(file, password)
+          end
+        else
+          message =
+            "must specify one of :data, :uri, :path, :stream or :file: " +
+            options.inspect
+          raise(ArgumentError, message)
+        end
+      else
+        uri_or_data, password = args
+        if pdf_data?(uri_or_data)
+          initialize_new_from_data(uri_or_data, password)
+        else
+          uri = ensure_uri(uri_or_data)
+          initialize_new_from_file(uri, password)
+        end
+      end
+    end
 
     alias_method :[], :get_page
+
+    private
+    def pdf_data?(data)
+      data.start_with?("%PDF-1.")
+    end
+
+    def ensure_uri(uri)
+      if GLib.path_is_absolute?(uri)
+        GLib.filename_to_uri(uri)
+      elsif /\A[a-zA-Z][a-zA-Z\d\-+.]*:/.match(uri)
+        uri
+      else
+        GLib.filename_to_uri(File.expand_path(uri))
+      end
+    end
   end
 end

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@f39dd4b [master] Revert "Fix issue with bad URI"

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

Kouhei Sutou	2017-07-23 15:04:22 +0900 (Sun, 23 Jul 2017)

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

  Message:
    Revert "Fix issue with bad URI"
    
    This reverts commit 3cbcfd4f48eac5fbc17d7726a4060939c66d2dc4.
    
    We need to download test PDF automatically.

  Modified files:
    poppler/test/poppler-test-utils.rb

  Modified: poppler/test/poppler-test-utils.rb (+2 -3)
===================================================================
--- poppler/test/poppler-test-utils.rb    2017-07-23 14:52:38 +0900 (bf21794)
+++ poppler/test/poppler-test-utils.rb    2017-07-23 15:04:22 +0900 (c593f97)
@@ -21,13 +21,12 @@ module PopplerTestUtils
 
   def form_pdf
     file = File.join(fixtures_dir, "form.pdf")
-    uri = URI.join("file:///", file)
-    return uri.to_s if File.exist?(file)
+    return file if File.exist?(file)
     pdf = open("https://www.irs.gov/pub/irs-pdf/fw9.pdf").read
     File.open(file, "wb") do |output|
       output.print(pdf)
     end
-    uri.to_s
+    URI.join('file:///', file.path)
   end
 
   def image_pdf

[ruby-gnome2-cvs] Still Failing: ruby-gnome2/ruby-gnome2#4516 (master - 1cd7f29)

[Travis CI <bu...@tr...>]

Build Update for ruby-gnome2/ruby-gnome2
-------------------------------------

Build: #4516
Status: Still Failing

Duration: 24 minutes and 2 seconds
Commit: 1cd7f29 (master)
Author: Kouhei Sutou
Message: Merge pull request #1072 from cedlemo/poppler_README_fix_infos

Fix bad instruction for installation

Patch by cedlemo. Thanks!!!

View the changeset: https://github.com/ruby-gnome2/ruby-gnome2/compare/420839ff6104...1cd7f29d01d0

View the full build log and details: https://travis-ci.org/ruby-gnome2/ruby-gnome2/builds/256519918?utm_source=email&utm_medium=notification

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@a2c809f [master] Replace all name [A|a]nnotation by [A|a]nnot

[cedlemo <nu...@co...>]

cedlemo	2017-07-23 02:47:24 +0900 (Sun, 23 Jul 2017)

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

  Merged bace969: Merge pull request #1074 from cedlemo/poppler_test_annotation

  Message:
    Replace all name [A|a]nnotation by [A|a]nnot

  Modified files:
    poppler/test/test-annotation.rb

  Modified: poppler/test/test-annotation.rb (+15 -15)
===================================================================
--- poppler/test/test-annotation.rb    2017-07-23 02:39:13 +0900 (4fdc35e)
+++ poppler/test/test-annotation.rb    2017-07-23 02:47:24 +0900 (1a2629b)
@@ -1,7 +1,7 @@
 class TestAnnotation < Test::Unit::TestCase
   def test_type
     only_poppler_version(0, 7, 2)
-    assert_kind_of(Poppler::AnnotationType, annotation.type)
+    assert_kind_of(Poppler::AnnotType, annotation)
   end
 
   def test_contents
@@ -21,7 +21,7 @@ class TestAnnotation < Test::Unit::TestCase
 
   def test_flags
     only_poppler_version(0, 7, 2)
-    assert_kind_of(Poppler::AnnotationFlag, annotation.flags)
+    assert_kind_of(Poppler::AnnotFlag, annotation.flags)
   end
 
   def test_color
@@ -32,28 +32,28 @@ class TestAnnotation < Test::Unit::TestCase
   def test_markup
     only_poppler_version(0, 7, 2)
     # We don't have a PDF that has annotation markup...
-    assert_method_defined(Poppler::AnnotationMarkup, :label)
-    assert_method_defined(Poppler::AnnotationMarkup, :popup_is_open?)
-    assert_method_defined(Poppler::AnnotationMarkup, :opacity)
-    assert_method_defined(Poppler::AnnotationMarkup, :date)
-    assert_method_defined(Poppler::AnnotationMarkup, :subject)
-    assert_method_defined(Poppler::AnnotationMarkup, :reply_to)
-    assert_method_defined(Poppler::AnnotationMarkup, :external_data)
+    assert_method_defined(Poppler::AnnotMarkup, :label)
+    assert_method_defined(Poppler::AnnotMarkup, :popup_is_open?)
+    assert_method_defined(Poppler::AnnotMarkup, :opacity)
+    assert_method_defined(Poppler::AnnotMarkup, :date)
+    assert_method_defined(Poppler::AnnotMarkup, :subject)
+    assert_method_defined(Poppler::AnnotMarkup, :reply_to)
+    assert_method_defined(Poppler::AnnotMarkup, :external_data)
   end
 
   def test_text
     only_poppler_version(0, 7, 2)
     # We don't have a PDF that has annotation text...
-    assert_method_defined(Poppler::AnnotationText, :open?)
-    assert_method_defined(Poppler::AnnotationText, :icon)
-    assert_method_defined(Poppler::AnnotationText, :state)
+    assert_method_defined(Poppler::AnnotText, :open?)
+    assert_method_defined(Poppler::AnnotText, :icon)
+    assert_method_defined(Poppler::AnnotText, :state)
   end
 
   def test_free_text
     only_poppler_version(0, 7, 2)
     # We don't have a PDF that has annotation free text...
-    assert_method_defined(Poppler::AnnotationFreeText, :quadding)
-    assert_method_defined(Poppler::AnnotationFreeText, :callout_line)
+    assert_method_defined(Poppler::AnnotFreeText, :quadding)
+    assert_method_defined(Poppler::AnnotFreeText, :callout_line)
   end
 
   def test_callout_line
@@ -75,7 +75,7 @@ class TestAnnotation < Test::Unit::TestCase
   def annotation
     document = Poppler::Document.new(form_pdf)
     page = document[0]
-    page.annotation_mapping[0].annotation
+    page.annot_mapping[0].annot
   end
 
   def assert_method_defined(object, method)

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@bace969 [master] Merge pull request #1074 from cedlemo/poppler_test_annotation

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

Kouhei Sutou	2017-07-23 14:52:38 +0900 (Sun, 23 Jul 2017)

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

  Message:
    Merge pull request #1074 from cedlemo/poppler_test_annotation
    
    Poppler test annotation
    
    Patch by cedlemo. Thanks!!!

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@5331e56 [master] Add Document#[] alias to Document#get_page

[cedlemo <nu...@co...>]

cedlemo	2017-07-23 02:20:17 +0900 (Sun, 23 Jul 2017)

  New Revision: 5331e5689eb2fdd83f929910210043d538f5181c
  https://github.com/ruby-gnome2/ruby-gnome2/commit/5331e5689eb2fdd83f929910210043d538f5181c

  Merged 3d9966d: Merge pull request #1073 from cedlemo/poppler_lib_document_rb

  Message:
    Add Document#[] alias to Document#get_page

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

  Copied: poppler/lib/poppler/document.rb (+2 -12) 73%
===================================================================
--- poppler/lib/poppler/loader.rb    2017-07-23 02:19:22 +0900 (5e9674f)
+++ poppler/lib/poppler/document.rb    2017-07-23 02:20:17 +0900 (835f6d2)
@@ -15,18 +15,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Poppler
-  class Loader < GObjectIntrospection::Loader
-    private
-    def pre_load(repository, namespace)
-    end
+  class Document
 
-    def post_load(repository, namespace)
-      require_libraries
-    end
-
-    def require_libraries
-      require "poppler/version"
-      require "poppler/annot-callout-line"
-    end
+    alias_method :[], :get_page
   end
 end

  Modified: poppler/lib/poppler/loader.rb (+1 -0)
===================================================================
--- poppler/lib/poppler/loader.rb    2017-07-23 02:19:22 +0900 (5e9674f)
+++ poppler/lib/poppler/loader.rb    2017-07-23 02:20:17 +0900 (2b2f49b)
@@ -27,6 +27,7 @@ module Poppler
     def require_libraries
       require "poppler/version"
       require "poppler/annot-callout-line"
+      require "poppler/document"
     end
   end
 end

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@bac4de7 [master] Use URI file protocol for pdf file to use

[cedlemo <nu...@co...>]

cedlemo	2017-07-23 02:19:22 +0900 (Sun, 23 Jul 2017)

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

  Merged 3d9966d: Merge pull request #1073 from cedlemo/poppler_lib_document_rb

  Message:
    Use URI file protocol for pdf file to use

  Modified files:
    poppler/test/poppler-test-utils.rb

  Modified: poppler/test/poppler-test-utils.rb (+2 -2)
===================================================================
--- poppler/test/poppler-test-utils.rb    2017-07-21 23:21:21 +0900 (dfdec09)
+++ poppler/test/poppler-test-utils.rb    2017-07-23 02:19:22 +0900 (c593f97)
@@ -1,4 +1,4 @@
-require 'open-uri'
+require 'uri'
 require 'fileutils'
 
 module PopplerTestUtils
@@ -26,7 +26,7 @@ module PopplerTestUtils
     File.open(file, "wb") do |output|
       output.print(pdf)
     end
-    file
+    URI.join('file:///', file.path)
   end
 
   def image_pdf

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@3cbcfd4 [master] Fix issue with bad URI

[cedlemo <nu...@co...>]

cedlemo	2017-07-23 02:39:13 +0900 (Sun, 23 Jul 2017)

  New Revision: 3cbcfd4f48eac5fbc17d7726a4060939c66d2dc4
  https://github.com/ruby-gnome2/ruby-gnome2/commit/3cbcfd4f48eac5fbc17d7726a4060939c66d2dc4

  Merged 3d9966d: Merge pull request #1073 from cedlemo/poppler_lib_document_rb

  Message:
    Fix issue with bad URI

  Modified files:
    poppler/test/poppler-test-utils.rb

  Modified: poppler/test/poppler-test-utils.rb (+3 -2)
===================================================================
--- poppler/test/poppler-test-utils.rb    2017-07-23 02:22:00 +0900 (c593f97)
+++ poppler/test/poppler-test-utils.rb    2017-07-23 02:39:13 +0900 (bf21794)
@@ -21,12 +21,13 @@ module PopplerTestUtils
 
   def form_pdf
     file = File.join(fixtures_dir, "form.pdf")
-    return file if File.exist?(file)
+    uri = URI.join("file:///", file)
+    return uri.to_s if File.exist?(file)
     pdf = open("https://www.irs.gov/pub/irs-pdf/fw9.pdf").read
     File.open(file, "wb") do |output|
       output.print(pdf)
     end
-    URI.join('file:///', file.path)
+    uri.to_s
   end
 
   def image_pdf

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@850db27 [master] Add TODOs

[cedlemo <nu...@co...>]

cedlemo	2017-07-23 02:22:00 +0900 (Sun, 23 Jul 2017)

  New Revision: 850db2744b8b198a213cf35f4cf740a4ce004a04
  https://github.com/ruby-gnome2/ruby-gnome2/commit/850db2744b8b198a213cf35f4cf740a4ce004a04

  Merged 3d9966d: Merge pull request #1073 from cedlemo/poppler_lib_document_rb

  Message:
    Add TODOs

  Modified files:
    poppler/lib/poppler/document.rb

  Modified: poppler/lib/poppler/document.rb (+5 -0)
===================================================================
--- poppler/lib/poppler/document.rb    2017-07-23 02:20:17 +0900 (835f6d2)
+++ poppler/lib/poppler/document.rb    2017-07-23 02:22:00 +0900 (ebcad8f)
@@ -16,6 +16,11 @@
 
 module Poppler
   class Document
+    # TODO :
+    # new_from_file
+    # new_from_data
+    # new_from_gstream
+    # new_from_gfile (should we ?)
 
     alias_method :[], :get_page
   end

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@3d9966d [master] Merge pull request #1073 from cedlemo/poppler_lib_document_rb

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

Kouhei Sutou	2017-07-23 14:44:38 +0900 (Sun, 23 Jul 2017)

  New Revision: 3d9966dd87c791601cad69422e8361a223152087
  https://github.com/ruby-gnome2/ruby-gnome2/commit/3d9966dd87c791601cad69422e8361a223152087

  Message:
    Merge pull request #1073 from cedlemo/poppler_lib_document_rb
    
    Poppler lib document rb
    
    Patch by cedlemo. Thanks!!!

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@4ddfbc5 [master] Fix bad instruction for installation

[cedlemo <nu...@co...>]

cedlemo	2017-07-23 01:26:18 +0900 (Sun, 23 Jul 2017)

  New Revision: 4ddfbc575959736f87060168e27b36b3374e443e
  https://github.com/ruby-gnome2/ruby-gnome2/commit/4ddfbc575959736f87060168e27b36b3374e443e

  Merged 1cd7f29: Merge pull request #1072 from cedlemo/poppler_README_fix_infos

  Message:
    Fix bad instruction for installation

  Modified files:
    poppler/README.md

  Modified: poppler/README.md (+1 -1)
===================================================================
--- poppler/README.md    2017-07-21 23:21:21 +0900 (f4f2f2e)
+++ poppler/README.md    2017-07-23 01:26:18 +0900 (7964e11)
@@ -10,7 +10,7 @@ Ruby/Poppler is a Ruby binding of [poppler-glib](https://developer.gnome.org/pop
 
 ## Install
 
-    gem install atk
+    gem install poppler
 
 ## License
 

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@1cd7f29 [master] Merge pull request #1072 from cedlemo/poppler_README_fix_infos

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

Kouhei Sutou	2017-07-23 14:39:58 +0900 (Sun, 23 Jul 2017)

  New Revision: 1cd7f29d01d0cb701c07820aa29165a9697fca42
  https://github.com/ruby-gnome2/ruby-gnome2/commit/1cd7f29d01d0cb701c07820aa29165a9697fca42

  Message:
    Merge pull request #1072 from cedlemo/poppler_README_fix_infos
    
    Fix bad instruction for installation
    
    Patch by cedlemo. Thanks!!!

[ruby-gnome2-cvs] Still Failing: ruby-gnome2/ruby-gnome2#4511 (master - 420839f)

[Travis CI <bu...@tr...>]

Build Update for ruby-gnome2/ruby-gnome2
-------------------------------------

Build: #4511
Status: Still Failing

Duration: 25 minutes and 42 seconds
Commit: 420839f (master)
Author: Kouhei Sutou
Message: Merge pull request #1071 from Chocksy/feat-heroku_instalation

add details about installing rsvg2 on heroku

Patch by Ciocanel Razvan. Thanks!!!

View the changeset: https://github.com/ruby-gnome2/ruby-gnome2/compare/caf6cd20602b...420839ff6104

View the full build log and details: https://travis-ci.org/ruby-gnome2/ruby-gnome2/builds/256074859?utm_source=email&utm_medium=notification

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@420839f [master] Merge pull request #1071 from Chocksy/feat-heroku_instalation

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

Kouhei Sutou	2017-07-21 23:21:21 +0900 (Fri, 21 Jul 2017)

  New Revision: 420839ff610472aeef35af2da8374d1bbef75859
  https://github.com/ruby-gnome2/ruby-gnome2/commit/420839ff610472aeef35af2da8374d1bbef75859

  Message:
    Merge pull request #1071 from Chocksy/feat-heroku_instalation
    
    add details about installing rsvg2 on heroku
    
    Patch by Ciocanel Razvan. Thanks!!!

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@fcd21cd [master] add details about installing rsvg2 on heroku

[Razvan C. <nu...@co...>]

Razvan Ciocanel	2017-07-21 22:43:56 +0900 (Fri, 21 Jul 2017)

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

  Merged 420839f: Merge pull request #1071 from Chocksy/feat-heroku_instalation

  Message:
    add details about installing rsvg2 on heroku

  Added files:
    doc/heroku.md

  Added: doc/heroku.md (+24 -0) 100644
===================================================================
--- /dev/null
+++ doc/heroku.md    2017-07-21 22:43:56 +0900 (495edb1)
@@ -0,0 +1,24 @@
+# Heroku installation
+
+## Install rsvg2
+
+This document describes how to install rsvg2 on heroku (cedar-16)
+
+### Steps
+
+  1. Add buildpack apt to your app: `heroku buildpacks:add --index 1 https://github.com/heroku/heroku-buildpack-apt.git`
+  2. Add Aptfile to your rails root directory.
+  3. Include in the Aptfile the following packages:
+      ```
+      gir1.2-freedesktop
+      gir1.2-rsvg-2.0
+      gir1.2-gdkpixbuf-2.0
+      gir1.2-glib-2.0
+      libgirepository-1.0-1
+      libgirepository1.0-dev
+      ```
+  4. In your gemfile add
+      ```
+      gem 'rsvg2'
+      ```
+  5. Add the following ENV var: `GI_TYPELIB_PATH = /app/.apt/usr/lib/x86_64-linux-gnu/girepository-1.0`

[ruby-gnome2-cvs] Broken: ruby-gnome2/ruby-gnome2#4507 (master - caf6cd2)

[Travis CI <bu...@tr...>]

Build Update for ruby-gnome2/ruby-gnome2
-------------------------------------

Build: #4507
Status: Broken

Duration: 28 minutes and 9 seconds
Commit: caf6cd2 (master)
Author: Kouhei Sutou
Message: poppler: support auto dependencies install

View the changeset: https://github.com/ruby-gnome2/ruby-gnome2/compare/7316c70566c2...caf6cd20602b

View the full build log and details: https://travis-ci.org/ruby-gnome2/ruby-gnome2/builds/256048259?utm_source=email&utm_medium=notification

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

[ruby-gnome2-cvs] Broken: ruby-gnome2/ruby-gnome2#4506 (master - 7316c70)

[Travis CI <bu...@tr...>]

Build Update for ruby-gnome2/ruby-gnome2
-------------------------------------

Build: #4506
Status: Broken

Duration: 25 minutes and 7 seconds
Commit: 7316c70 (master)
Author: Kouhei Sutou
Message: Merge pull request #1068 from cedlemo/poppler_gi_form

Poppler gi form

Patch by cedlemo. Thanks!!!

View the changeset: https://github.com/ruby-gnome2/ruby-gnome2/compare/f216d6b29f8b...7316c70566c2

View the full build log and details: https://travis-ci.org/ruby-gnome2/ruby-gnome2/builds/256046581?utm_source=email&utm_medium=notification

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@caf6cd2 [master] poppler: support auto dependencies install

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

Kouhei Sutou	2017-07-21 22:02:42 +0900 (Fri, 21 Jul 2017)

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

  Message:
    poppler: support auto dependencies install

  Added files:
    poppler/dependency-check/Rakefile

  Added: poppler/dependency-check/Rakefile (+44 -0) 100644
===================================================================
--- /dev/null
+++ poppler/dependency-check/Rakefile    2017-07-21 22:02:42 +0900 (4f72fb3)
@@ -0,0 +1,44 @@
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# 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 "pkg-config"
+require "native-package-installer"
+
+if File.exist?(File.join(__dir__, "..", "vendor"))
+  task :default => "nothing"
+else
+  task :default => "dependency:check"
+end
+
+task :nothing do
+end
+
+namespace :dependency do
+  desc "Check dependency"
+  task :check do
+    unless PKGConfig.check_version?("poppler", 0, 12, 0)
+      unless NativePackageInstaller.install(:alt_linux => "libpoppler-glib-devel",
+                                            :debian => "libpoppler-glib-dev",
+                                            :redhat => "poppler-glib-devel",
+                                            :arch_linux => "poppler",
+                                            :homebrew => "poppler",
+                                            :macports => "poppler",
+                                            :msys2 => "poppler")
+        exit(false)
+      end
+    end
+  end
+end

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@23b2832 [master] Move poppler to poppler-no-gi

[cedlemo <nu...@co...>]

cedlemo	2017-07-20 01:59:20 +0900 (Thu, 20 Jul 2017)

  New Revision: 23b28322ffb76954408aa25b50072604e9011be1
  https://github.com/ruby-gnome2/ruby-gnome2/commit/23b28322ffb76954408aa25b50072604e9011be1

  Merged 7316c70: Merge pull request #1068 from cedlemo/poppler_gi_form

  Message:
    Move poppler to poppler-no-gi

  Added files:
    poppler-no-gi/COPYING.LIB
    poppler-no-gi/Rakefile
    poppler-no-gi/lib/poppler.rb
    poppler-no-gi/sample/number-pdf.rb
    poppler-no-gi/sample/pdf2.rb
    poppler-no-gi/sample/pdf2svg.rb
    poppler-no-gi/sample/pdf2text.rb
    poppler-no-gi/sample/pdfcrop.rb
    poppler-no-gi/sample/pdfdiv.rb
    poppler-no-gi/test/fixtures/image.pdf
    poppler-no-gi/test/fixtures/image.png
    poppler-no-gi/test/fixtures/outline.odt
    poppler-no-gi/test/fixtures/outline.pdf
    poppler-no-gi/test/poppler-test-utils.rb
    poppler-no-gi/test/run-test.rb
    poppler-no-gi/test/test-index-iter.rb
    poppler-no-gi/test/test-version.rb
    poppler-no-gi/test/test_annotation.rb
    poppler-no-gi/test/test_color.rb
    poppler-no-gi/test/test_constants.rb
    poppler-no-gi/test/test_document.rb
    poppler-no-gi/test/test_page.rb
  Renamed files:
    poppler-no-gi/README
      (from poppler/README)
    poppler-no-gi/ext/poppler/depend
      (from poppler/ext/poppler/depend)
    poppler-no-gi/ext/poppler/extconf.rb
      (from poppler/ext/poppler/extconf.rb)
    poppler-no-gi/ext/poppler/poppler.def
      (from poppler/ext/poppler/poppler.def)
    poppler-no-gi/ext/poppler/rbpoppler-action.c
      (from poppler/ext/poppler/rbpoppler-action.c)
    poppler-no-gi/ext/poppler/rbpoppler-annotation-callout-line.c
      (from poppler/ext/poppler/rbpoppler-annotation-callout-line.c)
    poppler-no-gi/ext/poppler/rbpoppler-annotation-free-text.c
      (from poppler/ext/poppler/rbpoppler-annotation-free-text.c)
    poppler-no-gi/ext/poppler/rbpoppler-annotation-mapping.c
      (from poppler/ext/poppler/rbpoppler-annotation-mapping.c)
    poppler-no-gi/ext/poppler/rbpoppler-annotation-markup.c
      (from poppler/ext/poppler/rbpoppler-annotation-markup.c)
    poppler-no-gi/ext/poppler/rbpoppler-annotation-text.c
      (from poppler/ext/poppler/rbpoppler-annotation-text.c)
    poppler-no-gi/ext/poppler/rbpoppler-annotation.c
      (from poppler/ext/poppler/rbpoppler-annotation.c)
    poppler-no-gi/ext/poppler/rbpoppler-attachment.c
      (from poppler/ext/poppler/rbpoppler-attachment.c)
    poppler-no-gi/ext/poppler/rbpoppler-button-field.c
      (from poppler/ext/poppler/rbpoppler-button-field.c)
    poppler-no-gi/ext/poppler/rbpoppler-choice-field.c
      (from poppler/ext/poppler/rbpoppler-choice-field.c)
    poppler-no-gi/ext/poppler/rbpoppler-color.c
      (from poppler/ext/poppler/rbpoppler-color.c)
    poppler-no-gi/ext/poppler/rbpoppler-document.c
      (from poppler/ext/poppler/rbpoppler-document.c)
    poppler-no-gi/ext/poppler/rbpoppler-font-info.c
      (from poppler/ext/poppler/rbpoppler-font-info.c)
    poppler-no-gi/ext/poppler/rbpoppler-fonts-iter.c
      (from poppler/ext/poppler/rbpoppler-fonts-iter.c)
    poppler-no-gi/ext/poppler/rbpoppler-form-field-mapping.c
      (from poppler/ext/poppler/rbpoppler-form-field-mapping.c)
    poppler-no-gi/ext/poppler/rbpoppler-form-field.c
      (from poppler/ext/poppler/rbpoppler-form-field.c)
    poppler-no-gi/ext/poppler/rbpoppler-image-mapping.c
      (from poppler/ext/poppler/rbpoppler-image-mapping.c)
    poppler-no-gi/ext/poppler/rbpoppler-index-iter.c
      (from poppler/ext/poppler/rbpoppler-index-iter.c)
    poppler-no-gi/ext/poppler/rbpoppler-link-mapping.c
      (from poppler/ext/poppler/rbpoppler-link-mapping.c)
    poppler-no-gi/ext/poppler/rbpoppler-page-transition.c
      (from poppler/ext/poppler/rbpoppler-page-transition.c)
    poppler-no-gi/ext/poppler/rbpoppler-page.c
      (from poppler/ext/poppler/rbpoppler-page.c)
    poppler-no-gi/ext/poppler/rbpoppler-private.h
      (from poppler/ext/poppler/rbpoppler-private.h)
    poppler-no-gi/ext/poppler/rbpoppler-ps-file.c
      (from poppler/ext/poppler/rbpoppler-ps-file.c)
    poppler-no-gi/ext/poppler/rbpoppler-rectangle.c
      (from poppler/ext/poppler/rbpoppler-rectangle.c)
    poppler-no-gi/ext/poppler/rbpoppler-text-field.c
      (from poppler/ext/poppler/rbpoppler-text-field.c)
    poppler-no-gi/ext/poppler/rbpoppler.c
      (from poppler/ext/poppler/rbpoppler.c)
    poppler-no-gi/ext/poppler/rbpoppler.h
      (from poppler/ext/poppler/rbpoppler.h)
    poppler-no-gi/ext/poppler/rbpopplerconversions.h
      (from poppler/ext/poppler/rbpopplerconversions.h)
    poppler-no-gi/extconf.rb
      (from poppler/extconf.rb)

  Added: poppler-no-gi/COPYING.LIB (+502 -0) 100644
===================================================================
--- /dev/null
+++ poppler-no-gi/COPYING.LIB    2017-07-20 01:59:20 +0900 (4362b49)
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

  Renamed: poppler-no-gi/README (+0 -0) 100%
===================================================================

  Added: poppler-no-gi/Rakefile (+89 -0) 100644
===================================================================
--- /dev/null
+++ poppler-no-gi/Rakefile    2017-07-20 01:59:20 +0900 (86e56b2)
@@ -0,0 +1,89 @@
+# -*- ruby -*-
+#
+# Copyright (C) 2010-2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+$LOAD_PATH.unshift("./../glib2/lib")
+require 'gnome2-raketask'
+
+package_task = GNOME2::Rake::PackageTask.new do |package|
+  package.summary = "Ruby/Poppler is a Ruby binding of poppler-glib."
+  package.description = "Ruby/Poppler is a Ruby binding of poppler-glib."
+  package.dependency.gem.runtime = [["cairo", ">= 1.14.0"], "gdk_pixbuf2"]
+  package.windows.packages = []
+  package.windows.dependencies = []
+  package.windows.build_dependencies = [
+    "glib2",
+    "gobject-introspection",
+    "gdk_pixbuf2",
+  ]
+  package.windows.gobject_introspection_dependencies = [
+    "gdk_pixbuf2",
+  ]
+  package.external_packages = [
+    {
+      :name => "libjpeg",
+      :base_name => "jpeg-9b",
+      :archive_base_name => "jpegsrc.v9b.tar.gz",
+      :download_base_url => "http://www.ijg.org/files",
+      :label => "libjpeg",
+      :windows => {
+        :configure_args => [],
+        :built_file => "bin/libjpeg-9.dll",
+      },
+    },
+    {
+      :name => "sqlite-autoconf",
+      :download_base_url => "http://www.sqlite.org/2016",
+      :label => "SQLite",
+      :version => "3140100",
+      :compression_method => "gz",
+      :windows => {
+        :configure_args => [],
+        :built_file => "bin/libsqlite3-0.dll",
+      },
+    },
+    {
+      :name => "openjpeg",
+      :base_name => "openjpeg-version.2.1",
+      :archive_base_name => "version.2.1.tar.gz",
+      :download_base_url => "https://github.com/uclouvain/openjpeg/archive",
+      :label => "OpenJPEG",
+      :windows => {
+        :cmake_args => [
+          "-DBUILD_PKGCONFIG_FILES=on",
+        ],
+        :built_file => "bin/libopenjp2.dll",
+      },
+    },
+    {
+      :name => "poppler",
+      :download_base_url => "https://poppler.freedesktop.org",
+      :label => "Poppler",
+      :version => "0.42.0",
+      :compression_method => "xz",
+      :windows => {
+        :configure_args => [
+          "--enable-zlib",
+          "--enable-introspection",
+        ],
+        :built_file => "bin/libpoppler-glib-8.dll",
+      },
+    },
+  ]
+end
+package_task.define
+

  Renamed: poppler-no-gi/ext/poppler/depend (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/extconf.rb (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/poppler.def (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-action.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-annotation-callout-line.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-annotation-free-text.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-annotation-mapping.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-annotation-markup.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-annotation-text.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-annotation.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-attachment.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-button-field.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-choice-field.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-color.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-document.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-font-info.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-fonts-iter.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-form-field-mapping.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-form-field.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-image-mapping.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-index-iter.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-link-mapping.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-page-transition.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-page.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-private.h (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-ps-file.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-rectangle.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler-text-field.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler.c (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpoppler.h (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/ext/poppler/rbpopplerconversions.h (+0 -0) 100%
===================================================================

  Renamed: poppler-no-gi/extconf.rb (+0 -0) 100%
===================================================================

  Added: poppler-no-gi/lib/poppler.rb (+122 -0) 100644
===================================================================
--- /dev/null
+++ poppler-no-gi/lib/poppler.rb    2017-07-20 01:59:20 +0900 (6aa2946)
@@ -0,0 +1,122 @@
+# Copyright(C) 2006-2015 Ruby-GNOME2 Project.
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2.1 of the License.
+#
+# Foobar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+
+require "tempfile"
+require "date"
+require "glib2"
+require "gdk_pixbuf2"
+require "cairo"
+
+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)
+begin
+  major, minor, = RUBY_VERSION.split(/\./)
+  require "#{major}.#{minor}/poppler.so"
+rescue LoadError
+  require "poppler.so"
+end
+
+module Poppler
+  LOG_DOMAIN = "Poppler"
+
+  VERSION = version.split(".").collect {|x| x.to_i}
+
+  module Version
+      MAJOR, MINOR, MICRO = BUILD_VERSION
+      STRING = "#{MAJOR}.#{MINOR}.#{MICRO}"
+
+    class << self
+      def or_later?(major, minor, micro=nil)
+        micro || 0
+        version = [
+          MAJOR,
+          MINOR,
+          MICRO,
+        ]
+        (version <=> [major, minor, micro]) >= 0
+      end
+    end
+  end
+
+  class Document
+    private
+    def pdf_data?(data)
+      data.start_with?("%PDF-1.")
+    end
+
+    def ensure_uri(uri)
+      if pdf_data?(uri)
+        @pdf = Tempfile.new("ruby-poppler-pdf")
+        @pdf.binmode
+        @pdf.print(uri)
+        @pdf.close
+        uri = @pdf.path
+      end
+
+      if GLib.path_is_absolute?(uri)
+        GLib.filename_to_uri(uri)
+      elsif /\A[a-zA-Z][a-zA-Z\d\-+.]*:/.match(uri)
+        uri
+      else
+        GLib.filename_to_uri(File.expand_path(uri))
+      end
+    end
+  end
+
+  if defined?(TextField)
+    class TextField
+      def multiline?
+        type == FormTextType::MULTILINE
+      end
+
+      def file_select?
+        type == FormTextType::FILE_SELECT
+      end
+
+      def normal?
+        type == FormTextType::NORMAL
+      end
+    end
+  end
+
+  if defined?(ChoiceField)
+    class ChoiceField
+      def combo?
+        type == FormChioceType::COMBO
+      end
+
+      def list?
+        type == FormChoiceType::LIST
+      end
+    end
+  end
+end
+
+if Poppler.cairo_available?
+  module Cairo
+    class Context
+      def render_poppler_page(page, *args, &block)
+        page.render(self, *args, &block)
+      end
+
+      def render_poppler_page_selection(page, *args, &block)
+        page.render_selection(self, *args, &block)
+      end
+    end
+  end
+end
+
+GLib::Log.set_log_domain(Poppler::LOG_DOMAIN)

  Added: poppler-no-gi/sample/number-pdf.rb (+32 -0) 100755
===================================================================
--- /dev/null
+++ poppler-no-gi/sample/number-pdf.rb    2017-07-20 01:59:20 +0900 (d54e3b3)
@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+require 'poppler'
+
+input = ARGV.first
+output = input.sub(/\.pdf$/, "-numbered.pdf")
+
+doc = Poppler::Document.new(input)
+first_page = doc[0]
+
+Cairo::PDFSurface.new(output, *first_page.size) do |surface|
+  context = Cairo::Context.new(surface)
+
+  doc.each_with_index do |page, i|
+    width, height = page.size
+    surface.set_size(width, height)
+    context.save do
+      context.render_poppler_page(page)
+    end
+    context.save do
+      layout = context.create_pango_layout
+      layout.text = i.to_s
+      layout.width = width * Pango::SCALE
+      layout.alignment = Pango::Layout::ALIGN_CENTER
+      layout.font_description = Pango::FontDescription.new("Sans 288")
+      context.move_to(0, (height - layout.pixel_size[1]) / 2.0)
+      context.set_source_rgba(0.1, 0.1, 0.1, 0.5)
+      context.show_pango_layout(layout)
+    end
+    context.show_page
+  end
+end

  Added: poppler-no-gi/sample/pdf2.rb (+132 -0) 100755
===================================================================
--- /dev/null
+++ poppler-no-gi/sample/pdf2.rb    2017-07-20 01:59:20 +0900 (9b493f0)
@@ -0,0 +1,132 @@
+#!/usr/bin/env ruby
+
+require "tempfile"
+require "optparse"
+require "poppler"
+require "gdk_pixbuf2"
+
+page = 0
+scale = 1.0
+rotate = 0
+
+parser = OptionParser.new
+parser.banner = <<-BANNER
+Usage: #{parser.program_name} INPUT.PDF OUTPUT [options]
+
+#{parser.program_name} coverts the target page in INPUT.PDF to an image file.
+Many popular image formats such as PNG and JPEG are supported.
+You can specify output image format by OUTPUT file extension.
+For example, the following comand generates PNG file:
+
+  % #{$0} INPUT.PDF OUTPUT.png
+
+BANNER
+
+parser.on("--page=PAGE", Integer,
+          "Use PAGE as the target page",
+          "(0-origin)",
+          "[#{page}]") do |value|
+  page = value.to_i
+end
+
+parser.on("--scale=RATIO", Float,
+          "Scale the target page in INPUT.PDF RATIO times larger in OUTPUT",
+          "[#{scale}]") do |value|
+  scale = value.to_f
+end
+
+parser.on("--rotate=DEGREE", Integer,
+          "Rotate the target page in INPUT.PDF DEGREE degrees clockwise in OUTPUT",
+          "(available values: 0...360)",
+          "[#{rotate}]") do |value|
+  rotate = value.to_i % 360
+end
+
+rest_args = parser.parse!
+if rest_args.size != 2
+  puts(parser.help)
+  exit(false)
+end
+input, output = rest_args
+
+ext_name = File.extname(output)[1..-1]
+if ext_name
+  output_type = ext_name.downcase
+  output_type = "jpeg" if /jpg/ =~ output_type
+else
+  output_type = "png"
+end
+
+def compute_size(width, height, rotate)
+  width = width.to_f
+  height = height.to_f
+  radius = 0
+  unless rotate.zero?
+    radius = rotate / 180.0 * Math::PI
+    if (90 < rotate and rotate < 180) or
+        (270 < rotate and rotate < 360)
+      radius -= Math::PI / 2
+    end
+  end
+  inner_angle1 = Math.atan(width / height)
+  inner_angle2 = Math.atan(height / width)
+  diagonal = Math.sqrt(width ** 2 + height ** 2)
+
+  angle1 = radius + inner_angle1
+  angle2 = radius + inner_angle2
+
+  bottom1 = diagonal * Math.cos(angle1)
+  length1 = (bottom1 * Math.tan(angle1)).abs.to_i
+  bottom2 = diagonal * Math.cos(angle2)
+  length2 = (bottom2 * Math.tan(angle2)).abs.to_i
+
+  if (0 <= rotate and rotate <= 90) or
+      (180 <= rotate and rotate <= 270)
+    [length1, length2]
+  else
+    [length2, length1]
+  end
+end
+
+def to_pixbuf_with_cairo(input, page_number, scale, rotate)
+  doc = Poppler::Document.new(input)
+  page = doc[page_number]
+  width, height = page.size.collect {|x| x * scale}
+  surface_width, surface_height = compute_size(width, height, rotate)
+
+  surface = Cairo::ImageSurface.new(Cairo::FORMAT_ARGB32,
+                                    surface_width, surface_height)
+  cr = Cairo::Context.new(surface)
+
+  half_width = surface_width / 2.0
+  half_height = surface_height / 2.0
+  cr.translate(half_width, half_height)
+  cr.rotate(rotate / 180.0 * Math::PI)
+  cr.translate(-half_width, -half_height)
+
+  cr.translate((surface_width - width) / 2.0,
+               (surface_height - height) / 2.0)
+  cr.set_source_rgb(1, 1, 1)
+  cr.rectangle(0, 0, width, height)
+  cr.fill
+
+  cr.scale(scale, scale)
+  cr.render_poppler_page(page)
+  temp = Tempfile.new("pdf2")
+  cr.target.write_to_png(temp.path)
+  cr.target.finish
+  GdkPixbuf::Pixbuf.new(:file => temp.path)
+end
+
+unless Poppler.cairo_available?
+  puts "cairo isn't available."
+  exit(false)
+end
+pixbuf = to_pixbuf_with_cairo(input, page, scale, rotate)
+
+if pixbuf.nil?
+  puts "Is it a PDF file?: #{input}"
+  exit(-1)
+end
+puts "saving to #{output}(#{pixbuf.width}x#{pixbuf.height})..."
+pixbuf.save(output, output_type)

  Added: poppler-no-gi/sample/pdf2svg.rb (+26 -0) 100755
===================================================================
--- /dev/null
+++ poppler-no-gi/sample/pdf2svg.rb    2017-07-20 01:59:20 +0900 (756a7aa)
@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require "poppler"
+
+if ARGV.size < 1
+  puts "usage: #{$0} input.pdf"
+  exit(-1)
+end
+
+input, = ARGV
+
+output = input.sub(/\..+$/, ".svg")
+output = "#{output}.svg" if input == output
+
+doc = Poppler::Document.new(input)
+
+width, height = doc.pages[0].size
+Cairo::SVGSurface.new(output, width, height) do |surface|
+  surface.restrict_to_version("1_2")
+
+  context = Cairo::Context.new(surface)
+  doc.each do |page|
+    page.render(context)
+    context.show_page
+  end
+end

  Added: poppler-no-gi/sample/pdf2text.rb (+16 -0) 100755
===================================================================
--- /dev/null
+++ poppler-no-gi/sample/pdf2text.rb    2017-07-20 01:59:20 +0900 (2c36ffb)
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require "poppler"
+
+if ARGV.size < 1
+  puts "usage: #{$0} input.pdf"
+  exit(-1)
+end
+
+input = ARGV.shift
+input_uri = "file://#{File.expand_path(input)}"
+
+doc = Poppler::Document.new(input_uri)
+doc.each do |page|
+  puts page.get_text
+end

  Added: poppler-no-gi/sample/pdfcrop.rb (+32 -0) 100755
===================================================================
--- /dev/null
+++ poppler-no-gi/sample/pdfcrop.rb    2017-07-20 01:59:20 +0900 (7ccaaf0)
@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+require "poppler"
+
+if ARGV.size != 2
+  puts "usage: #{$0} input.pdf output.pdf"
+  exit(-1)
+end
+
+input, output = ARGV
+
+doc = Poppler::Document.new(input)
+
+width, height = doc.pages[0].size
+x_margin = width * 0.1
+y_margin = height * 0.1
+croped_width = width - (2 * x_margin)
+croped_height = height - (2 * y_margin)
+Cairo::PDFSurface.new(output, croped_width, croped_height) do |surface|
+  context = Cairo::Context.new(surface)
+
+  doc.each do |page|
+    width, height = page.size
+    context.save do
+      context.translate(-x_margin, -y_margin)
+      context.rectangle(x_margin, y_margin, croped_width, croped_height)
+      context.clip
+      page.render(context)
+      context.show_page
+    end
+  end
+end

  Added: poppler-no-gi/sample/pdfdiv.rb (+36 -0) 100755
===================================================================
--- /dev/null
+++ poppler-no-gi/sample/pdfdiv.rb    2017-07-20 01:59:20 +0900 (5a89a8b)
@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require "poppler"
+
+if ARGV.size != 2
+  puts "usage: #{$0} input.pdf output.pdf"
+  exit(-1)
+end
+
+input, output = ARGV
+
+doc = Poppler::Document.new(input)
+
+width, height = doc.pages[0].size
+Cairo::PDFSurface.new(output, width / 2, height) do |surface|
+  context = Cairo::Context.new(surface)
+
+  doc.each do |page|
+    width, height = page.size
+    half_width = width / 2
+    context.save do
+      context.rectangle(0, 0, half_width, height)
+      context.clip
+      page.render(context)
+      context.show_page
+    end
+
+    context.save do
+      context.translate(-half_width, 0)
+      context.rectangle(half_width, 0, half_width, height)
+      context.clip
+      page.render(context)
+      context.show_page
+    end
+  end
+end

  Added: poppler-no-gi/test/fixtures/image.pdf (+0 -0) 100644
===================================================================
(Binary files differ)

  Added: poppler-no-gi/test/fixtures/image.png (+0 -0) 100644
===================================================================
(Binary files differ)

  Added: poppler-no-gi/test/fixtures/outline.odt (+0 -0) 100644
===================================================================
(Binary files differ)

  Added: poppler-no-gi/test/fixtures/outline.pdf (+0 -0) 100644
===================================================================
(Binary files differ)

  Added: poppler-no-gi/test/poppler-test-utils.rb (+62 -0) 100644
===================================================================
--- /dev/null
+++ poppler-no-gi/test/poppler-test-utils.rb    2017-07-20 01:59:20 +0900 (343e13a)
@@ -0,0 +1,62 @@
+require 'open-uri'
+require 'fileutils'
+
+module PopplerTestUtils
+  def ensure_dir(dir)
+    FileUtils.mkdir_p(dir)
+    dir
+  end
+
+  def test_dir
+    File.expand_path(File.dirname(__FILE__))
+  end
+
+  def fixtures_dir
+    ensure_dir(File.join(test_dir, "fixtures"))
+  end
+
+  def tmp_dir
+    ensure_dir(File.join(test_dir, "tmp"))
+  end
+
+  def form_pdf
+    file = File.join(fixtures_dir, "form.pdf")
+    return file if File.exist?(file)
+    pdf = open("https://www.irs.gov/pub/irs-pdf/fw9.pdf").read
+    File.open(file, "wb") do |output|
+      output.print(pdf)
+    end
+    file
+  end
+
+  def image_pdf
+    File.join(fixtures_dir, "image.pdf")
+  end
+
+  def image_png
+    File.join(fixtures_dir, "image.png")
+  end
+
+  def outline_pdf
+    File.join(fixtures_dir, "outline.pdf")
+  end
+
+  def later_version?(major, minor, micro=nil)
+    micro ||= 0
+    (Poppler::BUILD_VERSION <=> [major, minor, micro]) >= 0
+  end
+
+  def only_poppler_version(major, minor, micro=nil)
+    micro ||= 0
+    unless later_version?(major, minor, micro)
+      omit("Require Poppler >= #{major}.#{minor}.#{micro}")
+    end
+  end
+
+  def only_old_poppler_version(major, minor, micro=nil)
+    micro ||= 0
+    if later_version?(major, minor, micro)
+      omit("Require Poppler < #{major}.#{minor}.#{micro}")
+    end
+  end
+end

  Added: poppler-no-gi/test/run-test.rb (+34 -0) 100755
===================================================================
--- /dev/null
+++ poppler-no-gi/test/run-test.rb    2017-07-20 01:59:20 +0900 (c0028ab)
@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+
+have_make = system("which make > /dev/null")
+
+glib_dir = File.expand_path(File.join(base_dir, "..", "glib2"))
+gdk_pixbuf_dir = File.expand_path(File.join(base_dir, "..", "gdk_pixbuf2"))
+pango_dir = File.join(File.join(base_dir, ".." , "pango"))
+
+$LOAD_PATH.unshift(File.join(glib_dir, "test"))
+require 'glib-test-init'
+
+[[gdk_pixbuf_dir, "gdk_pixbuf2"],
+ [pango_dir, "pango"],
+ [glib_dir, "glib2"],
+ [base_dir, "poppler"]].each do |dir, module_name|
+  if File.exist?(File.join(dir, "Makefile"))
+    if have_make
+      system("cd #{dir.dump} && make > /dev/null") or exit(false)
+    end
+    $LOAD_PATH.unshift(File.join(dir, "ext", module_name))
+  end
+  $LOAD_PATH.unshift(File.join(dir, "lib"))
+end
+require "poppler"
+
+$LOAD_PATH.unshift(File.join(base_dir, "test"))
+require 'poppler-test-utils'
+class Test::Unit::TestCase
+  include PopplerTestUtils
+end
+
+exit Test::Unit::AutoRunner.run(true, File.join(base_dir, "test"))

  Added: poppler-no-gi/test/test-index-iter.rb (+49 -0) 100644
===================================================================
--- /dev/null
+++ poppler-no-gi/test/test-index-iter.rb    2017-07-20 01:59:20 +0900 (060b3ea)
@@ -0,0 +1,49 @@
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class TestIndexIter < Test::Unit::TestCase
+  def test_title
+    document = Poppler::Document.new(outline_pdf)
+    assert_equal([
+                   [
+                     "Heading1",
+                     [
+                       [
+                         "Heading2",
+                         [
+                           [
+                             "Heading3",
+                           ],
+                         ],
+                       ],
+                     ],
+                   ],
+                 ],
+                 collect_titles(document.index_iter))
+  end
+
+  private
+  def collect_titles(iter)
+    iter.collect do
+      titles = [iter.action.title]
+      child_iter = iter.child
+      if child_iter
+        titles << collect_titles(child_iter)
+      end
+      titles
+    end
+  end
+end

  Added: poppler-no-gi/test/test-version.rb (+47 -0) 100644
===================================================================
--- /dev/null
+++ poppler-no-gi/test/test-version.rb    2017-07-20 01:59:20 +0900 (e72e371)
@@ -0,0 +1,47 @@
+# Copyright (C) 2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class TestPopplerVersion < Test::Unit::TestCase
+  include PopplerTestUtils
+
+  test "STRING" do
+    major = Poppler::Version::MAJOR
+    minor = Poppler::Version::MINOR
+    micro = Poppler::Version::MICRO
+    assert_equal([major, minor, micro].join("."),
+                 Poppler::Version::STRING)
+  end
+
+  sub_test_case("#or_later?") do
+    test "same" do
+      assert_true(Poppler::Version.or_later?(Poppler::Version::MAJOR,
+                                             Poppler::Version::MINOR,
+                                             Poppler::Version::MICRO))
+    end
+
+    test "later" do
+      assert_true(Poppler::Version.or_later?(Poppler::Version::MAJOR,
+                                             Poppler::Version::MINOR - 1,
+                                             Poppler::Version::MICRO))
+    end
+
+    test "earlier" do
+      assert_false(Poppler::Version.or_later?(Poppler::Version::MAJOR,
+                                              Poppler::Version::MINOR + 1,
+                                              Poppler::Version::MICRO))
+    end
+  end
+end

  Added: poppler-no-gi/test/test_annotation.rb (+86 -0) 100644
===================================================================
--- /dev/null
+++ poppler-no-gi/test/test_annotation.rb    2017-07-20 01:59:20 +0900 (f9de429)
@@ -0,0 +1,86 @@
+class TestAnnotation < Test::Unit::TestCase
+  def test_type
+    only_poppler_version(0, 7, 2)
+    assert_kind_of(Poppler::AnnotationType, annotation.type)
+  end
+
+  def test_contents
+    only_poppler_version(0, 7, 2)
+    assert_nil(annotation.contents)
+  end
+
+  def test_name
+    only_poppler_version(0, 7, 2)
+    assert_nil(annotation.name)
+  end
+
+  def test_modified
+    only_poppler_version(0, 7, 2)
+    assert_nil(annotation.modified)
+  end
+
+  def test_flags
+    only_poppler_version(0, 7, 2)
+    assert_kind_of(Poppler::AnnotationFlag, annotation.flags)
+  end
+
+  def test_color
+    only_poppler_version(0, 7, 2)
+    assert_nil(annotation.color)
+  end
+
+  def test_markup
+    only_poppler_version(0, 7, 2)
+    # We don't have a PDF that has annotation markup...
+    assert_method_defined(Poppler::AnnotationMarkup, :label)
+    assert_method_defined(Poppler::AnnotationMarkup, :popup_is_open?)
+    assert_method_defined(Poppler::AnnotationMarkup, :opacity)
+    assert_method_defined(Poppler::AnnotationMarkup, :date)
+    assert_method_defined(Poppler::AnnotationMarkup, :subject)
+    assert_method_defined(Poppler::AnnotationMarkup, :reply_to)
+    assert_method_defined(Poppler::AnnotationMarkup, :external_data)
+  end
+
+  def test_text
+    only_poppler_version(0, 7, 2)
+    # We don't have a PDF that has annotation text...
+    assert_method_defined(Poppler::AnnotationText, :open?)
+    assert_method_defined(Poppler::AnnotationText, :icon)
+    assert_method_defined(Poppler::AnnotationText, :state)
+  end
+
+  def test_free_text
+    only_poppler_version(0, 7, 2)
+    # We don't have a PDF that has annotation free text...
+    assert_method_defined(Poppler::AnnotationFreeText, :quadding)
+    assert_method_defined(Poppler::AnnotationFreeText, :callout_line)
+  end
+
+  def test_callout_line
+    only_poppler_version(0, 7, 2)
+    callout_line = Poppler::AnnotationCalloutLin...
 
[truncated message content]

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@a0a4536 [master] Start poppler module based on GObject-Introspection

[cedlemo <nu...@co...>]

cedlemo	2017-07-20 02:00:02 +0900 (Thu, 20 Jul 2017)

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

  Merged 7316c70: Merge pull request #1068 from cedlemo/poppler_gi_form

  Message:
    Start poppler module based on GObject-Introspection

  Added files:
    poppler/README.md
  Modified files:
    poppler/lib/poppler.rb

  Added: poppler/README.md (+25 -0) 100644
===================================================================
--- /dev/null
+++ poppler/README.md    2017-07-20 02:00:02 +0900 (f4f2f2e)
@@ -0,0 +1,25 @@
+# Ruby/Poppler
+
+Ruby/Poppler is a Ruby binding of [poppler-glib](https://developer.gnome.org/poppler/).
+
+## Requirements
+
+* [Ruby/GObject-Introspection](https://github.com/ruby-gnome2/ruby-gnome2)
+* [Ruby/Gio2](https://github.com/ruby-gnome2/ruby-gnome2)
+* [rcairo](https://github.com/rcairo/rcairo)
+
+## Install
+
+    gem install atk
+
+## License
+
+Copyright (c) 2017 Ruby-GNOME2 Project Team
+
+This program is free software. You can distribute/modify this program
+under the terms of the GNU LESSER GENERAL PUBLIC LICENSE Version 2.1.
+
+## Project Websites
+
+*   http://ruby-gnome2.sourceforge.jp/
+*   https://github.com/ruby-gnome2/ruby-gnome2

  Modified: poppler/lib/poppler.rb (+29 -97)
===================================================================
--- poppler/lib/poppler.rb    2017-07-20 01:59:20 +0900 (6aa2946)
+++ poppler/lib/poppler.rb    2017-07-20 02:00:02 +0900 (025f6ae)
@@ -1,122 +1,54 @@
-# Copyright(C) 2006-2015 Ruby-GNOME2 Project.
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
 #
-# This library is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-# Foobar is distributed in the hope that it will be useful,
+# This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public License
-# along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public
+# 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 "tempfile"
-require "date"
-require "glib2"
-require "gdk_pixbuf2"
-require "cairo"
+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)
-begin
-  major, minor, = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/poppler.so"
-rescue LoadError
-  require "poppler.so"
-end
+vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
+GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
 
 module Poppler
   LOG_DOMAIN = "Poppler"
+  GLib::Log.set_log_domain(LOG_DOMAIN)
 
-  VERSION = version.split(".").collect {|x| x.to_i}
+  class Loader < GObjectIntrospection::Loader
+  end
 
-  module Version
-      MAJOR, MINOR, MICRO = BUILD_VERSION
-      STRING = "#{MAJOR}.#{MINOR}.#{MICRO}"
+  loader = Loader.new(self)
+  loader.load("Poppler")
 
+  module Version
+    MAJOR = MAJOR_VERSION
+    MINOR = MINOR_VERSION
+    MICRO = MICRO_VERSION
+    STRING = "#{MAJOR_VERSION}.#{MINOR_VERSION}.#{MICRO_VERSION}"
     class << self
       def or_later?(major, minor, micro=nil)
-        micro || 0
+        micro ||= 0
         version = [
-          MAJOR,
-          MINOR,
-          MICRO,
+          MAJOR_VERSION,
+          MINOR_VERSION,
+          MICRO_VERSION,
         ]
         (version <=> [major, minor, micro]) >= 0
       end
     end
   end
-
-  class Document
-    private
-    def pdf_data?(data)
-      data.start_with?("%PDF-1.")
-    end
-
-    def ensure_uri(uri)
-      if pdf_data?(uri)
-        @pdf = Tempfile.new("ruby-poppler-pdf")
-        @pdf.binmode
-        @pdf.print(uri)
-        @pdf.close
-        uri = @pdf.path
-      end
-
-      if GLib.path_is_absolute?(uri)
-        GLib.filename_to_uri(uri)
-      elsif /\A[a-zA-Z][a-zA-Z\d\-+.]*:/.match(uri)
-        uri
-      else
-        GLib.filename_to_uri(File.expand_path(uri))
-      end
-    end
-  end
-
-  if defined?(TextField)
-    class TextField
-      def multiline?
-        type == FormTextType::MULTILINE
-      end
-
-      def file_select?
-        type == FormTextType::FILE_SELECT
-      end
-
-      def normal?
-        type == FormTextType::NORMAL
-      end
-    end
-  end
-
-  if defined?(ChoiceField)
-    class ChoiceField
-      def combo?
-        type == FormChioceType::COMBO
-      end
-
-      def list?
-        type == FormChoiceType::LIST
-      end
-    end
-  end
 end
-
-if Poppler.cairo_available?
-  module Cairo
-    class Context
-      def render_poppler_page(page, *args, &block)
-        page.render(self, *args, &block)
-      end
-
-      def render_poppler_page_selection(page, *args, &block)
-        page.render_selection(self, *args, &block)
-      end
-    end
-  end
-end
-
-GLib::Log.set_log_domain(Poppler::LOG_DOMAIN)

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@cfb72c5 [master] Add the AnnotCalloutLine module

[cedlemo <nu...@co...>]

cedlemo	2017-07-21 02:08:25 +0900 (Fri, 21 Jul 2017)

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

  Merged 7316c70: Merge pull request #1068 from cedlemo/poppler_gi_form

  Message:
    Add the AnnotCalloutLine module

  Copied files:
    poppler/lib/poppler/annot-callout-line.rb
      (from poppler/lib/poppler.rb)
  Modified files:
    poppler/lib/poppler.rb
    poppler/lib/poppler/loader.rb

  Modified: poppler/lib/poppler.rb (+0 -27)
===================================================================
--- poppler/lib/poppler.rb    2017-07-21 02:02:55 +0900 (009ace7)
+++ poppler/lib/poppler.rb    2017-07-21 02:08:25 +0900 (2837e57)
@@ -33,31 +33,4 @@ module Poppler
   loader = Loader.new(self)
   loader.load("Poppler")
 
-  class AnnotCalloutLine
-    alias_method :initialize_raw, :initialize
-    def initialize(*args)
-      initialize_raw
-      if args.size == 1 && args.class == Hash
-        self.multiline = args[:multiline] || false
-        self.x1 = args[:x1] || 0
-        self.y1 = args[:y1] || 0
-        self.x2 = args[:x2] || 0
-        self.y2 = args[:y2] || 0
-        self.x3 = args[:x3] || 0
-        self.y3 = args[:y3] || 0
-      elsif args.class == Array && args.size == 7
-        self.multiline = args[0]
-        self.x1 = args[1]
-        self.y1 = args[2]
-        self.x2 = args[3]
-        self.y2 = args[4]
-        self.x3 = args[5]
-        self.y3 = args[6]
-      end
-    end
-
-    def to_a
-      [multiline?, x1, y1, x2, y2, x3, y3]
-    end
-  end
 end

  Copied: poppler/lib/poppler/annot-callout-line.rb (+0 -18) 75%
===================================================================
--- poppler/lib/poppler.rb    2017-07-21 02:02:55 +0900 (009ace7)
+++ poppler/lib/poppler/annot-callout-line.rb    2017-07-21 02:08:25 +0900 (31c0d8f)
@@ -14,25 +14,7 @@
 # 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")
-
   class AnnotCalloutLine
     alias_method :initialize_raw, :initialize
     def initialize(*args)

  Modified: poppler/lib/poppler/loader.rb (+1 -0)
===================================================================
--- poppler/lib/poppler/loader.rb    2017-07-21 02:02:55 +0900 (23253cc)
+++ poppler/lib/poppler/loader.rb    2017-07-21 02:08:25 +0900 (5e9674f)
@@ -26,6 +26,7 @@ module Poppler
 
     def require_libraries
       require "poppler/version"
+      require "poppler/annot-callout-line"
     end
   end
 end

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@7316c70 [master] Merge pull request #1068 from cedlemo/poppler_gi_form

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

Kouhei Sutou	2017-07-21 21:57:58 +0900 (Fri, 21 Jul 2017)

  New Revision: 7316c70566c2bc2b092ee1902195ab08161b097a
  https://github.com/ruby-gnome2/ruby-gnome2/commit/7316c70566c2bc2b092ee1902195ab08161b097a

  Message:
    Merge pull request #1068 from cedlemo/poppler_gi_form
    
    Poppler gi form
    
    Patch by cedlemo. Thanks!!!

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@4af6065 [master] Rename test_annotation.rb to test-annotation.rb

[cedlemo <nu...@co...>]

cedlemo	2017-07-21 02:09:55 +0900 (Fri, 21 Jul 2017)

  New Revision: 4af6065dbe7ce38ede00a58a6423350662739ab6
  https://github.com/ruby-gnome2/ruby-gnome2/commit/4af6065dbe7ce38ede00a58a6423350662739ab6

  Merged 7316c70: Merge pull request #1068 from cedlemo/poppler_gi_form

  Message:
    Rename test_annotation.rb to test-annotation.rb

  Renamed files:
    poppler/test/test-annotation.rb
      (from poppler/test/test_annotation.rb)

  Renamed: poppler/test/test-annotation.rb (+0 -0) 100%
===================================================================

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@1f004a1 [master] use Poppler::Version.or_later? in tests

[cedlemo <nu...@co...>]

cedlemo	2017-07-21 01:26:54 +0900 (Fri, 21 Jul 2017)

  New Revision: 1f004a1600ba8b388fda11aaea557a06828bbb0d
  https://github.com/ruby-gnome2/ruby-gnome2/commit/1f004a1600ba8b388fda11aaea557a06828bbb0d

  Merged 7316c70: Merge pull request #1068 from cedlemo/poppler_gi_form

  Message:
    use Poppler::Version.or_later? in tests

  Modified files:
    poppler/test/poppler-test-utils.rb
    poppler/test/test_constants.rb
    poppler/test/test_page.rb

  Modified: poppler/test/poppler-test-utils.rb (+2 -7)
===================================================================
--- poppler/test/poppler-test-utils.rb    2017-07-20 02:02:59 +0900 (343e13a)
+++ poppler/test/poppler-test-utils.rb    2017-07-21 01:26:54 +0900 (dfdec09)
@@ -41,21 +41,16 @@ module PopplerTestUtils
     File.join(fixtures_dir, "outline.pdf")
   end
 
-  def later_version?(major, minor, micro=nil)
-    micro ||= 0
-    (Poppler::BUILD_VERSION <=> [major, minor, micro]) >= 0
-  end
-
   def only_poppler_version(major, minor, micro=nil)
     micro ||= 0
-    unless later_version?(major, minor, micro)
+    unless Poppler::Version.or_later?(major, minor, micro)
       omit("Require Poppler >= #{major}.#{minor}.#{micro}")
     end
   end
 
   def only_old_poppler_version(major, minor, micro=nil)
     micro ||= 0
-    if later_version?(major, minor, micro)
+    if Poppler::Version.or_later?(major, minor, micro)
       omit("Require Poppler < #{major}.#{minor}.#{micro}")
     end
   end

  Modified: poppler/test/test_constants.rb (+2 -2)
===================================================================
--- poppler/test/test_constants.rb    2017-07-20 02:02:59 +0900 (9f03761)
+++ poppler/test/test_constants.rb    2017-07-21 01:26:54 +0900 (ec6a230)
@@ -1,6 +1,6 @@
 class TestConstants < Test::Unit::TestCase
   def test_annotation
-    if later_version?(0, 7, 2)
+    if Poppler::Version.or_later?(0, 7, 2)
       assertion = :assert_const_defined
     else
       assertion = :assert_not_const_defined
@@ -15,7 +15,7 @@ class TestConstants < Test::Unit::TestCase
     if assertion == :assert_const_defined
       assert_equal("3d", Poppler::AnnotationExternalDataType::TYPE_3D.nick)
     end
-    if later_version?(0, 9, 0)
+    if Poppler::Version.or_later?(0, 9, 0)
       assert_not_const_defined(Poppler, :AnnotationTextIcon)
     else
       send(assertion, Poppler, :AnnotationTextIcon)

  Modified: poppler/test/test_page.rb (+1 -1)
===================================================================
--- poppler/test/test_page.rb    2017-07-20 02:02:59 +0900 (01ffc84)
+++ poppler/test/test_page.rb    2017-07-21 01:26:54 +0900 (4da050d)
@@ -12,7 +12,7 @@ class TestPage < Test::Unit::TestCase
     page = document[0]
     rectangle = Poppler::Rectangle.new(0, 0, *page.size)
     region = page.get_selection_region(0.5, :word, rectangle)
-    if later_version?(0, 7, 2)
+    if Poppler::Version.or_later?(0, 7, 2)
       assert_kind_of(Poppler::Rectangle, region[0])
     else
       assert_kind_of(Gdk::Region, region)