poppler 0.90.8-x86-mingw32 → 0.90.9-x86-mingw32

data/ChangeLog

@@ -1,3 +1,10 @@
+2011-05-06  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/poppler-test-utils.rb: ignore tests for GdkPixbuf
+	integration on Poppler >= 0.17.0 because Poppler >= 0.17.0 drops
+	GdkPixbuf support. #3292118
+	Reported by Mamoru Tasaka. Thanks!!!
+
 2011-01-30  Kouhei Sutou  <kou@cozmixng.org>
 
 	* Rakefile, ext/poppler/extconf.rb: share depended packages

data/test/poppler-test-utils.rb

@@ -44,4 +44,11 @@ module PopplerTestUtils
       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

data/test/test_page.rb

@@ -11,6 +11,8 @@ class TestPage < Test::Unit::TestCase
   end
 
   def test_render_to_pixbuf
+    only_old_poppler_version(0, 17, 0)
+
     document = Poppler::Document.new(image_pdf)
     page = document[0]
     width, height = page.size
@@ -24,6 +26,7 @@ class TestPage < Test::Unit::TestCase
 
   def test_render_to_pixbuf_for_printing
     only_poppler_version(0, 7, 2)
+    only_old_poppler_version(0, 17, 0)
 
     document = Poppler::Document.new(image_pdf)
     page = document[0]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: poppler
 version: !ruby/object:Gem::Version 
-  hash: 359
-  prerelease: false
+  hash: 357
+  prerelease: 
   segments: 
   - 0
   - 90
-  - 8
-  version: 0.90.8
+  - 9
+  version: 0.90.9
 platform: x86-mingw32
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 +09:00
-default_executable: 
+date: 2011-06-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gtk2
@@ -26,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 359
+        hash: 357
         segments: 
         - 0
         - 90
-        - 8
-        version: 0.90.8
+        - 9
+        version: 0.90.9
   type: :runtime
   version_requirements: *id001
 description: Ruby/Poppler is a Ruby binding of poppler-glib.
@@ -51,15 +50,12 @@ files:
 - ext/poppler/rbpoppler-attachment.c
 - ext/poppler/rbpoppler.h
 - ext/poppler/rbpoppler.c
-- ext/poppler/Makefile
 - ext/poppler/rbpoppler-page.c
 - ext/poppler/extconf.rb
 - ext/poppler/rbpoppler-form-field.c
-- ext/poppler/rbpopplerversion.h
 - ext/poppler/rbpoppler-action.c
 - ext/poppler/rbpoppler-annotation.c
 - ext/poppler/rbpoppler-private.h
-- ext/poppler/ruby-poppler.pc
 - ext/poppler/poppler.def
 - ext/poppler/depend
 - ext/poppler/rbpoppler-document.c
@@ -169,7 +165,6 @@ files:
 - vendor/local/include/libpng12/pngconf.h
 - vendor/local/include/jconfig.h
 - vendor/local/include/jerror.h
-has_rdoc: true
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
 
@@ -201,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Ruby/Poppler is a Ruby binding of poppler-glib.

data/ext/poppler/Makefile

@@ -1,162 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = /home/kou/work/ruby/ruby-gnome2.win32/poppler/ext/poppler
-topdir = /usr/lib/ruby/1.8/x86_64-linux
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-exec_prefix = $(prefix)
-prefix = $(DESTDIR)/usr
-sharedstatedir = $(prefix)/com
-mandir = $(prefix)/share/man
-psdir = $(docdir)
-oldincludedir = $(DESTDIR)/usr/include
-localedir = $(datarootdir)/locale
-bindir = $(exec_prefix)/bin
-libexecdir = $(prefix)/lib/ruby1.8
-sitedir = $(DESTDIR)/usr/local/lib/site_ruby
-htmldir = $(docdir)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-includedir = $(prefix)/include
-infodir = $(prefix)/share/info
-vendorlibdir = $(vendordir)/$(ruby_version)
-sysconfdir = $(DESTDIR)/etc
-libdir = $(exec_prefix)/lib
-sbindir = $(exec_prefix)/sbin
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-vendordir = $(libdir)/ruby/vendor_ruby
-datarootdir = $(prefix)/share
-pdfdir = $(docdir)
-archdir = $(rubylibdir)/$(arch)
-sitearchdir = $(sitelibdir)/$(sitearch)
-datadir = $(datarootdir)
-localstatedir = $(DESTDIR)/var
-sitelibdir = $(sitedir)/$(ruby_version)
-
-CC = gcc
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-
-RUBY_EXTCONF_H = 
-CFLAGS   =  -fPIC -fno-strict-aliasing -g -g -O2  -fPIC $(cflags) -Wall -I/home/kou/work/ruby/rcairo/ext/cairo -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/poppler/glib -I/usr/include/poppler -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/gio-unix-2.0/ -I/usr/include/pango-1.0 -pthread -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/poppler 
-INCFLAGS = -I. -I/home/kou/work/ruby/ruby-gnome2.win32/gtk2/ext/gtk2 -I/home/kou/work/ruby/ruby-gnome2.win32/gtk2/ext/gtk2 -I/home/kou/work/ruby/ruby-gnome2.win32/gtk2/ext/gtk2 -I/home/kou/work/ruby/ruby-gnome2.win32/gdk_pixbuf2/ext/gdk_pixbuf2 -I/home/kou/work/ruby/ruby-gnome2.win32/gdk_pixbuf2/ext/gdk_pixbuf2 -I/home/kou/work/ruby/ruby-gnome2.win32/gdk_pixbuf2/ext/gdk_pixbuf2 -I/home/kou/work/ruby/ruby-gnome2.win32/pango/ext/pango -I/home/kou/work/ruby/ruby-gnome2.win32/pango/ext/pango -I/home/kou/work/ruby/ruby-gnome2.win32/pango/ext/pango -I/home/kou/work/ruby/ruby-gnome2.win32/atk/ext/atk -I/home/kou/work/ruby/ruby-gnome2.win32/atk/ext/atk -I/home/kou/work/ruby/ruby-gnome2.win32/atk/ext/atk -I/home/kou/work/ruby/ruby-gnome2.win32/glib2/ext/glib2 -I/home/kou/work/ruby/ruby-gnome2.win32/glib2/ext/glib2 -I/home/kou/work/ruby/ruby-gnome2.win32/glib2/ext/glib2 -I. -I/usr/lib/ruby/1.8/x86_64-linux -I/home/kou/work/ruby/ruby-gnome2.win32/poppler/ext/poppler
-DEFS     = 
-CPPFLAGS = -DHAVE_RB_DEFINE_ALLOC_FUNC -DHAVE_RB_BLOCK_PROC -DHAVE_OBJECT_ALLOCATE -DHAVE_NODE_ATTRASGN -DHAVE_RB_CAIRO_H  -DRUBY_POPPLER_COMPILATION   
-CXXFLAGS = $(CFLAGS) 
-ldflags  = -L.  -rdynamic -Wl,-export-dynamic  -pthread 
-dldflags = 
-archflag = 
-DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
-LDSHARED = $(CC) -shared
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby1.8
-RUBY_SO_NAME = ruby1.8
-arch = x86_64-linux
-sitearch = x86_64-linux
-ruby_version = 1.8
-ruby = /usr/bin/ruby1.8
-RUBY = $(ruby)
-RM = rm -f
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir)
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lcairo -lpoppler-glib -lgobject-2.0 -lglib-2.0 -lgthread-2.0 -lrt -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lm -lgmodule-2.0 -lpango-1.0 -lpangocairo-1.0 -lcairo -lgio-2.0 -lpoppler -lcairo -lpthread -lrt -ldl -lcrypt -lm   -lc
-SRCS = rbpoppler-attachment.c rbpoppler.c rbpoppler-page.c rbpoppler-form-field.c rbpoppler-action.c rbpoppler-annotation.c rbpoppler-document.c
-OBJS = rbpoppler-attachment.o rbpoppler.o rbpoppler-page.o rbpoppler-form-field.o rbpoppler-action.o rbpoppler-annotation.o rbpoppler-document.o
-TARGET = poppler
-DLLIB = $(TARGET).so
-EXTSTATIC = 
-STATIC_LIB = 
-
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-
-realclean:	distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-$(RUBYARCHDIR):
-	$(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
-
-.cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
-
-$(DLLIB): $(OBJS) Makefile
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-###
-install:
-	if test -n "$(pkgconfigdir)"; then			\
-	  $(MAKEDIRS) $(pkgconfigdir);				\
-	  $(INSTALL_DATA) ruby-poppler.pc $(pkgconfigdir);	\
-	fi

data/ext/poppler/rbpopplerversion.h

@@ -1,24 +0,0 @@
-/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpopplerversion.h -
-
-  This file was generated by mkmf-gnome2.rb.
-
-************************************************/
-
-#ifndef __RBPOPPLER_VERSION_H__
-#define __RBPOPPLER_VERSION_H__
-
-#define POPPLER_MAJOR_VERSION (0)
-#define POPPLER_MINOR_VERSION (6)
-#define POPPLER_MICRO_VERSION (2)
-
-#define POPPLER_CHECK_VERSION(major,minor,micro)    \
-    (POPPLER_MAJOR_VERSION > (major) || \
-     (POPPLER_MAJOR_VERSION == (major) && POPPLER_MINOR_VERSION > (minor)) || \
-     (POPPLER_MAJOR_VERSION == (major) && POPPLER_MINOR_VERSION == (minor) && \
-      POPPLER_MICRO_VERSION >= (micro)))
-
-
-#endif /* __RBPOPPLER_VERSION_H__ */

data/ext/poppler/ruby-poppler.pc

@@ -1,3 +0,0 @@
-Name: Ruby/Poppler
-Description: Ruby bindings for GLib wrapper for poppler
-Version: 0.90.7