poppler 0.20.0.1 → 0.20.1

data/Rakefile

@@ -8,8 +8,7 @@ CLOBBER.include '**/extconf.h'
 
 # Determine the current version of the software
 def ruby_poppler_version
-  require 'glib2'
-  GLib::BINDING_VERSION.join('.')
+  "0.20.1"
 end
 
 CURRENT_VERSION = ruby_poppler_version

data/extconf.rb

@@ -6,14 +6,13 @@ PACKAGE_NAME = "poppler"
 PACKAGE_ID = "poppler-glib"
 
 begin
+  require 'rubygems'
   require 'mkmf-gnome2'
-  USE_GLIB_GEM = true
   TOPDIR = File.expand_path(File.dirname(__FILE__) )
   SRCDIR = TOPDIR + '/src'
   require 'glib2'
-  require 'gdk_pixbuf2'
   require 'gtk2/base'
-
+  USE_GNOME_GEMS = true
 rescue LoadError => e
   TOPDIR = File.expand_path(File.dirname(__FILE__) + '/..')
   MKMF_GNOME2_DIR = TOPDIR + '/glib/src/lib'
@@ -22,6 +21,7 @@ rescue LoadError => e
   $LOAD_PATH.unshift MKMF_GNOME2_DIR
 
   require 'mkmf-gnome2'
+  USE_GNOME_GEMS = false
 end
 
 PKGConfig.have_package(PACKAGE_ID, 0, 8, 0) or exit 1
@@ -29,13 +29,12 @@ setup_win32(PACKAGE_NAME)
 
 check_cairo
 
-if USE_GLIB_GEM
-  path = File.expand_path(ENV['GEM_HOME'] + "/gems/glib2-#{GLib::BINDING_VERSION.join('.')}/src")
-  add_depend_package("glib2", path, '/')
-  path = File.expand_path(ENV['GEM_HOME'] + "/gems/gdkpixbuf-#{GLib::BINDING_VERSION.join('.')}/src")
-  add_depend_package("gdk_pixbuf2", path, '/')
-  path = File.expand_path(ENV['GEM_HOME'] + "/gems/gtk2-#{GLib::BINDING_VERSION.join('.')}/src")
-  add_depend_package("gtk2", path, '/')
+if USE_GNOME_GEMS
+  add_depend_package("glib2", File.dirname(Gem.find_files('rbglib.h').first), '/')
+  add_depend_package("pango", File.dirname(Gem.find_files('rbpango.h').first), '/')
+  add_depend_package("atk", File.dirname(Gem.find_files('rbatk.h').first), '/')
+  add_depend_package("gdkpixbuf2", File.dirname(Gem.find_files('rbgdk-pixbuf.h').first), '/')
+  add_depend_package("gtk2", File.dirname(Gem.find_files('rbgtk.h').first), '/')
 else
   add_depend_package("glib2", "glib/src", TOPDIR)
   add_depend_package("gtk2", "gtk/src", TOPDIR)

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 20
-  - 0
   - 1
-  version: 0.20.0.1
+  version: 0.20.1
 platform: ruby
 authors: 
 - ruby-gnome2/AUTHORS