<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dcfcfa91dbbfeb6bd7bcf19cd45453bdd2ba0b24">https://github.com/macports/macports-ports/commit/dcfcfa91dbbfeb6bd7bcf19cd45453bdd2ba0b24</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new dcfcfa91dbb poppler-qt4-mac: fix volatile
</span>dcfcfa91dbb is described below

<span style='display:block; white-space:pre;color:#808000;'>commit dcfcfa91dbbfeb6bd7bcf19cd45453bdd2ba0b24
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Apr 13 13:00:21 2023 -0700

<span style='display:block; white-space:pre;color:#404040;'>    poppler-qt4-mac: fix volatile
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    closes: https://trac.macports.org/ticket/66556
</span>---
 graphics/poppler-qt4-mac/Portfile                  |   2 +
 .../files/poppler-qt4-boxed-type.diff              | 243 +++++++++++++++++++++
 2 files changed, 245 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler-qt4-mac/Portfile b/graphics/poppler-qt4-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b382cce8ec..198cfd768eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/poppler-qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler-qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,6 +69,8 @@ patchfiles-append    patch-CVE-2017-18267.diff
</span> # https://bugs.freedesktop.org/show_bug.cgi?id=106417
 patchfiles-append   patch-bug106417.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   poppler-qt4-boxed-type.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> notes {
 This port is based on the last version of poppler (0.61.1) that supported qt4.\
 It will be kept as up-to-date as possible with security updates, but is not\
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler-qt4-mac/files/poppler-qt4-boxed-type.diff b/graphics/poppler-qt4-mac/files/poppler-qt4-boxed-type.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..626e418a7a1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler-qt4-mac/files/poppler-qt4-boxed-type.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,243 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git glib/poppler-action.cc glib/poppler-action.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 72969a5..7d16d2a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/poppler-action.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/poppler-action.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  * @title: PopplerAction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerDest, poppler_dest, poppler_dest_copy, poppler_dest_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerDest, poppler_dest, poppler_dest_copy, poppler_dest_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  * poppler_dest_copy:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,7 +93,7 @@ poppler_action_layer_copy (PopplerActionLayer *action_layer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerAction, poppler_action, poppler_action_copy, poppler_action_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerAction, poppler_action, poppler_action_copy, poppler_action_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  * poppler_action_free:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git glib/poppler-annot.cc glib/poppler-annot.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 312aa31..696ebcc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/poppler-annot.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/poppler-annot.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1787,7 +1787,7 @@ poppler_annot_file_attachment_get_name (PopplerAnnotFileAttachment *poppler_anno
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* PopplerAnnotCalloutLine */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerAnnotCalloutLine, poppler_annot_callout_line,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerAnnotCalloutLine, poppler_annot_callout_line,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_annot_callout_line_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_annot_callout_line_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git glib/poppler-document.cc glib/poppler-document.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 41b6a04..29cd577 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/poppler-document.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/poppler-document.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1740,7 +1740,7 @@ struct _PopplerIndexIter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerIndexIter, poppler_index_iter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerIndexIter, poppler_index_iter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_index_iter_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_index_iter_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1977,7 +1977,7 @@ struct _PopplerFontsIter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   int index;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerFontsIter, poppler_fonts_iter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerFontsIter, poppler_fonts_iter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_fonts_iter_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_fonts_iter_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2552,7 +2552,7 @@ struct _PopplerLayersIter {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   int index;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerLayersIter, poppler_layers_iter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerLayersIter, poppler_layers_iter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_layers_iter_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_layers_iter_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git glib/poppler-enums.c.template glib/poppler-enums.c.template
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 26a51b4..eefc769 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/poppler-enums.c.template
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/poppler-enums.c.template
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,9 +15,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @enum_name@_get_type (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  static volatile gsize g_define_type_id__volatile = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  static volatile gsize g_define_type_id = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  if (g_once_init_enter (&g_define_type_id__volatile)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  if (g_once_init_enter (&g_define_type_id)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     static const G@Type@Value values[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*** END value-header ***/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,13 +28,13 @@ GType
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*** BEGIN value-tail ***/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       { 0, NULL, NULL }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    GType g_define_type_id = 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    GType type =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    g_once_init_leave (&g_define_type_id, type);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  return g_define_type_id__volatile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  return g_define_type_id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*** END value-tail ***/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git glib/poppler-page.cc glib/poppler-page.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a44edac..a81fffa 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/poppler-page.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/poppler-page.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1519,7 +1519,7 @@ poppler_page_remove_annot (PopplerPage  *page,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* PopplerRectangle type */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerRectangle, poppler_rectangle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerRectangle, poppler_rectangle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_rectangle_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_rectangle_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1566,7 +1566,7 @@ poppler_rectangle_free (PopplerRectangle *rectangle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* PopplerPoint type */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerPoint, poppler_point,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerPoint, poppler_point,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            poppler_point_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            poppler_point_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1620,7 +1620,7 @@ poppler_point_free (PopplerPoint *point)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* PopplerQuadrilateral type */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerQuadrilateral, poppler_quadrilateral,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerQuadrilateral, poppler_quadrilateral,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            poppler_quadrilateral_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            poppler_quadrilateral_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1673,7 +1673,7 @@ poppler_quadrilateral_free (PopplerQuadrilateral *quad)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* PopplerTextAttributes type */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerTextAttributes, poppler_text_attributes,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerTextAttributes, poppler_text_attributes,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_text_attributes_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_text_attributes_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1779,7 +1779,7 @@ poppler_text_attributes_free (PopplerTextAttributes *text_attrs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* PopplerColor type */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerColor, poppler_color, poppler_color_copy, poppler_color_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerColor, poppler_color, poppler_color_copy, poppler_color_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  * poppler_color_new:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1826,7 +1826,7 @@ poppler_color_free (PopplerColor *color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* PopplerLinkMapping type */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerLinkMapping, poppler_link_mapping,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerLinkMapping, poppler_link_mapping,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_link_mapping_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_link_mapping_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1883,7 +1883,7 @@ poppler_link_mapping_free (PopplerLinkMapping *mapping)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Poppler Image mapping type */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerImageMapping, poppler_image_mapping,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerImageMapping, poppler_image_mapping,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_image_mapping_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_image_mapping_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1927,7 +1927,7 @@ poppler_image_mapping_free (PopplerImageMapping *mapping)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Page Transition */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerPageTransition, poppler_page_transition,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerPageTransition, poppler_page_transition,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_page_transition_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_page_transition_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1976,7 +1976,7 @@ poppler_page_transition_free (PopplerPageTransition *transition)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Form Field Mapping Type */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerFormFieldMapping, poppler_form_field_mapping,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerFormFieldMapping, poppler_form_field_mapping,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_form_field_mapping_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_form_field_mapping_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2033,7 +2033,7 @@ poppler_form_field_mapping_free (PopplerFormFieldMapping *mapping)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* PopplerAnnot Mapping Type */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerAnnotMapping, poppler_annot_mapping,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerAnnotMapping, poppler_annot_mapping,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_annot_mapping_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      poppler_annot_mapping_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git glib/poppler-private.h glib/poppler-private.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9abdd7c..6305b7c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/poppler-private.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/poppler-private.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,23 +139,4 @@ char *_poppler_goo_string_to_utf8(GooString *s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean _poppler_convert_pdf_date_to_gtime (GooString *date,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                        time_t    *gdate);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * A convenience macro for boxed type implementations, which defines a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * type_name_get_type() function registering the boxed type.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define POPPLER_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func)          \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GType                                                                                 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-type_name##_get_type (void)                                                           \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{                                                                                     \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        static volatile gsize g_define_type_id__volatile = 0;                         \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  if (g_once_init_enter (&g_define_type_id__volatile)) {                        \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          GType g_define_type_id =                                              \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-              g_boxed_type_register_static (g_intern_static_string (#TypeName), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                            (GBoxedCopyFunc) copy_func,         \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                            (GBoxedFreeFunc) free_func);        \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);    \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  }                                                                             \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  return g_define_type_id__volatile;                                            \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git glib/poppler-structure-element.cc glib/poppler-structure-element.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e26f4c4..d624345 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/poppler-structure-element.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/poppler-structure-element.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -701,7 +701,7 @@ struct _PopplerStructureElementIter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   unsigned index;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerStructureElementIter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerStructureElementIter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            poppler_structure_element_iter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            poppler_structure_element_iter_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            poppler_structure_element_iter_free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -902,7 +902,7 @@ struct _PopplerTextSpan {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   PopplerColor color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_DEFINE_BOXED_TYPE (PopplerTextSpan,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_DEFINE_BOXED_TYPE (PopplerTextSpan,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            poppler_text_span,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            poppler_text_span_copy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            poppler_text_span_free)
</span></pre><pre style='margin:0'>

</pre>