diff --git a/common/shlibs b/common/shlibs index 5757ec96c6601d..66d0045a2898fe 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2557,7 +2557,8 @@ libndpi.so.3 ndpi-3.4_1 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1 libsearpc.so.1 libsearpc-3.0.7_1 libseafile.so.0 seafile-libclient-7.0.10_2 -libpodofo.so.0.9.7 libpodofo-0.9.7_2 +libpodofo.so.0.9.7 libpodofo0.9.7-0.9.7_1 +libpodofo.so.2 libpodofo-0.10.3_1 libIrcUtil.so.3 libcommuni-3.4.0_1 libIrcCore.so.3 libcommuni-3.4.0_1 libIrcModel.so.3 libcommuni-3.4.0_1 diff --git a/srcpkgs/calibre/patches/python-3.12.patch b/srcpkgs/calibre/patches/python-3.12.patch new file mode 100644 index 00000000000000..8c309453a8d80b --- /dev/null +++ b/srcpkgs/calibre/patches/python-3.12.patch @@ -0,0 +1,11 @@ +--- a/calibre/src/templite/__init__.py ++++ b/calibre/src/templite/__init__.py +@@ -30,7 +30,7 @@ import sys, re + from polyglot.builtins import unicode_type + + class Templite: +- auto_emit = re.compile('(^[\'\"])|(^[a-zA-Z0-9_\[\]\'\"]+$)') ++ auto_emit = re.compile('(^[\'\"])|(^[a-zA-Z0-9_\\[\\]\'\"]+$)') + + def __init__(self, template, start='${', end='}$'): + if len(start) != 2 or len(end) != 2: diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index 37b5c4c2a4f776..c6adc019548f73 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,7 +1,7 @@ # Template file for 'calibre' pkgname=calibre -version=6.17.0 -revision=4 +version=7.1.0 +revision=1 build_wrksrc=calibre build_style=python3-module pycompile_dirs="/usr/lib/calibre/" @@ -9,14 +9,14 @@ hostmakedepends="pkg-config cmake python3-BeautifulSoup4 python3-Pillow python3-apsw python3-css-parser python3-dateutil sip qt6-base python3-py7zr python3-html5-parser python3-msgpack python3-regex python3-mechanize mathjax liberation-fonts-ttf python3-zeroconf xdg-utils rapydscript-ng - python3-PyQt-builder python3-Markdown" + python3-PyQt-builder python3-Markdown python3-xxhash" makedepends="libinput-devel libmagick-devel libmtp-devel libstemmer-devel libpodofo-devel libwmf-devel libxkbcommon-devel poppler-cpp-devel freetype-devel uchardet-devel openssl-devel icu-devel libusb-devel sqlite-devel tslib-devel hunspell-devel hyphen-devel libstemmer-devel python3-pyqt6-devel python3-pyqt6-webengine-devel" depends="desktop-file-utils optipng poppler python3-BeautifulSoup4 - qt6-imageformats python3-Pygments python3-pycryptodome + qt6-imageformats python3-Pygments python3-pycryptodome python3-xxhash python3-Markdown python3-Pillow python3-zeroconf python3-Pygments python3-apsw python3-css-parser python3-cssselect python3-dateutil python3-jeepney python3-dnspython python3-feedparser python3-html5-parser python3-mechanize @@ -26,18 +26,18 @@ depends="desktop-file-utils optipng poppler python3-BeautifulSoup4 python3-pyqt6-network python3-pyqt6-dbus python3-pyqt6-opengl-widgets python3-pyqt6-widgets python3-pyqt6-gui python3-pyqt6-declarative python3-pyqt6-printsupport python3-pyqt6-webchannel python3-pyqt6-svg - python3-pyqt6-webengine python3-fonttools" + python3-pyqt6-pdf python3-pyqt6-webengine python3-fonttools" checkdepends="${depends} libjpeg-turbo-tools jxrlib" short_desc="Ebook management application" maintainer="skmpz " license="GPL-3.0-only" homepage="https://calibre-ebook.com" changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt" -_lover=7.4.3.2 +_lover=7.6.0.3 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz https://download.documentfoundation.org/libreoffice/src/${_lover%.*}/libreoffice-dictionaries-${_lover}.tar.xz" -checksum="1ca4abb8a5d850c1f5963e37080dd1a7795736538d5c4d4ff6014b687d7a368e - 3a55d5807b763827f820c4aee0a0fd9f44520e70629c9eb9748e1f8c57c64389" +checksum="70a515fad059e597579282dd24f75444a9d63f90798330944107a1550211824a + b932cdd6bd2ee717f3a09766c88fe90100b0c2c0509313c3ee297f95c084ee2e" python_version=3 lib32disabled=yes nocross=yes @@ -84,16 +84,16 @@ do_build() { --path-to-liberation_fonts /usr/share/fonts/TTF/liberation python3 setup.py mathjax \ --path-to-mathjax /usr/share/mathjax --system-mathjax - python3 setup.py iso639 - python3 setup.py iso3166 + # python3 setup.py iso639 + # python3 setup.py iso3166 # python3 setup.py recent_uas - python3 setup.py rapydscript - python3 setup.py translations - python3 setup.py resources \ - --path-to-hyphenation "$wrksrc/libreoffice-${_lover}/dictionaries" \ - --system-liberation_fonts \ - --path-to-liberation_fonts /usr/share/fonts/TTF/liberation \ - --path-to-mathjax /usr/share/mathjax --system-mathjax + # python3 setup.py rapydscript + # python3 setup.py translations + # python3 setup.py resources \ + # --path-to-hyphenation "$wrksrc/libreoffice-${_lover}/dictionaries" \ + # --system-liberation_fonts \ + # --path-to-liberation_fonts /usr/share/fonts/TTF/liberation \ + # --path-to-mathjax /usr/share/mathjax --system-mathjax } do_check() { diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template index 97ed737c2c561e..47d681f66d75bd 100644 --- a/srcpkgs/horizon/template +++ b/srcpkgs/horizon/template @@ -1,14 +1,14 @@ # Template file for 'horizon' pkgname=horizon version=2.5.0 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="GOLD=" make_install_target="install install-man" make_use_env=yes hostmakedepends="pkg-config glib-devel" makedepends="cairomm-devel librsvg-devel sqlite-devel - glm libgit2-devel libcurl-devel occt-devel cppzmq libpodofo-devel libzip-devel + glm libgit2-devel libcurl-devel occt-devel cppzmq libpodofo0.9.7-devel libzip-devel gtkmm-devel libepoxy-devel libsodium-devel libarchive-devel libspnav-devel" short_desc="Free EDA package" maintainer="Érico Nogueira " diff --git a/srcpkgs/krename/patches/podofo-0.10.patch b/srcpkgs/krename/patches/podofo-0.10.patch new file mode 100644 index 00000000000000..4cb7751408d207 --- /dev/null +++ b/srcpkgs/krename/patches/podofo-0.10.patch @@ -0,0 +1,107 @@ +From 056d614dc2166cd25749caf264b1b4d9d348f4d4 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Mon, 17 Jul 2023 20:29:37 +0000 +Subject: [PATCH] Support podofo 0.10 + +Version 0.10 of podofo is a complete rewrite. krename's use of it is minimal, so porting is easy. + +Switch the cmake module to use pkgconfig, which is available since 0.9.5 (release in 2017). + +Unfortunately, the hack to find the version number is still needed, since the pc file is buggy and ships an empty "Version" field. +--- + cmake/modules/FindPoDoFo.cmake | 31 +++++++++++++++---------------- + src/podofoplugin.cpp | 20 ++++++++++++++++++++ + 2 files changed, 35 insertions(+), 16 deletions(-) + +--- a/cmake/modules/FindPoDoFo.cmake ++++ b/cmake/modules/FindPoDoFo.cmake +@@ -36,15 +36,8 @@ + # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-find_path(PoDoFo_INCLUDE_DIRS +- NAMES podofo/podofo.h +-) +-find_library(PoDoFo_LIBRARIES +- NAMES libpodofo podofo +-) +- +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(PoDoFo DEFAULT_MSG PoDoFo_LIBRARIES PoDoFo_INCLUDE_DIRS) ++include(FindPkgConfig) ++pkg_search_module(PoDoFo libpodofo libpodofo-0) + + set(PoDoFo_DEFINITIONS) + if(PoDoFo_FOUND) +@@ -61,17 +54,19 @@ if(PoDoFo_FOUND) + endif() + endif() + +- # PoDoFo-0.9.5 unconditionally includes openssl/opensslconf.h in a public +- # header. The fix is in https://sourceforge.net/p/podofo/code/1830/ and will +- # hopefully be released soon with 0.9.6. Note that krename doesn't use +- # OpenSSL in any way. +- file(STRINGS "${PoDoFo_INCLUDE_DIRS}/podofo/base/podofo_config.h" PoDoFo_MAJOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+[0-9]+$") +- file(STRINGS "${PoDoFo_INCLUDE_DIRS}/podofo/base/podofo_config.h" PoDoFo_MINOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MINOR[ \t]+[0-9]+$") +- file(STRINGS "${PoDoFo_INCLUDE_DIRS}/podofo/base/podofo_config.h" PoDoFo_PATCH_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_PATCH[ \t]+[0-9]+$") ++ find_file(PoDoFo_CONFIG podofo_config.h PATHS ${PoDoFo_INCLUDE_DIRS} PATH_SUFFIXES auxiliary base) ++ file(STRINGS "${PoDoFo_CONFIG}" PoDoFo_MAJOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+[0-9]+$") ++ file(STRINGS "${PoDoFo_CONFIG}" PoDoFo_MINOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MINOR[ \t]+[0-9]+$") ++ file(STRINGS "${PoDoFo_CONFIG}" PoDoFo_PATCH_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_PATCH[ \t]+[0-9]+$") + string(REGEX REPLACE "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+([0-9]+)$" "\\1" PoDoFo_MAJOR_VER "${PoDoFo_MAJOR_VER_LINE}") + string(REGEX REPLACE "^#define[ \t]+PODOFO_VERSION_MINOR[ \t]+([0-9]+)$" "\\1" PoDoFo_MINOR_VER "${PoDoFo_MINOR_VER_LINE}") + string(REGEX REPLACE "^#define[ \t]+PODOFO_VERSION_PATCH[ \t]+([0-9]+)$" "\\1" PoDoFo_PATCH_VER "${PoDoFo_PATCH_VER_LINE}") + set(PoDoFo_VERSION "${PoDoFo_MAJOR_VER}.${PoDoFo_MINOR_VER}.${PoDoFo_PATCH_VER}") ++ ++ # PoDoFo-0.9.5 unconditionally includes openssl/opensslconf.h in a public ++ # header. The fix is in https://sourceforge.net/p/podofo/code/1830/ and will ++ # hopefully be released soon with 0.9.6. Note that krename doesn't use ++ # OpenSSL in any way. + if(PoDoFo_VERSION VERSION_EQUAL "0.9.5") + find_package(OpenSSL) + if (OpenSSL_FOUND) +@@ -84,4 +79,8 @@ if(PoDoFo_FOUND) + endif() + endif() + ++if(PoDoFo_VERSION VERSION_GREATER_EQUAL 0.10.0) ++ set(CMAKE_CXX_STANDARD 17) ++endif() ++ + mark_as_advanced(PoDoFo_INCLUDE_DIRS PoDoFo_LIBRARIES PoDoFo_DEFINITIONS) +--- a/src/podofoplugin.cpp ++++ b/src/podofoplugin.cpp +@@ -61,6 +61,25 @@ QString PodofoPlugin::processFile(BatchR + try { + PdfMemDocument doc; + doc.Load(filename.toUtf8().data()); ++#if (PODOFO_VERSION_MINOR>=10 || PODOFO_VERSION_MAJOR>=1) ++ const PdfInfo *info = doc.GetInfo(); ++ ++ if (token == "pdfauthor") { ++ return info->GetAuthor().has_value() ? QString::fromUtf8(info->GetAuthor()->GetString().c_str()) : QString(); ++ } else if (token == "pdfcreator") { ++ return info->GetCreator().has_value() ? QString::fromUtf8(info->GetCreator()->GetString().c_str()) : QString(); ++ } else if (token == "pdfkeywords") { ++ return info->GetKeywords().has_value() ? QString::fromUtf8(info->GetKeywords()->GetString().c_str()) : QString(); ++ } else if (token == "pdfsubject") { ++ return info->GetSubject().has_value() ? QString::fromUtf8(info->GetSubject()->GetString().c_str()) : QString(); ++ } else if (token == "pdftitle") { ++ return info->GetTitle().has_value() ? QString::fromUtf8(info->GetTitle()->GetString().c_str()) : QString(); ++ } else if (token == "pdfproducer") { ++ return info->GetProducer().has_value() ? QString::fromUtf8(info->GetProducer()->GetString().c_str()) : QString(); ++ } else if (token == "pdfpages") { ++ return QString::number(doc.GetPages().GetCount()); ++ } ++#else + PdfInfo *info = doc.GetInfo(); + + if (token == "pdfauthor") { +@@ -78,6 +97,7 @@ QString PodofoPlugin::processFile(BatchR + } else if (token == "pdfpages") { + return QString::number(doc.GetPageCount()); + } ++#endif + } catch (PdfError &error) { + return QString::fromUtf8(error.what()); + } diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template index df5535007714a4..2c4486a763144b 100644 --- a/srcpkgs/krename/template +++ b/srcpkgs/krename/template @@ -1,7 +1,7 @@ # Template file for 'krename' pkgname=krename version=5.0.2 -revision=2 +revision=3 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake" makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel diff --git a/srcpkgs/libpodofo0.9.7-devel b/srcpkgs/libpodofo0.9.7-devel new file mode 120000 index 00000000000000..4e2b28da11e227 --- /dev/null +++ b/srcpkgs/libpodofo0.9.7-devel @@ -0,0 +1 @@ +libpodofo0.9.7 \ No newline at end of file diff --git a/srcpkgs/libpodofo0.9.7/template b/srcpkgs/libpodofo0.9.7/template new file mode 100644 index 00000000000000..c49e8ebd7507e6 --- /dev/null +++ b/srcpkgs/libpodofo0.9.7/template @@ -0,0 +1,26 @@ +# Template file for 'libpodofo0.9.7' +pkgname=libpodofo0.9.7 +version=0.9.7 +revision=1 +build_style=cmake +configure_args="-DPODOFO_BUILD_SHARED=TRUE -DPODOFO_BUILD_LIB_ONLY=TRUE" +makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel" +short_desc="Library to work with the PDF file format" +maintainer="Andrea Brancaleoni " +license="LGPL-2.1-or-later" +homepage="https://github.com/podofo/podofo" +distfiles="https://github.com/podofo/podofo/archive/refs/tags/${version}.tar.gz" +checksum=42d7eaa3c8ffabf001121447830343c4362e562d0f12192b033a393f334a64a6 +disable_parallel_build=yes +replaces="libpodofo<=${version}_999" +provides="libpodofo-${version}_${revision}" + +libpodofo0.9.7-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}-${version}_${revision}" + conflicts="libpodofo-devel>=0" + pkg_install() { + vmove usr/include + vmove usr/lib/*.so + } +} diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template index b4537db37e1ea7..c4eda21f6ec900 100644 --- a/srcpkgs/podofo/template +++ b/srcpkgs/podofo/template @@ -1,17 +1,27 @@ # Template file for 'podofo' pkgname=podofo -version=0.9.7 -revision=4 +version=0.10.3 +revision=1 build_style=cmake -configure_args="-DPODOFO_BUILD_SHARED=TRUE" -makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel" +configure_args="-DPODOFO_BUILD_STATIC=FALSE -DPODOFO_BUILD_TOOLS=TRUE + -DPODOFO_BUILD_TEST=TRUE" +hostmakedepends="pkg-config" +makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel + libxml2-devel zlib-devel libjpeg-turbo-devel libpng-devel freetype-devel" short_desc="Library to work with the PDF file format" maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/podofo/podofo" distfiles="https://github.com/podofo/podofo/archive/refs/tags/${version}.tar.gz" -checksum=42d7eaa3c8ffabf001121447830343c4362e562d0f12192b033a393f334a64a6 -disable_parallel_build=yes +checksum=4be2232643f9e9dd7fbb02894d5a0394c3ca2826aab179654c2cc751074825ec +# disable_parallel_build=yes + +post_install() { + local _f + for _f in man/*.1; do + vman "$_f" + done +} libpodofo_package() { replaces="podofo<0.9.3_1" @@ -26,6 +36,8 @@ libpodofo-devel_package() { depends="libpodofo-${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.so + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + vmove "usr/share/podofo/*.cmake" } } diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template index 22630f13681918..3138a842546afa 100644 --- a/srcpkgs/scribus/template +++ b/srcpkgs/scribus/template @@ -1,7 +1,7 @@ # Template file for 'scribus' pkgname=scribus version=1.5.8 -revision=11 +revision=12 build_style=cmake configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON" @@ -9,7 +9,7 @@ hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3" makedepends="qt5-devel qt5-tools-devel zlib-devel cairo-devel lcms2-devel cups-devel libxml2-devel hyphen-devel ghostscript-devel boost-devel hunspell-devel poppler-cpp-devel python3-devel harfbuzz-devel - libgraphicsmagick-devel libpodofo-devel libpagemaker-devel libqxp-devel + libgraphicsmagick-devel libpodofo0.9.7-devel libpagemaker-devel libqxp-devel libmspub-devel libcdr-devel libfreehand-devel libvisio-devel" depends="ghostscript" short_desc="Open Source DTP (Desktop Publishing) application"