Matthias Kilian <k...@outback.escape.de> writes:

> Hi,
>
> this works fine for me (on amd64) since a couple of days.
>
> But it also needs a patch for print/scribus (to be sent in a minute).

OK gnezdo

>
> Ciao,
>       Kili
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.166
> diff -u -p -r1.166 Makefile
> --- Makefile  7 May 2021 07:25:15 -0000       1.166
> +++ Makefile  17 May 2021 18:44:32 -0000
> @@ -5,7 +5,7 @@ COMMENT-qt5=  Qt5 interface to PDF render
>  COMMENT-qt6= Qt6 interface to PDF rendering library
>  COMMENT-utils=       PDF conversion tools and utilities
>  
> -V=           21.03.0
> +V=           21.05.0
>  DISTNAME=    poppler-$V
>  CATEGORIES=  print
>  PKGNAME-main=        poppler-$V
> @@ -18,11 +18,11 @@ REVISION-utils=   0
>  
>  EXTRACT_SUFX=        .tar.xz
>  
> -SHARED_LIBS +=       poppler              69.0     # 108.0
> -SHARED_LIBS +=       poppler-glib         19.8     # 8.19
> -SHARED_LIBS +=       poppler-qt5          8.7      # 1.27
> -SHARED_LIBS +=       poppler-qt6          0.0      # 1.1
> -SHARED_LIBS +=       poppler-cpp          16.2     # 0.9
> +SHARED_LIBS +=       poppler              70.0     # 110.0
> +SHARED_LIBS +=       poppler-glib         19.9     # 8.21
> +SHARED_LIBS +=       poppler-qt5          8.8      # 1.28
> +SHARED_LIBS +=       poppler-qt6          0.1      # 1.2
> +SHARED_LIBS +=       poppler-cpp          17.0     # 0.9
>  
>  HOMEPAGE=    https://poppler.freedesktop.org/
>  
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/print/poppler/distinfo,v
> retrieving revision 1.89
> diff -u -p -r1.89 distinfo
> --- distinfo  9 Mar 2021 20:33:48 -0000       1.89
> +++ distinfo  17 May 2021 18:44:32 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (poppler-21.03.0.tar.xz) = 
> /VHq1KrB0vRoT6bnsOwG8CM+0hZn5yCk6BfkRV3WPSc=
> -SIZE (poppler-21.03.0.tar.xz) = 1690848
> +SHA256 (poppler-21.05.0.tar.xz) = 
> 2v1Te2gPrRIVvED8U9HzjoRJ18GFvGDVqJ4dJskNvYw=
> +SIZE (poppler-21.05.0.tar.xz) = 1700632
> Index: patches/patch-cpp_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-cpp_CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-cpp_CMakeLists_txt
> --- patches/patch-cpp_CMakeLists_txt  27 Jul 2020 17:31:55 -0000      1.1
> +++ patches/patch-cpp_CMakeLists_txt  17 May 2021 18:44:32 -0000
> @@ -5,10 +5,10 @@ $OpenBSD: patch-cpp_CMakeLists_txt,v 1.1
>  Index: cpp/CMakeLists.txt
>  --- cpp/CMakeLists.txt.orig
>  +++ cpp/CMakeLists.txt
> -@@ -25,7 +25,6 @@ set(poppler_cpp_SRCS
> - )
> +@@ -26,7 +26,6 @@ set(poppler_cpp_SRCS
>   
>   add_library(poppler-cpp ${poppler_cpp_SRCS})
> + generate_export_header(poppler-cpp BASE_NAME poppler-cpp EXPORT_FILE_NAME 
> "${CMAKE_CURRENT_BINARY_DIR}/poppler_cpp_export.h")
>  -set_target_properties(poppler-cpp PROPERTIES VERSION 0.9.0 SOVERSION 0)
>   if(MINGW AND BUILD_SHARED_LIBS)
>       get_target_property(POPPLER_CPP_SOVERSION poppler-cpp SOVERSION)
> Index: patches/patch-glib_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
> retrieving revision 1.9
> diff -u -p -r1.9 patch-glib_CMakeLists_txt
> --- patches/patch-glib_CMakeLists_txt 7 Dec 2020 21:31:24 -0000       1.9
> +++ patches/patch-glib_CMakeLists_txt 17 May 2021 18:44:32 -0000
> @@ -6,14 +6,14 @@ Index: glib/CMakeLists.txt
>  --- glib/CMakeLists.txt.orig
>  +++ glib/CMakeLists.txt
>  @@ -87,7 +87,6 @@ set(poppler_glib_generated_SRCS
> -   ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
>   )
>   add_library(poppler-glib ${poppler_glib_SRCS} 
> ${poppler_glib_generated_SRCS})
> --set_target_properties(poppler-glib PROPERTIES VERSION 8.19.0 SOVERSION 8)
> - set_target_properties(poppler-glib PROPERTIES C_VISIBILITY_PRESET hidden)
> - set_target_properties(poppler-glib PROPERTIES CXX_VISIBILITY_PRESET hidden)
> - set_target_properties(poppler-glib PROPERTIES VISIBILITY_INLINES_HIDDEN 1)
> -@@ -136,6 +135,9 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
> + generate_export_header(poppler-glib EXPORT_MACRO_NAME POPPLER_PUBLIC 
> EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-macros.h")
> +-set_target_properties(poppler-glib PROPERTIES VERSION 8.21.0 SOVERSION 8)
> + if(MINGW AND BUILD_SHARED_LIBS)
> +     get_target_property(POPPLER_GLIB_SOVERSION poppler-glib SOVERSION)
> +     set_target_properties(poppler-glib PROPERTIES SUFFIX 
> "-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
> +@@ -130,6 +129,9 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
>     _gir_list_prefix(_includes _tmp_includes "-I")
>     # And set flags for gir compiler and scanner
>     set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR} 
> -L${CMAKE_CURRENT_BINARY_DIR})
> Index: patches/patch-glib_poppler-action_cc
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-glib_poppler-action_cc,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-glib_poppler-action_cc
> --- patches/patch-glib_poppler-action_cc      9 May 2021 08:55:41 -0000       
> 1.3
> +++ patches/patch-glib_poppler-action_cc      17 May 2021 18:44:32 -0000
> @@ -1,28 +0,0 @@
> -$OpenBSD: patch-glib_poppler-action_cc,v 1.3 2021/05/09 08:55:41 ajacoutot 
> Exp $
> -
> -From 47de887d7658cfd68df44b3acf710971054f957b Mon Sep 17 00:00:00 2001
> -From: Christian Persch <c...@src.gnome.org>
> -Date: Fri, 26 Mar 2021 18:17:25 +0100
> -Subject: [PATCH] glib: Use stock glib macro to define boxed type
> -
> -Index: glib/poppler-action.cc
> ---- glib/poppler-action.cc.orig
> -+++ glib/poppler-action.cc
> -@@ -25,7 +25,7 @@
> -  * @title: PopplerAction
> -  */
> - 
> --POPPLER_DEFINE_BOXED_TYPE(PopplerDest, poppler_dest, poppler_dest_copy, 
> poppler_dest_free)
> -+G_DEFINE_BOXED_TYPE(PopplerDest, poppler_dest, poppler_dest_copy, 
> poppler_dest_free)
> - 
> - /**
> -  * poppler_dest_copy:
> -@@ -88,7 +88,7 @@ static PopplerActionLayer *poppler_action_layer_copy(P
> -     return retval;
> - }
> - 
> --POPPLER_DEFINE_BOXED_TYPE(PopplerAction, poppler_action, 
> poppler_action_copy, poppler_action_free)
> -+G_DEFINE_BOXED_TYPE(PopplerAction, poppler_action, poppler_action_copy, 
> poppler_action_free)
> - 
> - /**
> -  * poppler_action_free:
> Index: patches/patch-glib_poppler-annot_cc
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-glib_poppler-annot_cc,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-glib_poppler-annot_cc
> --- patches/patch-glib_poppler-annot_cc       9 May 2021 08:55:41 -0000       
> 1.1
> +++ patches/patch-glib_poppler-annot_cc       17 May 2021 18:44:32 -0000
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-glib_poppler-annot_cc,v 1.1 2021/05/09 08:55:41 ajacoutot 
> Exp $
> -
> -From 47de887d7658cfd68df44b3acf710971054f957b Mon Sep 17 00:00:00 2001
> -From: Christian Persch <c...@src.gnome.org>
> -Date: Fri, 26 Mar 2021 18:17:25 +0100
> -Subject: [PATCH] glib: Use stock glib macro to define boxed type
> -
> -Index: glib/poppler-annot.cc
> ---- glib/poppler-annot.cc.orig
> -+++ glib/poppler-annot.cc
> -@@ -1693,7 +1693,7 @@ gchar *poppler_annot_file_attachment_get_name(PopplerA
> - }
> - 
> - /* PopplerAnnotCalloutLine */
> --POPPLER_DEFINE_BOXED_TYPE(PopplerAnnotCalloutLine, 
> poppler_annot_callout_line, poppler_annot_callout_line_copy, 
> poppler_annot_callout_line_free)
> -+G_DEFINE_BOXED_TYPE(PopplerAnnotCalloutLine, poppler_annot_callout_line, 
> poppler_annot_callout_line_copy, poppler_annot_callout_line_free)
> - 
> - /**
> -  * poppler_annot_callout_line_new:
> Index: patches/patch-glib_poppler-document_cc
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-glib_poppler-document_cc,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-glib_poppler-document_cc
> --- patches/patch-glib_poppler-document_cc    9 May 2021 08:55:41 -0000       
> 1.1
> +++ patches/patch-glib_poppler-document_cc    17 May 2021 18:44:32 -0000
> @@ -1,37 +0,0 @@
> -$OpenBSD: patch-glib_poppler-document_cc,v 1.1 2021/05/09 08:55:41 ajacoutot 
> Exp $
> -
> -From 47de887d7658cfd68df44b3acf710971054f957b Mon Sep 17 00:00:00 2001
> -From: Christian Persch <c...@src.gnome.org>
> -Date: Fri, 26 Mar 2021 18:17:25 +0100
> -Subject: [PATCH] glib: Use stock glib macro to define boxed type
> -
> -Index: glib/poppler-document.cc
> ---- glib/poppler-document.cc.orig
> -+++ glib/poppler-document.cc
> -@@ -2360,7 +2360,7 @@ struct _PopplerIndexIter
> -     int index;
> - };
> - 
> --POPPLER_DEFINE_BOXED_TYPE(PopplerIndexIter, poppler_index_iter, 
> poppler_index_iter_copy, poppler_index_iter_free)
> -+G_DEFINE_BOXED_TYPE(PopplerIndexIter, poppler_index_iter, 
> poppler_index_iter_copy, poppler_index_iter_free)
> - 
> - /**
> -  * poppler_index_iter_copy:
> -@@ -2579,7 +2579,7 @@ struct _PopplerFontsIter
> -     int index;
> - };
> - 
> --POPPLER_DEFINE_BOXED_TYPE(PopplerFontsIter, poppler_fonts_iter, 
> poppler_fonts_iter_copy, poppler_fonts_iter_free)
> -+G_DEFINE_BOXED_TYPE(PopplerFontsIter, poppler_fonts_iter, 
> poppler_fonts_iter_copy, poppler_fonts_iter_free)
> - 
> - /**
> -  * poppler_fonts_iter_get_full_name:
> -@@ -3111,7 +3111,7 @@ struct _PopplerLayersIter
> -     int index;
> - };
> - 
> --POPPLER_DEFINE_BOXED_TYPE(PopplerLayersIter, poppler_layers_iter, 
> poppler_layers_iter_copy, poppler_layers_iter_free)
> -+G_DEFINE_BOXED_TYPE(PopplerLayersIter, poppler_layers_iter, 
> poppler_layers_iter_copy, poppler_layers_iter_free)
> - 
> - /**
> -  * poppler_layers_iter_copy:
> Index: patches/patch-glib_poppler-page_cc
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-glib_poppler-page_cc,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-glib_poppler-page_cc
> --- patches/patch-glib_poppler-page_cc        9 May 2021 08:55:41 -0000       
> 1.2
> +++ patches/patch-glib_poppler-page_cc        17 May 2021 18:44:32 -0000
> @@ -1,100 +0,0 @@
> -$OpenBSD: patch-glib_poppler-page_cc,v 1.2 2021/05/09 08:55:41 ajacoutot Exp 
> $
> -
> -From 47de887d7658cfd68df44b3acf710971054f957b Mon Sep 17 00:00:00 2001
> -From: Christian Persch <c...@src.gnome.org>
> -Date: Fri, 26 Mar 2021 18:17:25 +0100
> -Subject: [PATCH] glib: Use stock glib macro to define boxed type
> -
> -Index: glib/poppler-page.cc
> ---- glib/poppler-page.cc.orig
> -+++ glib/poppler-page.cc
> -@@ -1566,7 +1566,7 @@ void poppler_page_remove_annot(PopplerPage *page, Popp
> - 
> - /* PopplerRectangle type */
> - 
> --POPPLER_DEFINE_BOXED_TYPE(PopplerRectangle, poppler_rectangle, 
> poppler_rectangle_copy, poppler_rectangle_free)
> -+G_DEFINE_BOXED_TYPE(PopplerRectangle, poppler_rectangle, 
> poppler_rectangle_copy, poppler_rectangle_free)
> - 
> - /**
> -  * poppler_rectangle_new:
> -@@ -1608,7 +1608,7 @@ void poppler_rectangle_free(PopplerRectangle *rectangl
> - 
> - /* PopplerPoint type */
> - 
> --POPPLER_DEFINE_BOXED_TYPE(PopplerPoint, poppler_point, poppler_point_copy, 
> poppler_point_free)
> -+G_DEFINE_BOXED_TYPE(PopplerPoint, poppler_point, poppler_point_copy, 
> poppler_point_free)
> - 
> - /**
> -  * poppler_point_new:
> -@@ -1657,7 +1657,7 @@ void poppler_point_free(PopplerPoint *point)
> - 
> - /* PopplerQuadrilateral type */
> - 
> --POPPLER_DEFINE_BOXED_TYPE(PopplerQuadrilateral, poppler_quadrilateral, 
> poppler_quadrilateral_copy, poppler_quadrilateral_free)
> -+G_DEFINE_BOXED_TYPE(PopplerQuadrilateral, poppler_quadrilateral, 
> poppler_quadrilateral_copy, poppler_quadrilateral_free)
> - 
> - /**
> -  * poppler_quadrilateral_new:
> -@@ -1705,7 +1705,7 @@ void poppler_quadrilateral_free(PopplerQuadrilateral *
> - 
> - /* PopplerTextAttributes type */
> - 
> --POPPLER_DEFINE_BOXED_TYPE(PopplerTextAttributes, poppler_text_attributes, 
> poppler_text_attributes_copy, poppler_text_attributes_free)
> -+G_DEFINE_BOXED_TYPE(PopplerTextAttributes, poppler_text_attributes, 
> poppler_text_attributes_copy, poppler_text_attributes_free)
> - 
> - /**
> -  * poppler_text_attributes_new:
> -@@ -1804,7 +1804,7 @@ void poppler_text_attributes_free(PopplerTextAttribute
> -  */
> - 
> - /* PopplerColor type */
> --POPPLER_DEFINE_BOXED_TYPE(PopplerColor, poppler_color, poppler_color_copy, 
> poppler_color_free)
> -+G_DEFINE_BOXED_TYPE(PopplerColor, poppler_color, poppler_color_copy, 
> poppler_color_free)
> - 
> - /**
> -  * poppler_color_new:
> -@@ -1848,7 +1848,7 @@ void poppler_color_free(PopplerColor *color)
> - }
> - 
> - /* PopplerLinkMapping type */
> --POPPLER_DEFINE_BOXED_TYPE(PopplerLinkMapping, poppler_link_mapping, 
> poppler_link_mapping_copy, poppler_link_mapping_free)
> -+G_DEFINE_BOXED_TYPE(PopplerLinkMapping, poppler_link_mapping, 
> poppler_link_mapping_copy, poppler_link_mapping_free)
> - 
> - /**
> -  * poppler_link_mapping_new:
> -@@ -1900,7 +1900,7 @@ void poppler_link_mapping_free(PopplerLinkMapping *map
> - }
> - 
> - /* Poppler Image mapping type */
> --POPPLER_DEFINE_BOXED_TYPE(PopplerImageMapping, poppler_image_mapping, 
> poppler_image_mapping_copy, poppler_image_mapping_free)
> -+G_DEFINE_BOXED_TYPE(PopplerImageMapping, poppler_image_mapping, 
> poppler_image_mapping_copy, poppler_image_mapping_free)
> - 
> - /**
> -  * poppler_image_mapping_new:
> -@@ -1939,7 +1939,7 @@ void poppler_image_mapping_free(PopplerImageMapping *m
> - }
> - 
> - /* Page Transition */
> --POPPLER_DEFINE_BOXED_TYPE(PopplerPageTransition, poppler_page_transition, 
> poppler_page_transition_copy, poppler_page_transition_free)
> -+G_DEFINE_BOXED_TYPE(PopplerPageTransition, poppler_page_transition, 
> poppler_page_transition_copy, poppler_page_transition_free)
> - 
> - /**
> -  * poppler_page_transition_new:
> -@@ -1983,7 +1983,7 @@ void poppler_page_transition_free(PopplerPageTransitio
> - }
> - 
> - /* Form Field Mapping Type */
> --POPPLER_DEFINE_BOXED_TYPE(PopplerFormFieldMapping, 
> poppler_form_field_mapping, poppler_form_field_mapping_copy, 
> poppler_form_field_mapping_free)
> -+G_DEFINE_BOXED_TYPE(PopplerFormFieldMapping, poppler_form_field_mapping, 
> poppler_form_field_mapping_copy, poppler_form_field_mapping_free)
> - 
> - /**
> -  * poppler_form_field_mapping_new:
> -@@ -2035,7 +2035,7 @@ void poppler_form_field_mapping_free(PopplerFormFieldM
> - }
> - 
> - /* PopplerAnnot Mapping Type */
> --POPPLER_DEFINE_BOXED_TYPE(PopplerAnnotMapping, poppler_annot_mapping, 
> poppler_annot_mapping_copy, poppler_annot_mapping_free)
> -+G_DEFINE_BOXED_TYPE(PopplerAnnotMapping, poppler_annot_mapping, 
> poppler_annot_mapping_copy, poppler_annot_mapping_free)
> - 
> - /**
> -  * poppler_annot_mapping_new:
> Index: patches/patch-glib_poppler-private_h
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-glib_poppler-private_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-glib_poppler-private_h
> --- patches/patch-glib_poppler-private_h      9 May 2021 08:55:41 -0000       
> 1.1
> +++ patches/patch-glib_poppler-private_h      17 May 2021 18:44:32 -0000
> @@ -1,32 +0,0 @@
> -$OpenBSD: patch-glib_poppler-private_h,v 1.1 2021/05/09 08:55:41 ajacoutot 
> Exp $
> -
> -From 47de887d7658cfd68df44b3acf710971054f957b Mon Sep 17 00:00:00 2001
> -From: Christian Persch <c...@src.gnome.org>
> -Date: Fri, 26 Mar 2021 18:17:25 +0100
> -Subject: [PATCH] glib: Use stock glib macro to define boxed type
> -
> -Index: glib/poppler-private.h
> ---- glib/poppler-private.h.orig
> -+++ glib/poppler-private.h
> -@@ -143,21 +143,6 @@ gboolean _poppler_convert_pdf_date_to_gtime(const GooS
> - GDateTime *_poppler_convert_pdf_date_to_date_time(const GooString *date);
> - GooString *_poppler_convert_date_time_to_pdf_date(GDateTime *datetime);
> - 
> --/*
> -- * A convenience macro for boxed type implementations, which defines a
> -- * type_name_get_type() function registering the boxed type.
> -- */
> --#define POPPLER_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, 
> free_func)                                                                    
>                                                                               
>                  \
> --    GType type_name##_get_type(void)                                        
>                                                                               
>                                                                               
>        \
> --    {                                                                       
>                                                                               
>                                                                               
>        \
> --        static volatile gsize g_define_type_id__volatile = 0;               
>                                                                               
>                                                                               
>        \
> --        if (g_once_init_enter(&g_define_type_id__volatile)) {               
>                                                                               
>                                                                               
>        \
> --            GType g_define_type_id = 
> g_boxed_type_register_static(g_intern_static_string(#TypeName), 
> (GBoxedCopyFunc)copy_func, (GBoxedFreeFunc)free_func);                        
>                                                             \
> --            g_once_init_leave(&g_define_type_id__volatile, 
> g_define_type_id);                                                            
>                                                                               
>                         \
> --        }                                                                   
>                                                                               
>                                                                               
>        \
> --        return g_define_type_id__volatile;                                  
>                                                                               
>                                                                               
>        \
> --    }
> --
> - void _poppler_error_cb(ErrorCategory category, Goffset pos, const char 
> *message);
> - 
> - #endif
> Index: patches/patch-glib_poppler-structure-element_cc
> ===================================================================
> RCS file: 
> /cvs/ports/print/poppler/patches/patch-glib_poppler-structure-element_cc,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-glib_poppler-structure-element_cc
> --- patches/patch-glib_poppler-structure-element_cc   9 May 2021 08:55:41 
> -0000       1.1
> +++ patches/patch-glib_poppler-structure-element_cc   17 May 2021 18:44:32 
> -0000
> @@ -1,28 +0,0 @@
> -$OpenBSD: patch-glib_poppler-structure-element_cc,v 1.1 2021/05/09 08:55:41 
> ajacoutot Exp $
> -
> -From 47de887d7658cfd68df44b3acf710971054f957b Mon Sep 17 00:00:00 2001
> -From: Christian Persch <c...@src.gnome.org>
> -Date: Fri, 26 Mar 2021 18:17:25 +0100
> -Subject: [PATCH] glib: Use stock glib macro to define boxed type
> -
> -Index: glib/poppler-structure-element.cc
> ---- glib/poppler-structure-element.cc.orig
> -+++ glib/poppler-structure-element.cc
> -@@ -581,7 +581,7 @@ struct _PopplerStructureElementIter
> -     unsigned index;
> - };
> - 
> --POPPLER_DEFINE_BOXED_TYPE(PopplerStructureElementIter, 
> poppler_structure_element_iter, poppler_structure_element_iter_copy, 
> poppler_structure_element_iter_free)
> -+G_DEFINE_BOXED_TYPE(PopplerStructureElementIter, 
> poppler_structure_element_iter, poppler_structure_element_iter_copy, 
> poppler_structure_element_iter_free)
> - 
> - /**
> -  * poppler_structure_element_iter_copy:
> -@@ -763,7 +763,7 @@ struct _PopplerTextSpan
> -     PopplerColor color;
> - };
> - 
> --POPPLER_DEFINE_BOXED_TYPE(PopplerTextSpan, poppler_text_span, 
> poppler_text_span_copy, poppler_text_span_free)
> -+G_DEFINE_BOXED_TYPE(PopplerTextSpan, poppler_text_span, 
> poppler_text_span_copy, poppler_text_span_free)
> - 
> - enum
> - {
> Index: patches/patch-qt5_src_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_CMakeLists_txt,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-qt5_src_CMakeLists_txt
> --- patches/patch-qt5_src_CMakeLists_txt      9 Mar 2021 20:33:48 -0000       
> 1.4
> +++ patches/patch-qt5_src_CMakeLists_txt      17 May 2021 18:44:32 -0000
> @@ -5,11 +5,11 @@ $OpenBSD: patch-qt5_src_CMakeLists_txt,v
>  Index: qt5/src/CMakeLists.txt
>  --- qt5/src/CMakeLists.txt.orig
>  +++ qt5/src/CMakeLists.txt
> -@@ -37,7 +37,6 @@ set(poppler_qt5_SRCS
> -   poppler-version.cpp
> +@@ -38,7 +38,6 @@ set(poppler_qt5_SRCS
>   )
>   add_library(poppler-qt5 ${poppler_qt5_SRCS})
> --set_target_properties(poppler-qt5 PROPERTIES VERSION 1.27.0 SOVERSION 1)
> + generate_export_header(poppler-qt5 BASE_NAME poppler-qt5 EXPORT_FILE_NAME 
> "${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h")
> +-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.28.0 SOVERSION 1)
>   if(MINGW AND BUILD_SHARED_LIBS)
>       get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
>       set_target_properties(poppler-qt5 PROPERTIES SUFFIX 
> "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
> Index: patches/patch-qt6_src_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-qt6_src_CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-qt6_src_CMakeLists_txt
> --- patches/patch-qt6_src_CMakeLists_txt      7 May 2021 07:25:15 -0000       
> 1.1
> +++ patches/patch-qt6_src_CMakeLists_txt      17 May 2021 18:44:32 -0000
> @@ -5,11 +5,11 @@ $OpenBSD: patch-qt6_src_CMakeLists_txt,v
>  Index: qt6/src/CMakeLists.txt
>  --- qt6/src/CMakeLists.txt.orig
>  +++ qt6/src/CMakeLists.txt
> -@@ -37,7 +37,6 @@ set(poppler_qt6_SRCS
> -   poppler-version.cpp
> +@@ -38,7 +38,6 @@ set(poppler_qt6_SRCS
>   )
>   add_library(poppler-qt6 ${poppler_qt6_SRCS})
> --set_target_properties(poppler-qt6 PROPERTIES VERSION 1.1.0 SOVERSION 1)
> + generate_export_header(poppler-qt6 BASE_NAME poppler-qt6 EXPORT_FILE_NAME 
> "${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h")
> +-set_target_properties(poppler-qt6 PROPERTIES VERSION 1.2.0 SOVERSION 1)
>   if(MINGW AND BUILD_SHARED_LIBS)
>       get_target_property(POPPLER_QT6_SOVERSION poppler-qt6 SOVERSION)
>       set_target_properties(poppler-qt6 PROPERTIES SUFFIX 
> "-${POPPLER_QT6_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
> retrieving revision 1.39
> diff -u -p -r1.39 PLIST-main
> --- pkg/PLIST-main    7 Dec 2020 21:31:24 -0000       1.39
> +++ pkg/PLIST-main    17 May 2021 18:44:32 -0000
> @@ -93,6 +93,7 @@ include/poppler/cpp/poppler-page.h
>  include/poppler/cpp/poppler-rectangle.h
>  include/poppler/cpp/poppler-toc.h
>  include/poppler/cpp/poppler-version.h
> +include/poppler/cpp/poppler_cpp_export.h
>  include/poppler/fofi/
>  include/poppler/fofi/FoFiBase.h
>  include/poppler/fofi/FoFiEncodings.h
> @@ -131,6 +132,7 @@ include/poppler/goo/gmem.h
>  include/poppler/goo/grandom.h
>  include/poppler/goo/gstrtod.h
>  include/poppler/poppler-config.h
> +include/poppler/poppler_private_export.h
>  include/poppler/splash/
>  include/poppler/splash/Splash.h
>  include/poppler/splash/SplashBitmap.h

Reply via email to