pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/print/scribus-qt5
Module Name: pkgsrc
Committed By: markd
Date: Thu Sep 29 00:17:01 UTC 2022
Modified Files:
pkgsrc/print/scribus-qt5: Makefile PLIST distinfo
pkgsrc/print/scribus-qt5/patches: patch-CMakeLists__Dependencies.cmake
patch-scribus_plugins_import_pdf_slaoutput.cpp
Added Files:
pkgsrc/print/scribus-qt5/patches:
patch-scribus_plugins_import_pdf_importpdf.cpp
Removed Files:
pkgsrc/print/scribus-qt5/patches:
patch-scribus_plugins_import_pdf_slaoutput.h
patch-scribus_ui_colorlistmodel.cpp
patch-scribus_ui_colorlistmodel.h
Log Message:
scribus-qt5: update to 1.5.8
Like previous releases, work on version 1.5.8 focused mostly on bugfixes and
code optimizations, the latter of which are expected to lead to reliability
and speed improvements. We have also begun to prepare Scribus for using Qt6,
which will make our work easier for future releases.
High Level Changes:
* UI Improvements for dark mode and some icon updates and window interactivity
* Improvements to file import (IDML, PDF, PNG, TIFF, SVG)
* Improvements to PDF export
* Improvements with respect to tables (undo/redo, styles)
* Improvements to the Story Editor
* Improvements to the build system
* Translation updates
* On mac OS, Scribus now includes a bundled Python 3 interpreter and is built
for mac OS 10.15/Catalina or higher.
1.5.7
Significant effort went into clean up of user interface margins and widget
sizing, however most changes have taken place “under the hood”. Apart from bug
fixing this also meant to refine previously introduced features, as well as
preparing the code for future Qt versions. A few remaining issues aside, this
release has been thoroughly tested and is considered to be stable. However,
there are also some new features.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/print/scribus-qt5/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/scribus-qt5/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/scribus-qt5/distinfo
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/print/scribus-qt5/patches/patch-CMakeLists__Dependencies.cmake \
pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.cpp
cvs rdiff -u -r0 -r1.1 \
pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_importpdf.cpp
cvs rdiff -u -r1.1 -r0 \
pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.h \
pkgsrc/print/scribus-qt5/patches/patch-scribus_ui_colorlistmodel.cpp \
pkgsrc/print/scribus-qt5/patches/patch-scribus_ui_colorlistmodel.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/print/scribus-qt5/Makefile
diff -u pkgsrc/print/scribus-qt5/Makefile:1.31 pkgsrc/print/scribus-qt5/Makefile:1.32
--- pkgsrc/print/scribus-qt5/Makefile:1.31 Sun Sep 11 12:52:05 2022
+++ pkgsrc/print/scribus-qt5/Makefile Thu Sep 29 00:17:01 2022
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.31 2022/09/11 12:52:05 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2022/09/29 00:17:01 markd Exp $
-DISTNAME= scribus-1.5.6pre20200611
-PKGREVISION= 28
+DISTNAME= scribus-1.5.8
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_GITHUB:=scribusproject/}
-GITHUB_PROJECT= scribus
-GITHUB_TAG= 37c361f2fcd24dea40c61a7f9638e6248ea3e68a
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scribus/}
+EXTRACT_SUFX= .tar.xz
+#MASTER_SITES= ${MASTER_SITE_GITHUB:=scribusproject/}
+#GITHUB_PROJECT= scribus
+#GITHUB_TAG= 37c361f2fcd24dea40c61a7f9638e6248ea3e68a
MAINTAINER= ryoon%NetBSD.org@localhost
HOMEPAGE= https://www.scribus.net/
@@ -13,10 +14,10 @@ COMMENT= Publishing layout with graphica
LICENSE= gnu-gpl-v2
USE_CMAKE= yes
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++17
USE_TOOLS+= pkg-config
-BROKEN+= "Poppler headers want C++17, this package is C++11"
+CMAKE_ARGS+= -DWANT_CPP17=ON
.include "../../converters/libcdr/buildlink3.mk"
.include "../../converters/libfreehand/buildlink3.mk"
@@ -37,6 +38,7 @@ BROKEN+= "Poppler headers want C++17, th
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/lcms2/buildlink3.mk"
+.include "../../graphics/osg/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../print/cups-base/buildlink3.mk"
.include "../../print/podofo/buildlink3.mk"
Index: pkgsrc/print/scribus-qt5/PLIST
diff -u pkgsrc/print/scribus-qt5/PLIST:1.1 pkgsrc/print/scribus-qt5/PLIST:1.2
--- pkgsrc/print/scribus-qt5/PLIST:1.1 Sun Jun 14 07:35:58 2020
+++ pkgsrc/print/scribus-qt5/PLIST Thu Sep 29 00:17:01 2022
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2020/06/14 07:35:58 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/09/29 00:17:01 markd Exp $
bin/scribus
+lib/scribus/plugins/gettext/libMARKDOWNimplugin.so
lib/scribus/plugins/gettext/libcsvim.so
lib/scribus/plugins/gettext/libdocim.so
lib/scribus/plugins/gettext/libdocximplugin.so
@@ -507,6 +508,7 @@ share/doc/scribus/de/readme-macosx.html
share/doc/scribus/de/readme-os2.html
share/doc/scribus/de/readme-win32.html
share/doc/scribus/de/readme.html
+share/doc/scribus/de/readme_needs_update_please_keep it_in.html
share/doc/scribus/de/releases.html
share/doc/scribus/de/resources.html
share/doc/scribus/de/scribus-svg.html
@@ -537,6 +539,7 @@ share/doc/scribus/de/scripterapi.html
share/doc/scribus/de/settings1.html
share/doc/scribus/de/short-words.html
share/doc/scribus/de/specs.html
+share/doc/scribus/de/specs_needs_update_please_keep it_in.html
share/doc/scribus/de/toolbox.html
share/doc/scribus/de/toolbox1.html
share/doc/scribus/de/toolbox12.html
@@ -1859,6 +1862,8 @@ share/scribus/editorconfig/200_gnuplot.x
share/scribus/editorconfig/300_lilypond.xml
share/scribus/editorconfig/400_dot.xml
share/scribus/editorconfig/500_povray.xml
+share/scribus/editorconfig/600_xelatex.tar
+share/scribus/editorconfig/600_xelatex.xml
share/scribus/editorconfig/dot.svg
share/scribus/editorconfig/gnuplot.png
share/scribus/editorconfig/lilypond.png
@@ -1931,6 +1936,7 @@ share/scribus/icons/1_5_0/16/draw-triang
share/scribus/icons/1_5_0/16/edit-clear.png
share/scribus/icons/1_5_0/16/edit-copy.png
share/scribus/icons/1_5_0/16/edit-cut.png
+share/scribus/icons/1_5_0/16/edit-delete-all.png
share/scribus/icons/1_5_0/16/edit-delete.png
share/scribus/icons/1_5_0/16/edit-find-replace.png
share/scribus/icons/1_5_0/16/edit-guides.png
@@ -2466,6 +2472,7 @@ share/scribus/icons/1_5_1/16/draw-triang
share/scribus/icons/1_5_1/16/edit-clear.png
share/scribus/icons/1_5_1/16/edit-copy.png
share/scribus/icons/1_5_1/16/edit-cut.png
+share/scribus/icons/1_5_1/16/edit-delete-all.png
share/scribus/icons/1_5_1/16/edit-delete.png
share/scribus/icons/1_5_1/16/edit-find-replace.png
share/scribus/icons/1_5_1/16/edit-guides.png
@@ -2556,6 +2563,7 @@ share/scribus/icons/1_5_1/22/align-verti
share/scribus/icons/1_5_1/22/align-vertical-top-out.png
share/scribus/icons/1_5_1/22/align-vertical-top.png
share/scribus/icons/1_5_1/22/annot3d.png
+share/scribus/icons/1_5_1/22/character-style.png
share/scribus/icons/1_5_1/22/checkbox.png
share/scribus/icons/1_5_1/22/close.png
share/scribus/icons/1_5_1/22/color-picker.png
@@ -2617,9 +2625,12 @@ share/scribus/icons/1_5_1/22/insert-tabl
share/scribus/icons/1_5_1/22/insert-table-rows.png
share/scribus/icons/1_5_1/22/insert-table.png
share/scribus/icons/1_5_1/22/insert-text-frame.png
+share/scribus/icons/1_5_1/22/language.png
share/scribus/icons/1_5_1/22/list-box.png
share/scribus/icons/1_5_1/22/measure.png
share/scribus/icons/1_5_1/22/merge-table-cells.png
+share/scribus/icons/1_5_1/22/orphan.png
+share/scribus/icons/1_5_1/22/paragraph-style.png
share/scribus/icons/1_5_1/22/pdf-annotations.png
share/scribus/icons/1_5_1/22/pointer.png
share/scribus/icons/1_5_1/22/preflight-verifier.png
@@ -2628,6 +2639,7 @@ share/scribus/icons/1_5_1/22/split-table
share/scribus/icons/1_5_1/22/story-editor.png
share/scribus/icons/1_5_1/22/swap-left.png
share/scribus/icons/1_5_1/22/swap-right.png
+share/scribus/icons/1_5_1/22/text-align.png
share/scribus/icons/1_5_1/22/text-field.png
share/scribus/icons/1_5_1/22/text-frame-link.png
share/scribus/icons/1_5_1/22/text-frame-unlink.png
@@ -2637,6 +2649,7 @@ share/scribus/icons/1_5_1/22/transform-s
share/scribus/icons/1_5_1/22/transform-shear-left.png
share/scribus/icons/1_5_1/22/transform-shear-right.png
share/scribus/icons/1_5_1/22/transform-shear-up.png
+share/scribus/icons/1_5_1/22/widow.png
share/scribus/icons/1_5_1/22/zoom-in.png
share/scribus/icons/1_5_1/22/zoom-original.png
share/scribus/icons/1_5_1/22/zoom-out.png
@@ -2693,6 +2706,7 @@ share/scribus/icons/1_5_1/docattributes_
share/scribus/icons/1_5_1/document2.png
share/scribus/icons/1_5_1/documentinfo.png
share/scribus/icons/1_5_1/editm.png
+share/scribus/icons/1_5_1/ellipsis.png
share/scribus/icons/1_5_1/exit.png
share/scribus/icons/1_5_1/exit22.png
share/scribus/icons/1_5_1/expand.png
@@ -2846,6 +2860,7 @@ share/scribus/icons/1_5_1_dark/16/draw-t
share/scribus/icons/1_5_1_dark/16/edit-clear.png
share/scribus/icons/1_5_1_dark/16/edit-copy.png
share/scribus/icons/1_5_1_dark/16/edit-cut.png
+share/scribus/icons/1_5_1_dark/16/edit-delete-all.png
share/scribus/icons/1_5_1_dark/16/edit-delete.png
share/scribus/icons/1_5_1_dark/16/edit-find-replace.png
share/scribus/icons/1_5_1_dark/16/edit-guides.png
@@ -2936,6 +2951,7 @@ share/scribus/icons/1_5_1_dark/22/align-
share/scribus/icons/1_5_1_dark/22/align-vertical-top-out.png
share/scribus/icons/1_5_1_dark/22/align-vertical-top.png
share/scribus/icons/1_5_1_dark/22/annot3d.png
+share/scribus/icons/1_5_1_dark/22/character-style.png
share/scribus/icons/1_5_1_dark/22/checkbox.png
share/scribus/icons/1_5_1_dark/22/close.png
share/scribus/icons/1_5_1_dark/22/color-picker.png
@@ -2998,9 +3014,12 @@ share/scribus/icons/1_5_1_dark/22/insert
share/scribus/icons/1_5_1_dark/22/insert-table-rows.png
share/scribus/icons/1_5_1_dark/22/insert-table.png
share/scribus/icons/1_5_1_dark/22/insert-text-frame.png
+share/scribus/icons/1_5_1_dark/22/language.png
share/scribus/icons/1_5_1_dark/22/list-box.png
share/scribus/icons/1_5_1_dark/22/measure.png
share/scribus/icons/1_5_1_dark/22/merge-table-cells.png
+share/scribus/icons/1_5_1_dark/22/orphan.png
+share/scribus/icons/1_5_1_dark/22/paragraph-style.png
share/scribus/icons/1_5_1_dark/22/pdf-annotations.png
share/scribus/icons/1_5_1_dark/22/pointer.png
share/scribus/icons/1_5_1_dark/22/preflight-verifier.png
@@ -3009,6 +3028,7 @@ share/scribus/icons/1_5_1_dark/22/split-
share/scribus/icons/1_5_1_dark/22/story-editor.png
share/scribus/icons/1_5_1_dark/22/swap-left.png
share/scribus/icons/1_5_1_dark/22/swap-right.png
+share/scribus/icons/1_5_1_dark/22/text-align.png
share/scribus/icons/1_5_1_dark/22/text-field.png
share/scribus/icons/1_5_1_dark/22/text-frame-link.png
share/scribus/icons/1_5_1_dark/22/text-frame-unlink.png
@@ -3018,6 +3038,7 @@ share/scribus/icons/1_5_1_dark/22/transf
share/scribus/icons/1_5_1_dark/22/transform-shear-left.png
share/scribus/icons/1_5_1_dark/22/transform-shear-right.png
share/scribus/icons/1_5_1_dark/22/transform-shear-up.png
+share/scribus/icons/1_5_1_dark/22/widow.png
share/scribus/icons/1_5_1_dark/22/zoom-in.png
share/scribus/icons/1_5_1_dark/22/zoom-original.png
share/scribus/icons/1_5_1_dark/22/zoom-out.png
@@ -3074,6 +3095,7 @@ share/scribus/icons/1_5_1_dark/docattrib
share/scribus/icons/1_5_1_dark/document2.png
share/scribus/icons/1_5_1_dark/documentinfo.png
share/scribus/icons/1_5_1_dark/editm.png
+share/scribus/icons/1_5_1_dark/ellipsis.png
share/scribus/icons/1_5_1_dark/exit.png
share/scribus/icons/1_5_1_dark/exit22.png
share/scribus/icons/1_5_1_dark/expand.png
@@ -3471,8 +3493,10 @@ share/scribus/templates/textbased/textba
share/scribus/templates/textbased/textbasedtn.png
share/scribus/translations/scribus.af.qm
share/scribus/translations/scribus.ar.qm
+share/scribus/translations/scribus.az.qm
share/scribus/translations/scribus.be.qm
share/scribus/translations/scribus.bg.qm
+share/scribus/translations/scribus.bn_IN.qm
share/scribus/translations/scribus.br.qm
share/scribus/translations/scribus.ca.qm
share/scribus/translations/scribus.cs_CZ.qm
@@ -3507,14 +3531,17 @@ share/scribus/translations/scribus.ko.qm
share/scribus/translations/scribus.lt_LT.qm
share/scribus/translations/scribus.ml.qm
share/scribus/translations/scribus.mn_MN.qm
+share/scribus/translations/scribus.ms_MY.qm
share/scribus/translations/scribus.nb_NO.qm
share/scribus/translations/scribus.nl.qm
+share/scribus/translations/scribus.nn_NO.qm
share/scribus/translations/scribus.oc.qm
share/scribus/translations/scribus.pl_PL.qm
share/scribus/translations/scribus.pms.qm
share/scribus/translations/scribus.pt.qm
share/scribus/translations/scribus.pt_BR.qm
share/scribus/translations/scribus.pt_PT.qm
+share/scribus/translations/scribus.ro.qm
share/scribus/translations/scribus.ru.qm
share/scribus/translations/scribus.sa.qm
share/scribus/translations/scribus.si.qm
@@ -3529,6 +3556,7 @@ share/scribus/translations/scribus.te.qm
share/scribus/translations/scribus.th_TH.qm
share/scribus/translations/scribus.tr.qm
share/scribus/translations/scribus.uk.qm
+share/scribus/translations/scribus.untranslated.qm
share/scribus/translations/scribus.zh_CN.qm
share/scribus/translations/scribus.zh_TW.qm
share/scribus/unicodenameslist.txt
Index: pkgsrc/print/scribus-qt5/distinfo
diff -u pkgsrc/print/scribus-qt5/distinfo:1.4 pkgsrc/print/scribus-qt5/distinfo:1.5
--- pkgsrc/print/scribus-qt5/distinfo:1.4 Tue Oct 26 11:12:18 2021
+++ pkgsrc/print/scribus-qt5/distinfo Thu Sep 29 00:17:01 2022
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:12:18 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/09/29 00:17:01 markd Exp $
-BLAKE2s (scribus-1.5.6pre20200611-37c361f2fcd24dea40c61a7f9638e6248ea3e68a.tar.gz) = a02e3c343ea0e0ab4e225f6ba6018b3a3b61a238cfbb3410f8a4de1db5cd5504
-SHA512 (scribus-1.5.6pre20200611-37c361f2fcd24dea40c61a7f9638e6248ea3e68a.tar.gz) =
d2d3ce3c4ca2bbe7e8950f5ad4f967d90b4d7cb300dfb0d475f501055304cf6dd58fec3fc977890dca5f1725108da8c5c4b55209ab75c65c2fb147613f880049
-Size (scribus-1.5.6pre20200611-37c361f2fcd24dea40c61a7f9638e6248ea3e68a.tar.gz) = 87492633 bytes
-SHA1 (patch-CMakeLists__Dependencies.cmake) = 583d1b0f0e0fe2c3dda674b5d4a2b172a4b1624f
-SHA1 (patch-scribus_plugins_import_pdf_slaoutput.cpp) = 03c33ecab1b3041da24942081a7f1df2a09c432b
-SHA1 (patch-scribus_plugins_import_pdf_slaoutput.h) = 56c4773d1422cc51c4747a2410f974acdc5560bb
-SHA1 (patch-scribus_ui_colorlistmodel.cpp) = c5ac59338ba07f46a42bd882c6a876c2c7c8404a
-SHA1 (patch-scribus_ui_colorlistmodel.h) = 781b1dc06e6abd9e494a58b6a80d2f8e97936c49
+BLAKE2s (scribus-1.5.8.tar.xz) = 5c417889a7b89f75f069a738d1789d0f96bd0d091e5309a553740311396dff0c
+SHA512 (scribus-1.5.8.tar.xz) = eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
+Size (scribus-1.5.8.tar.xz) = 74543476 bytes
+SHA1 (patch-CMakeLists__Dependencies.cmake) = 80fc0e787829031da3ec7085724e4b06e6106303
+SHA1 (patch-scribus_plugins_import_pdf_importpdf.cpp) = 28ce7f6abbc92f6760dfe8e37b2b050bad4a539b
+SHA1 (patch-scribus_plugins_import_pdf_slaoutput.cpp) = 3dd733201d8f2629a145528ec9bbe37a2bef2dbb
Index: pkgsrc/print/scribus-qt5/patches/patch-CMakeLists__Dependencies.cmake
diff -u pkgsrc/print/scribus-qt5/patches/patch-CMakeLists__Dependencies.cmake:1.1 pkgsrc/print/scribus-qt5/patches/patch-CMakeLists__Dependencies.cmake:1.2
--- pkgsrc/print/scribus-qt5/patches/patch-CMakeLists__Dependencies.cmake:1.1 Sun Jun 14 07:35:58 2020
+++ pkgsrc/print/scribus-qt5/patches/patch-CMakeLists__Dependencies.cmake Thu Sep 29 00:17:01 2022
@@ -1,76 +1,59 @@
-$NetBSD: patch-CMakeLists__Dependencies.cmake,v 1.1 2020/06/14 07:35:58 ryoon Exp $
+$NetBSD: patch-CMakeLists__Dependencies.cmake,v 1.2 2022/09/29 00:17:01 markd Exp $
* Find Qt5
* CMAKE_MODULE_PATH is not a single value, it can be a list.
---- CMakeLists_Dependencies.cmake.orig 2020-06-11 09:56:15.000000000 +0000
+--- CMakeLists_Dependencies.cmake.orig 2022-01-23 16:16:42.000000000 +0000
+++ CMakeLists_Dependencies.cmake
-@@ -5,55 +5,55 @@
- set(QT_MIN_VERSION "5.11.0")
- set(CMAKE_PREFIX_PATH "${QT_PREFIX}/lib/cmake")
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
--find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED)
-+find_package(Qt5 COMPONENTS Core REQUIRED)
- if(Qt5Core_FOUND)
- message(STATUS "----- USE QT 5-----")
- else()
- message(FATAL_ERROR "ERROR: No QT 5 found")
- endif()
--find_package(Qt5Widgets ${QT_MIN_VERSION} REQUIRED)
-+find_package(Qt5 COMPONENTS Widgets REQUIRED)
- if(Qt5Widgets_FOUND)
- message(STATUS "----- USE QT Widgets-----")
- else()
- message(FATAL_ERROR "ERROR: No QT Widgets found")
- endif()
--find_package(Qt5Gui ${QT_MIN_VERSION} REQUIRED)
-+find_package(Qt5 COMPONENTS Gui REQUIRED)
- if(Qt5Gui_FOUND)
- message(STATUS "----- USE Qt5Gui -----")
- else()
- message(FATAL_ERROR "ERROR: Qt5Gui found")
- endif()
--find_package(Qt5Xml ${QT_MIN_VERSION} REQUIRED)
-+find_package(Qt5 COMPONENTS Xml REQUIRED)
- if(Qt5Xml_FOUND)
- message(STATUS "----- USE QT 5 XML -----")
- else()
- message(FATAL_ERROR "ERROR: No QT 5 XML found")
- endif()
--find_package(Qt5Network ${QT_MIN_VERSION} REQUIRED)
-+find_package(Qt5 COMPONENTS Network REQUIRED)
- if(Qt5Network_FOUND)
- message(STATUS "----- USE Qt5Network -----")
- else()
- message(FATAL_ERROR "ERROR: No Qt5Network found")
- endif()
--find_package(Qt5OpenGL ${QT_MIN_VERSION} REQUIRED)
-+find_package(Qt5 COMPONENTS OpenGL REQUIRED)
- if(Qt5OpenGL_FOUND)
- message(STATUS "----- USE Qt5OpenGL -----")
- else()
- message(FATAL_ERROR "ERROR: No Qt5OpenGL found")
- endif()
--find_package(Qt5LinguistTools ${QT_MIN_VERSION} REQUIRED)
-+find_package(Qt5 COMPONENTS LinguistTools REQUIRED)
- if(Qt5LinguistTools_FOUND)
- message(STATUS "----- USE Qt5LinguistTools -----")
- else()
- message(FATAL_ERROR "ERROR: No Qt5LinguistTools found")
- endif()
--#find_package(Qt5Quick ${QT_MIN_VERSION} REQUIRED)
-+#find_package(Qt5 COMPONENTS Quick REQUIRED)
- #if(Qt5Quick_FOUND)
- # message(STATUS "----- USE Qt5Quick -----")
- #else()
- # message(FATAL_ERROR "ERROR: No Qt5Quick found")
- #endif()
--find_package(Qt5PrintSupport ${QT_MIN_VERSION} REQUIRED)
-+find_package(Qt5 COMPONENTS PrintSupport REQUIRED)
- if(Qt5PrintSupport_FOUND)
- message(STATUS "----- USE Qt5PrintSupport -----")
- else()
-@@ -91,8 +91,8 @@ if (WIN32)
+@@ -10,31 +10,31 @@ if (NOT WANT_QT6)
+ message(STATUS "Qt5 Requested")
+ set(QT_MIN_VERSION "5.14.0")
+ add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050E00)
+- find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED)
++ find_package(Qt5 COMPONENTS Core REQUIRED)
+ if(NOT Qt5Core_FOUND)
+ message(FATAL_ERROR "ERROR: No QT 5 found")
+ endif()
+- find_package(Qt5Widgets ${QT_MIN_VERSION} REQUIRED)
++ find_package(Qt5 COMPONENTS Widgets REQUIRED)
+ if(NOT Qt5Widgets_FOUND)
+ message(FATAL_ERROR "ERROR: No QT Widgets found")
+ endif()
+- find_package(Qt5Gui ${QT_MIN_VERSION} REQUIRED)
++ find_package(Qt5 COMPONENTS Gui REQUIRED)
+ if(NOT Qt5Gui_FOUND)
+ message(FATAL_ERROR "ERROR: No Qt5Gui found")
+ endif()
+- find_package(Qt5Xml ${QT_MIN_VERSION} REQUIRED)
++ find_package(Qt5 COMPONENTS Xml REQUIRED)
+ if(NOT Qt5Xml_FOUND)
+ message(FATAL_ERROR "ERROR: No QT 5 XML found")
+ endif()
+- find_package(Qt5Network ${QT_MIN_VERSION} REQUIRED)
++ find_package(Qt5 COMPONENTS Network REQUIRED)
+ if(NOT Qt5Network_FOUND)
+ message(FATAL_ERROR "ERROR: No Qt5Network found")
+ endif()
+- find_package(Qt5OpenGL ${QT_MIN_VERSION} REQUIRED)
++ find_package(Qt5 COMPONENTS OpenGL REQUIRED)
+ if(NOT Qt5OpenGL_FOUND)
+ message(FATAL_ERROR "ERROR: No Qt5OpenGL found")
+ endif()
+- find_package(Qt5LinguistTools ${QT_MIN_VERSION} REQUIRED)
++ find_package(Qt5 COMPONENTS LinguistTools REQUIRED)
+ if(NOT Qt5LinguistTools_FOUND)
+ message(FATAL_ERROR "ERROR: No Qt5LinguistTools found")
+ endif()
+@@ -44,7 +44,7 @@ if (NOT WANT_QT6)
+ #else()
+ # message(FATAL_ERROR "ERROR: No Qt5Quick found")
+ #endif()
+- find_package(Qt5PrintSupport ${QT_MIN_VERSION} REQUIRED)
++ find_package(Qt5 COMPONENTS PrintSupport REQUIRED)
+ if(NOT Qt5PrintSupport_FOUND)
+ message(FATAL_ERROR "ERROR: No Qt5PrintSupport found")
+ endif()
+@@ -108,8 +108,8 @@ if (WIN32)
# On win32 we can use Qt's zlib and libpng, so we use some
# custom cmake includes. This permits us to honour the
# USE_QT_ZLIB_PNGLIB flag if passed.
@@ -81,16 +64,15 @@ $NetBSD: patch-CMakeLists__Dependencies.
endif()
find_package(ZLIB REQUIRED)
if (ZLIB_FOUND)
-@@ -188,7 +188,7 @@ if (RENDER_LIB)
- endif()
- endif()
+@@ -193,6 +193,7 @@ endif()
+ #>> FreeType2
--set(CAIRO_DIR ${CMAKE_MODULE_PATH})
-+set(CAIRO_DIR "${CMAKE_SOURCE_DIR}/cmake/modules")
- find_package(CAIRO REQUIRED)
- if(CAIRO_FOUND)
- message("CAIRO Library Found OK")
-@@ -220,7 +220,7 @@ endif()
+ set(cairo_DIR ${CMAKE_MODULE_PATH})
++set(cairo_DIR "${CMAKE_SOURCE_DIR}/cmake/modules")
+ find_package(cairo REQUIRED)
+ if(cairo_FOUND)
+ set(HAVE_CAIRO ON)
+@@ -224,7 +225,7 @@ endif()
#>>LibXML2
#<<LittleCMS
@@ -99,7 +81,7 @@ $NetBSD: patch-CMakeLists__Dependencies.
find_package(LCMS2 REQUIRED)
if(LCMS2_FOUND)
set(HAVE_LCMS2 ON)
-@@ -283,7 +283,7 @@ endif()
+@@ -285,7 +286,7 @@ endif()
#<< GraphicsMagick for image import
if (WANT_GRAPHICSMAGICK)
Index: pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.cpp
diff -u pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.cpp:1.1 pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.cpp:1.2
--- pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.cpp:1.1 Tue Jun 22 21:24:15 2021
+++ pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_slaoutput.cpp Thu Sep 29 00:17:01 2022
@@ -1,39 +1,368 @@
-$NetBSD: patch-scribus_plugins_import_pdf_slaoutput.cpp,v 1.1 2021/06/22 21:24:15 markd Exp $
+$NetBSD: patch-scribus_plugins_import_pdf_slaoutput.cpp,v 1.2 2022/09/29 00:17:01 markd Exp $
-patches for poppler >= 21.3
+patches for poppler 22.03, 22.04 and 22.09
---- scribus/plugins/import/pdf/slaoutput.cpp.orig 2020-06-11 09:56:15.000000000 +0000
+--- scribus/plugins/import/pdf/slaoutput.cpp.orig 2022-01-23 16:16:01.000000000 +0000
+++ scribus/plugins/import/pdf/slaoutput.cpp
-@@ -2291,9 +2291,19 @@ GBool SlaOutputDev::patchMeshShadedFill(
- return gTrue;
+@@ -7,6 +7,11 @@ for which a new license (GPL+exception)
+
+ #include "slaoutput.h"
+
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++#include <memory>
++#include <optional>
++#endif
++
+ #include <poppler/GlobalParams.h>
+ #include <poppler/poppler-config.h>
+ #include <poppler/FileSpec.h>
+@@ -169,8 +174,13 @@ void AnoOutputDev::drawString(GfxState *
+ int shade = 100;
+ currColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade);
+ fontSize = state->getFontSize();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ if (state->getFont() && state->getFont()->getName())
++ fontName = new GooString(state->getFont()->getName().value());
++#else
+ if (state->getFont())
+ fontName = state->getFont()->getName()->copy();
++#endif
+ itemText = s->copy();
}
--GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070
double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
-+bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep)
+@@ -358,7 +368,12 @@ LinkAction* SlaOutputDev::SC_getAddition
+ GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data)
+ {
+ SlaOutputDev *dev = (SlaOutputDev*)user_data;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ const PDFRectangle& annotRect = annota->getRect();;
++ const PDFRectangle* box = &annotRect;
++#else
+ PDFRectangle *box = annota->getRect();
++#endif
+ double xCoor = dev->m_doc->currentPage()->xOffset() + box->x1 - dev->cropOffsetX;
+ double yCoor = dev->m_doc->currentPage()->yOffset() + dev->m_doc->currentPage()->height() - box->y2 + dev->cropOffsetY;
+ double width = box->x2 - box->x1;
+@@ -701,7 +716,12 @@ bool SlaOutputDev::handleWidgetAnnot(Ann
+ if (apa || !achar)
+ {
+ AnoOutputDev *annotOutDev = new AnoOutputDev(m_doc, m_importedColors);
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ const PDFRectangle& annotaRect = annota->getRect();
++ Gfx* gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), &annotaRect, nullptr);
+#else
-+GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict,
POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
+ Gfx *gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), annota->getRect(), nullptr);
+#endif
+ ano->draw(gfx, false);
+ if (!bgFound)
+ m_currColorFill = annotOutDev->currColorFill;
+@@ -3026,19 +3046,30 @@ void SlaOutputDev::markPoint(POPPLER_CON
+
+ void SlaOutputDev::updateFont(GfxState *state)
{
- // qDebug() << "SlaOutputDev::tilingPatternFill";
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
-+ const double *bbox = tPat->getBBox();
-+ const double *pmat = tPat->getMatrix();
-+ Dict *resDict = tPat->getResDict();
+- GfxFont *gfxFont;
+- GfxFontLoc *fontLoc;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ std::optional<GfxFontLoc> fontLoc;
++ std::string fileName;
++ std::unique_ptr<FoFiTrueType> ff;
++ std::optional<std::vector<unsigned char>> tmpBuf;
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ std::optional<GfxFontLoc> fontLoc;
++ const GooString * fileName = nullptr;
++ std::unique_ptr<FoFiTrueType> ff;
++ char* tmpBuf = nullptr;
++#else
++ GfxFontLoc * fontLoc = nullptr;
++ GooString * fileName = nullptr;
++ FoFiTrueType * ff = nullptr;
++ char* tmpBuf = nullptr;
++#endif
+ GfxFontType fontType;
+ SlaOutFontFileID *id;
+ SplashFontFile *fontFile;
+ SplashFontSrc *fontsrc = nullptr;
+- FoFiTrueType *ff;
+ Object refObj, strObj;
+- GooString *fileName;
+- char *tmpBuf;
+ int tmpBufLen = 0;
+- int *codeToGID;
+- const double *textMat;
++ int *codeToGID = nullptr;
++ const double *textMat = nullptr;
+ double m11, m12, m21, m22, fontSize;
+ SplashCoord mat[4];
+ int n = 0;
+@@ -3046,11 +3077,12 @@ void SlaOutputDev::updateFont(GfxState *
+ SplashCoord matrix[6];
+
+ m_font = nullptr;
+- fileName = nullptr;
+- tmpBuf = nullptr;
+- fontLoc = nullptr;
+
+- gfxFont = state->getFont();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ GfxFont* gfxFont = state->getFont().get();
++#else
++ GfxFont* gfxFont = state->getFont();
++#endif
+ if (!gfxFont)
+ goto err1;
+
+@@ -3064,10 +3096,10 @@ void SlaOutputDev::updateFont(GfxState *
+ delete id;
+ else
+ {
+- if (!(fontLoc = gfxFont->locateFont(xref, nullptr)))
++ fontLoc = gfxFont->locateFont((xref) ? xref : pdfDoc->getXRef(), nullptr);
++ if (!fontLoc)
+ {
+- error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+
+@@ -3075,94 +3107,106 @@ void SlaOutputDev::updateFont(GfxState *
+ if (fontLoc->locType == gfxFontLocEmbedded)
+ {
+ // if there is an embedded font, read it to memory
+- tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ tmpBuf = gfxFont->readEmbFontFile((xref) ? xref : pdfDoc->getXRef());
+ if (! tmpBuf)
+ goto err2;
++#else
++ tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);
++ if (!tmpBuf)
++ goto err2;
++#endif
+
+ // external font
+ }
+ else
+ { // gfxFontLocExternal
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ fileName = fontLoc->path;
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ fileName = fontLoc->pathAsGooString();
++#else
+ fileName = fontLoc->path;
++#endif
+ fontType = fontLoc->fontType;
+ }
+
+ fontsrc = new SplashFontSrc;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ if (!fileName.empty())
++ fontsrc->setFile(fileName);
++ else
++ fontsrc->setBuf(std::move(tmpBuf.value()));
++#else
+ if (fileName)
+ fontsrc->setFile(fileName, gFalse);
+ else
+ fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue);
++#endif
+
+ // load the font file
+ switch (fontType) {
+ case fontType1:
+- if (!(fontFile = m_fontEngine->loadType1Font(
+- id,
+- fontsrc,
+- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
++ if (!(fontFile = m_fontEngine->loadType1Font(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+ case fontType1C:
+- if (!(fontFile = m_fontEngine->loadType1CFont(
+- id,
+- fontsrc,
+- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
++ if (!(fontFile = m_fontEngine->loadType1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+ case fontType1COT:
+- if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(
+- id,
+- fontsrc,
+- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
++ if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+ case fontTrueType:
+ case fontTrueTypeOT:
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ if (!fileName.empty())
++ ff = FoFiTrueType::load(fileName.c_str());
++ else
++ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());
++#else
+ if (fileName)
+ ff = FoFiTrueType::load(fileName->getCString());
+ else
+ ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
++#endif
+ if (ff)
+ {
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ codeToGID = ((Gfx8BitFont*) gfxFont)->getCodeToGIDMap(ff.get());
++ ff.reset();
++#else
+ codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);
+- n = 256;
+ delete ff;
++#endif
++ n = 256;
+ }
+ else
+ {
+ codeToGID = nullptr;
+ n = 0;
+ }
+- if (!(fontFile = m_fontEngine->loadTrueTypeFont(
+- id,
+- fontsrc,
+- codeToGID, n)))
++ if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n)))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+ case fontCIDType0:
+ case fontCIDType0C:
+- if (!(fontFile = m_fontEngine->loadCIDFont(
+- id,
+- fontsrc)))
++ if (!(fontFile = m_fontEngine->loadCIDFont(id, fontsrc)))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+@@ -3178,10 +3222,7 @@ void SlaOutputDev::updateFont(GfxState *
+ codeToGID = nullptr;
+ n = 0;
+ }
+- if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(
+- id,
+- fontsrc,
+- codeToGID, n)))
++ if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(id, fontsrc, codeToGID, n)))
+ {
+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+ gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+@@ -3203,22 +3244,30 @@ void SlaOutputDev::updateFont(GfxState *
+ }
+ else
+ {
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ if (!fileName.empty())
++ ff = FoFiTrueType::load(fileName.c_str());
++ else
++ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());
++#else
+ if (fileName)
+ ff = FoFiTrueType::load(fileName->getCString());
+ else
+ ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
++#endif
+ if (! ff)
+ goto err2;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n);
++ ff.reset();
++#else
+ codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);
+ delete ff;
++#endif
+ }
+- if (!(fontFile = m_fontEngine->loadTrueTypeFont(
+- id,
+- fontsrc,
+- codeToGID, n, faceIndex)))
++ if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n, faceIndex)))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+@@ -3247,14 +3296,19 @@ void SlaOutputDev::updateFont(GfxState *
+ mat[3] = -m22;
+ m_font = m_fontEngine->getFont(fontFile, mat, matrix);
+
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)
+ delete fontLoc;
++#endif
+ if (fontsrc && !fontsrc->isFile)
+ fontsrc->unref();
+ return;
+
+ err2:
+ delete id;
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)
+ delete fontLoc;
+#endif
+
- PDFRectangle box;
- Gfx *gfx;
- QString id;
-@@ -2325,7 +2335,11 @@ GBool SlaOutputDev::tilingPatternFill(Gf
- // Unset the clip path as it is unrelated to the pattern's coordinate space.
- QPainterPath savedClip = m_currentClipPath;
- m_currentClipPath = QPainterPath();
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
-+ gfx->display(tPat->getContentStream());
-+#else
- gfx->display(str);
-+#endif
- m_currentClipPath = savedClip;
- inPattern--;
- gElements = m_groupStack.pop();
+ err1:
+ if (fontsrc && !fontsrc->isFile)
+ fontsrc->unref();
+@@ -3357,9 +3411,15 @@ void SlaOutputDev::drawChar(GfxState* st
+ GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen)
+ {
+ // qDebug() << "beginType3Char";
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ GfxFont *gfxFont;
++ if (!(gfxFont = state->getFont().get()))
++ return gTrue;
++#else
++ GfxFont* gfxFont;
+ if (!(gfxFont = state->getFont()))
+ return gTrue;
++#endif
+ if (gfxFont->getType() != fontType3)
+ return gTrue;
+ F3Entry f3e;
+@@ -3681,9 +3741,16 @@ void SlaOutputDev::getPenState(GfxState
+ break;
+ }
+ double lw = state->getLineWidth();
+- double *dashPattern;
+ int dashLength;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0)
++ const double *dashPattern;
++ const std::vector<double> &dash = state->getLineDash(&DashOffset);
++ dashPattern = dash.data();
++ dashLength = dash.size();
++#else
++ double *dashPattern;
+ state->getLineDash(&dashPattern, &dashLength, &DashOffset);
++#endif
+ QVector<double> pattern(dashLength);
+ for (int i = 0; i < dashLength; ++i)
+ {
Added files:
Index: pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_importpdf.cpp
diff -u /dev/null pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_importpdf.cpp:1.1
--- /dev/null Thu Sep 29 00:17:01 2022
+++ pkgsrc/print/scribus-qt5/patches/patch-scribus_plugins_import_pdf_importpdf.cpp Thu Sep 29 00:17:01 2022
@@ -0,0 +1,44 @@
+$NetBSD: patch-scribus_plugins_import_pdf_importpdf.cpp,v 1.1 2022/09/29 00:17:01 markd Exp $
+
+patches for poppler 22.03
+
+--- scribus/plugins/import/pdf/importpdf.cpp.orig 2022-01-23 16:16:01.000000000 +0000
++++ scribus/plugins/import/pdf/importpdf.cpp
+@@ -90,7 +90,11 @@ QImage PdfPlug::readThumbnail(const QStr
+ #endif
+ globalParams->setErrQuiet(gTrue);
+
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
++ PDFDoc pdfDoc{ std::make_unique<GooString>(fname) };
++#else
+ PDFDoc pdfDoc{fname, nullptr, nullptr, nullptr};
++#endif
+ if (!pdfDoc.isOk() || pdfDoc.getErrorCode() == errEncrypted)
+ return QImage();
+
+@@ -343,7 +347,11 @@ bool PdfPlug::convert(const QString& fn)
+ globalParams->setErrQuiet(gTrue);
+ // globalParams->setPrintCommands(gTrue);
+ QList<OptionalContentGroup*> ocgGroups;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
++ auto pdfDoc = std::make_unique<PDFDoc>(std::make_unique<GooString>(fname));
++#else
+ auto pdfDoc = std::unique_ptr<PDFDoc>(new PDFDoc(fname, nullptr, nullptr, nullptr));
++#endif
+ if (pdfDoc)
+ {
+ if (pdfDoc->getErrorCode() == errEncrypted)
+@@ -362,8 +370,13 @@ bool PdfPlug::convert(const QString& fn)
+ #else
+ auto fname = new GooString(QFile::encodeName(fn).data());
+ #endif
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
++ std::optional<GooString> userPW(std::in_place, text.toLocal8Bit().data());
++ pdfDoc.reset(new PDFDoc(std::make_unique<GooString>(fname), userPW, userPW, nullptr));
++#else
+ auto userPW = new GooString(text.toLocal8Bit().data());
+ pdfDoc.reset(new PDFDoc(fname, userPW, userPW, nullptr));
++#endif
+ qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+ }
+ if ((!pdfDoc) || (pdfDoc->getErrorCode() != errNone))
Home |
Main Index |
Thread Index |
Old Index