poppler 2.2.3-x86-mingw32 → 2.2.4-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07d0f75fb44378abba7f3a5ef031a5754e3dfd46
-  data.tar.gz: 84a56012cd2702854d5240018b305efc3d2d08a3
+  metadata.gz: cfba4304e559bdc1e9f08d1bb9a7951bcdddf999
+  data.tar.gz: de3266e8d84888ffd4b6c968f1d7ebe13939ebdc
 SHA512:
-  metadata.gz: b23375aaafe61c40c08dbc0186a86c26014bfd469cff4246458fbd5a6a823221ac27290651e79ce8933e9ee4032328e95b7e8cdd942e5798920175548af18d20
-  data.tar.gz: 03f3044054dfc390bf336c15342970d1cc044b130fbeafebf1acfa4e446e6914b1fa14b16da96a04432f5c200f1d6fd65daab0c4cc20fd8d844b3f08fb34188a
+  metadata.gz: 9b285694405afd3146ca632e474556807390a9a236887d51c525db9c8504477db8593392b42abbf97f27516a827321ce9fe449942898d58adfa7691a8071b9c3
+  data.tar.gz: d57d4acbd7be0f07a559ff2d188773a7aabf309967e7c3e4b2182f7b8d46d1511ce1d4215949d772eae6410218dc5ced2e3f7cc8d8487d218ba5485fa572ddff

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"

data/vendor/local/include/poppler/cpp/poppler-version.h

@@ -21,10 +21,10 @@
 
 #include "poppler-global.h"
 
-#define POPPLER_VERSION "0.26.5"
+#define POPPLER_VERSION "0.29.0"
 #define POPPLER_VERSION_MAJOR 0
-#define POPPLER_VERSION_MINOR 26
-#define POPPLER_VERSION_MICRO 5
+#define POPPLER_VERSION_MINOR 29
+#define POPPLER_VERSION_MICRO 0
 
 namespace poppler
 {

data/vendor/local/include/poppler/glib/poppler-features.h

@@ -55,7 +55,7 @@
  *
  * Since: 0.12
  */
-#define POPPLER_MINOR_VERSION (26)
+#define POPPLER_MINOR_VERSION (29)
 
 /**
  * POPPLER_MICRO_VERSION:
@@ -65,7 +65,7 @@
  *
  * Since: 0.12
  */
-#define POPPLER_MICRO_VERSION (5)
+#define POPPLER_MICRO_VERSION (0)
 
 /**
  * POPPLER_CHECK_VERSION:

data/vendor/local/include/poppler/glib/poppler.h

@@ -155,6 +155,7 @@ typedef enum /*< flags >*/
 
 /**
  * PopplerFindFlags:
+ * @POPPLER_FIND_DEFAULT: use default search settings
  * @POPPLER_FIND_CASE_SENSITIVE: do case sensitive search
  * @POPPLER_FIND_BACKWARDS: search backwards
  * @POPPLER_FIND_WHOLE_WORDS_ONLY: search only whole words
@@ -212,6 +213,14 @@ typedef struct _PopplerStructureElement    PopplerStructureElement;
 typedef struct _PopplerStructureElementIter PopplerStructureElementIter;
 typedef struct _PopplerTextSpan            PopplerTextSpan;
 
+/**
+ * PopplerBackend:
+ * @POPPLER_BACKEND_UNKNOWN: Unknown backend
+ * @POPPLER_BACKEND_SPLASH: Splash backend
+ * @POPPLER_BACKEND_CAIRO: Cairo backend
+ *
+ * Backend codes returned by poppler_get_backend().
+ */
 typedef enum
 {
   POPPLER_BACKEND_UNKNOWN,

data/vendor/local/lib/libjpeg.la

@@ -17,7 +17,7 @@ old_library='libjpeg.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/kou/work/ruby/rcairo.win32/vendor/local/lib -L/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib'
+dependency_libs=' -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/vagrant/rcairo.win32/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib'
+libdir='/home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib'

data/vendor/local/lib/libpoppler-cpp.la

@@ -1,5 +1,5 @@
 # libpoppler-cpp.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='libpoppler-cpp.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/kou/work/ruby/rcairo.win32/vendor/local/lib -L/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib /home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib/libpoppler.la /home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib/libjpeg.la /home/kou/work/ruby/rcairo.win32/vendor/local/lib/libfreetype.la /home/kou/work/ruby/rcairo.win32/vendor/local/lib/libpng16.la -lz -lpthread -lgdi32 /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libiconv.la'
+dependency_libs=' -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/vagrant/rcairo.win32/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib /home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib/libpoppler.la /home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib/libjpeg.la /home/vagrant/rcairo.win32/vendor/local/lib/libfreetype.la /home/vagrant/rcairo.win32/vendor/local/lib/libpng16.la -lz -lpthread -lgdi32 -lwinspool -lcomdlg32 /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libiconv.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib'
+libdir='/home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib'

data/vendor/local/lib/libpoppler-glib.la

@@ -1,5 +1,5 @@
 # libpoppler-glib.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='libpoppler-glib.a'
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -R/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/kou/work/ruby/rcairo.win32/vendor/local/lib -L/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib /home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib/libpoppler.la /home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib/libjpeg.la /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libgio-2.0.la -L/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/../lib /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libgobject-2.0.la /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/../lib/libffi.la /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libglib-2.0.la -lole32 -lwinmm -lshlwapi /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libintl.la /home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/libiconv.la -lpthread /home/kou/work/ruby/rcairo.win32/vendor/local/lib/libcairo.la /home/kou/work/ruby/rcairo.win32/vendor/local/lib/libpixman-1.la /home/kou/work/ruby/rcairo.win32/vendor/local/lib/libfontconfig.la /home/kou/work/ruby/rcairo.win32/vendor/local/lib/libxml2.la -lws2_32 -lgdi32 -lmsimg32 /home/kou/work/ruby/rcairo.win32/vendor/local/lib/libfreetype.la /home/kou/work/ruby/rcairo.win32/vendor/local/lib/libpng16.la -lz'
+dependency_libs=' -R/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/vagrant/rcairo.win32/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib /home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib/libpoppler.la /home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib/libjpeg.la -lwinspool -lcomdlg32 /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libgio-2.0.la -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/../lib /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/../lib/libffi.la /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libglib-2.0.la -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/libiconv.la /home/vagrant/rcairo.win32/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo.win32/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo.win32/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo.win32/vendor/local/lib/libxml2.la -lws2_32 -lgdi32 -lmsimg32 /home/vagrant/rcairo.win32/vendor/local/lib/libfreetype.la /home/vagrant/rcairo.win32/vendor/local/lib/libpng16.la -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib'
+libdir='/home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib'

data/vendor/local/lib/libpoppler.la

@@ -1,11 +1,11 @@
 # libpoppler.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
 
 # The name that we can dlopen(3).
-dlname='../bin/libpoppler-46.dll'
+dlname='../bin/libpoppler-48.dll'
 
 # Names of this library.
 library_names='libpoppler.dll.a'
@@ -17,13 +17,13 @@ old_library='libpoppler.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/kou/work/ruby/rcairo.win32/vendor/local/lib -L/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib /home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib/libjpeg.la /home/kou/work/ruby/rcairo.win32/vendor/local/lib/libfreetype.la /home/kou/work/ruby/rcairo.win32/vendor/local/lib/libpng16.la -lz -lpthread -lgdi32'
+dependency_libs=' -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/vagrant/rcairo.win32/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib /home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib/libjpeg.la /home/vagrant/rcairo.win32/vendor/local/lib/libfreetype.la /home/vagrant/rcairo.win32/vendor/local/lib/libpng16.la -lz -lpthread -lgdi32 -lwinspool -lcomdlg32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
 
 # Version information for libpoppler.
-current=46
+current=48
 age=0
 revision=0
 
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib'
+libdir='/home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib'

data/vendor/local/lib/libsqlite3.la

@@ -17,7 +17,7 @@ old_library='libsqlite3.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/kou/work/ruby/rcairo.win32/vendor/local/lib -L/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib -lpthread'
+dependency_libs=' -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/vagrant/rcairo.win32/vendor/local/lib -L/home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib -lpthread'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local/lib'
+libdir='/home/vagrant/ruby-gnome2.win32/poppler/vendor/local/lib'

data/vendor/local/lib/pkgconfig/poppler-cairo.pc

@@ -1,9 +1,9 @@
-prefix=/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local
+prefix=/home/vagrant/ruby-gnome2.win32/poppler/vendor/local
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: poppler-cairo
 Description: Cairo backend for Poppler PDF rendering library
-Version: 0.26.5
-Requires: poppler = 0.26.5 cairo >= 1.10.0
+Version: 0.29.0
+Requires: poppler = 0.29.0 cairo >= 1.10.0

data/vendor/local/lib/pkgconfig/poppler-cpp.pc

@@ -1,13 +1,13 @@
-prefix=/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local
+prefix=/home/vagrant/ruby-gnome2.win32/poppler/vendor/local
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: poppler-cpp
 Description: cpp backend for Poppler PDF rendering library
-Version: 0.26.5
+Version: 0.29.0
 Requires: 
-Requires.private: poppler = 0.26.5
+Requires.private: poppler = 0.29.0
 
 Libs: -L${libdir} -lpoppler-cpp
 Cflags: -I${includedir}/poppler/cpp

data/vendor/local/lib/pkgconfig/poppler-glib.pc

@@ -1,13 +1,13 @@
-prefix=/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local
+prefix=/home/vagrant/ruby-gnome2.win32/poppler/vendor/local
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: poppler-glib
 Description: GLib wrapper for poppler
-Version: 0.26.5
+Version: 0.29.0
 Requires: glib-2.0 >= 2.18 gobject-2.0 >= 2.18 gio-2.0 >= 2.18 cairo >= 1.10.0
-Requires.private: poppler = 0.26.5
+Requires.private: poppler = 0.29.0
 
 Libs: -L${libdir} -lpoppler-glib
 Cflags: -I${includedir}/poppler/glib

data/vendor/local/lib/pkgconfig/poppler-splash.pc

@@ -1,9 +1,9 @@
-prefix=/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local
+prefix=/home/vagrant/ruby-gnome2.win32/poppler/vendor/local
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: poppler-splash
 Description: Splash backend for Poppler PDF rendering library
-Version: 0.26.5
-Requires: poppler = 0.26.5
+Version: 0.29.0
+Requires: poppler = 0.29.0

data/vendor/local/lib/pkgconfig/poppler.pc

@@ -1,11 +1,11 @@
-prefix=/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local
+prefix=/home/vagrant/ruby-gnome2.win32/poppler/vendor/local
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: poppler
 Description: PDF rendering library
-Version: 0.26.5
+Version: 0.29.0
 
 Libs: -L${libdir} -lpoppler
 Cflags: -I${includedir}/poppler

data/vendor/local/lib/pkgconfig/sqlite3.pc

@@ -1,6 +1,6 @@
 # Package Information for pkg-config
 
-prefix=/home/kou/work/ruby/ruby-gnome2.win32/poppler/vendor/local
+prefix=/home/vagrant/ruby-gnome2.win32/poppler/vendor/local
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include

data/vendor/local/share/gir-1.0/Poppler-0.18.gir

@@ -13,7 +13,7 @@ and/or use gtk-doc annotations.  -->
   <c:include name="poppler.h"/>
   <namespace name="Poppler"
              version="0.18"
-             shared-library="libpoppler-glib-8.dll"
+             shared-library="libpoppler-glib-8.dll,libpoppler-48.dll"
              c:identifier-prefixes="Poppler"
              c:symbol-prefixes="poppler">
     <constant name="ANNOT_TEXT_ICON_CIRCLE"
@@ -1958,20 +1958,24 @@ will fail with the same error.</doc>
                  glib:type-name="PopplerBackend"
                  glib:get-type="poppler_backend_get_type"
                  c:type="PopplerBackend">
+      <doc xml:space="preserve">Backend codes returned by poppler_get_backend().</doc>
       <member name="unknown"
               value="0"
               c:identifier="POPPLER_BACKEND_UNKNOWN"
               glib:nick="unknown">
+        <doc xml:space="preserve">Unknown backend</doc>
       </member>
       <member name="splash"
               value="1"
               c:identifier="POPPLER_BACKEND_SPLASH"
               glib:nick="splash">
+        <doc xml:space="preserve">Splash backend</doc>
       </member>
       <member name="cairo"
               value="2"
               c:identifier="POPPLER_BACKEND_CAIRO"
               glib:nick="cairo">
+        <doc xml:space="preserve">Cairo backend</doc>
       </member>
     </enumeration>
     <record name="Color"
@@ -2913,6 +2917,7 @@ include those in the #G_FILE_ERROR domain.</doc>
               value="0"
               c:identifier="POPPLER_FIND_DEFAULT"
               glib:nick="default">
+        <doc xml:space="preserve">use default search settings</doc>
       </member>
       <member name="case_sensitive"
               value="1"
@@ -4303,7 +4308,7 @@ of @action on the page</doc>
       <type name="gint" c:type="gint"/>
     </constant>
     <constant name="MICRO_VERSION"
-              value="5"
+              value="0"
               c:type="POPPLER_MICRO_VERSION"
               version="0.12">
       <doc xml:space="preserve">The micro version number of the poppler header files (e.g. in poppler version
@@ -4311,7 +4316,7 @@ of @action on the page</doc>
       <type name="gint" c:type="gint"/>
     </constant>
     <constant name="MINOR_VERSION"
-              value="26"
+              value="29"
               c:type="POPPLER_MINOR_VERSION"
               version="0.12">
       <doc xml:space="preserve">The major version number of the poppler header files (e.g. in poppler version
@@ -6112,7 +6117,7 @@ locations on a page and bounding boxes</doc>
               version="0.26">
         <doc xml:space="preserve">Obtains the actual text enclosed by the element (and its child elements).
 The actual text is mostly used for non-text elements like images and
-figures which &lt;em&gt;do&lt;/em&gt; have the graphical appearance of text, like
+figures which &lt;emphasis&gt;do&lt;/emphasis&gt; have the graphical appearance of text, like
 a logo. For those the actual text is the equivalent text to those
 graphical elements which look like text when rendered.