poppler 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 319b888011915579749da09f33a4386d1a362f58
-  data.tar.gz: 56ac088a5fc297755f1b4f216a4992449dbbb19c
+  metadata.gz: fef7c6af4f86556d78fdb78baae75e9f50aad95e
+  data.tar.gz: 2fd63389ef0426fb4cca306990ebddcabc854cb5
 SHA512:
-  metadata.gz: ab0445244a548b361699563c1a44b2c26975d53bbd52828831662e2bbcbbeb8685f1622f1a3e6b8e042d584134fce36945d5cb7b164b34ba9970cdff48c151fa
-  data.tar.gz: 4afbb94e61f0aba4d18fb8b8242f3d14495b109152f4e6df4f1bfe5d8fdefc06ed8590003b6143415d5b90de625c0584d0a7361d39860b027288c2fa84d3b5be
+  metadata.gz: c0b031e3d442dedb8a50f85f3ee4bcd21c4431c30c62d3c6b5d7fd585ea8168b9b8d2faf2d8cd2576b3b2f97809986c20185cef77a4fe554414e5752c3c0ea70
+  data.tar.gz: 8f4c91e0b0c818e846e3362067090084d78a4682ed0e62c1c76f15b5f4abae285d708e539b9446502dabaac1d44b6f34b0ee3c0e08794595c3f89f1c2bfec64a

data/Rakefile

@@ -22,13 +22,12 @@ 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.12.8"], "gdk_pixbuf2"]
-  package.win32.packages = []
-  package.win32.dependencies = []
+  package.dependency.gem.runtime = [["cairo", ">= 1.14.0"], "gdk_pixbuf2"]
+  package.windows.packages = []
+  package.windows.dependencies = []
   package.windows.build_dependencies = [
     "glib2",
     "gobject-introspection",
-    "pango",
     "gdk_pixbuf2",
   ]
   package.windows.gobject_introspection_dependencies = [
@@ -61,7 +60,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "poppler",
       :download_base_url => "http://poppler.freedesktop.org",
       :label => "Poppler",
-      :version => "0.26.5",
+      :version => "0.29.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/ext/poppler/extconf.rb

@@ -30,7 +30,7 @@ rescue LoadError
   require 'mkmf-gnome2'
 end
 
-["glib2", "atk", "pango", "gdk_pixbuf2"].each do |package|
+["glib2", "atk", "gdk_pixbuf2"].each do |package|
   directory = "#{package}#{version_suffix}"
   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
   add_depend_package(package, "#{directory}/ext/#{package}",
@@ -39,24 +39,11 @@ end
                      :target_build_dir => build_dir)
 end
 
-rcairo_options = {}
-rcairo_source_dir_names = ["rcairo"]
-if /mingw|cygwin|mswin/ =~ RUBY_PLATFORM
-  rcairo_source_dir_names.unshift("rcairo.win32")
-end
-rcairo_source_dir_names.each do |rcairo_source_dir_name|
-  rcairo_source_dir = top_dir.parent.expand_path + rcairo_source_dir_name
-  if rcairo_source_dir.exist?
-    rcairo_options[:rcairo_source_dir] = rcairo_source_dir.to_s
-    break
-  end
-end
-
-unless check_cairo(rcairo_options)
+unless check_cairo(:top_dir => top_dir)
   exit(false)
 end
 
-setup_win32(module_name, base_dir)
+setup_windows(module_name, base_dir)
 
 unless required_pkg_config_package([package_id, 0, 12, 0],
                                    :debian => "libpoppler-glib-dev",

data/lib/poppler.rb

@@ -16,10 +16,7 @@ require "tempfile"
 require "date"
 require "glib2"
 require "gdk_pixbuf2"
-begin
-  require "cairo"
-rescue LoadError
-end
+require "cairo"
 
 base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
 vendor_dir = base_dir + "vendor" + "local"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poppler
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.8
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.8
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 description: Ruby/Poppler is a Ruby binding of poppler-glib.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []