Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
libltdl.so.7 libltdl-2.2.6_1
libpoppler.so.161 libpoppler-26.06.0_1
libpoppler.so.162 libpoppler-26.07.0_1
libpoppler-glib.so.8 poppler-glib-0.18.2_1
libpoppler-cpp.so.3 poppler-cpp-26.04.0_1
libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
Expand Down Expand Up @@ -1526,7 +1526,7 @@ libdovecot-storage.so.0 dovecot-2.3.13_3
libdovecot-lda.so.0 dovecot-2.3.13_3
libdovecot-ldap.so.0 dovecot-plugin-ldap-2.4.1r4_1
libKF5Kirigami2.so.5 kirigami2-5.47.0_1
libZXing.so.3 zxing-cpp-2.0.0_1
libZXing.so.4 zxing-cpp-3.0.2_1
libfreerdp-client3.so.3 libfreerdp-3.22.0_1
libfreerdp-server-proxy3.so.3 libfreerdp-server-3.22.0_1
libfreerdp-server3.so.3 libfreerdp-server-3.22.0_1
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/calligra/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=26.04.1
revision=2
revision=3
build_style=cmake
configure_args="-DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/extra-cmake-modules/patches/cross-shiboken.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/modules/ECMGeneratePythonBindings.cmake
+++ b/modules/ECMGeneratePythonBindings.cmake
@@ -124,13 +124,30 @@ function(ecm_generate_python_bindings)
@@ -126,13 +126,30 @@ function(ecm_generate_python_bindings)
endforeach()

# Set up the options to pass to shiboken.
Expand Down
10 changes: 5 additions & 5 deletions srcpkgs/extra-cmake-modules/patches/cross.patch
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fallback will be used should `Qt6<Module>` is not available.
Qt6ToolsTools
--- a/modules/ECMAddQch.cmake
+++ b/modules/ECMAddQch.cmake
@@ -458,6 +458,7 @@ function(ecm_add_qch target_name)
@@ -460,6 +460,7 @@ function(ecm_add_qch target_name)
DESCRIPTION "Part of Qt5 tools"
)
else()
Expand All @@ -50,7 +50,7 @@ fallback will be used should `Qt6<Module>` is not available.
TYPE REQUIRED
--- a/modules/ECMFindQmlModule.cmake.in
+++ b/modules/ECMFindQmlModule.cmake.in
@@ -52,6 +52,7 @@ endif()
@@ -54,6 +54,7 @@ endif()
# If we haven't checked the version above, use qmlplugindump
if (NOT CMAKE_CROSSCOMPILING AND NOT MODULE_NOTFOUND AND NOT @GENMODULE@_FOUND AND (NOT DEFINED QT6_IS_SHARED_LIBS_BUILD OR QT6_IS_SHARED_LIBS_BUILD))
if (QT_MAJOR_VERSION EQUAL "6")
Expand All @@ -60,7 +60,7 @@ fallback will be used should `Qt6<Module>` is not available.
else()
--- a/modules/ECMGenerateQDoc.cmake
+++ b/modules/ECMGenerateQDoc.cmake
@@ -55,7 +55,7 @@ add_custom_target(generate_qch)
@@ -57,7 +57,7 @@ add_custom_target(generate_qch)
add_custom_target(install_qch_docs)

function(ecm_generate_qdoc target qdocconf_file)
Expand All @@ -71,7 +71,7 @@ fallback will be used should `Qt6<Module>` is not available.
if (NOT Qt6Tools_FOUND OR NOT Qt6ToolsTools_FOUND)
--- a/modules/ECMPoQmTools.cmake
+++ b/modules/ECMPoQmTools.cmake
@@ -150,6 +150,7 @@ function(ecm_process_po_files_as_qm lang
@@ -152,6 +152,7 @@ function(ecm_process_po_files_as_qm lang
if (QT_MAJOR_VERSION EQUAL "5")
find_package(Qt5LinguistTools CONFIG REQUIRED)
else()
Expand All @@ -81,7 +81,7 @@ fallback will be used should `Qt6<Module>` is not available.

--- a/modules/ECMQueryQt.cmake
+++ b/modules/ECMQueryQt.cmake
@@ -56,6 +56,7 @@ if (QT_MAJOR_VERSION STREQUAL "5")
@@ -58,6 +58,7 @@ if (QT_MAJOR_VERSION STREQUAL "5")
endif()
elseif(QT_MAJOR_VERSION STREQUAL "6")
# QUIET to accommodate the TRY option
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/extra-cmake-modules/patches/musl.patch
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>

--- a/kde-modules/KDECompilerSettings.cmake
+++ b/kde-modules/KDECompilerSettings.cmake
@@ -322,6 +322,9 @@ if (UNIX)
@@ -331,6 +331,9 @@ if (UNIX)
# implementation recognize it?
_kde_add_platform_definitions(-D_LARGEFILE64_SOURCE)

Expand Down
6 changes: 3 additions & 3 deletions srcpkgs/extra-cmake-modules/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'extra-cmake-modules'
pkgname=extra-cmake-modules
version=6.25.0
revision=2
version=6.27.0
revision=1
build_style=cmake
configure_args="-DBUILD_HTML_DOCS=ON -DBUILD_TESTING=ON"
hostmakedepends="python3-Sphinx qt6-tools qt6-base qt6-plugin-sqlite"
Expand All @@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="BSD-3-Clause"
homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=ffeb4951bf09b2b8ee17ef24a28b6de650c0db0f59ddffb9009b37cac63af348
checksum=f3b5af578017a6a0f127fb1c31609db2e4f016e99b900d5a11f6ffb6c55006a3
python_version=3

do_check() {
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/fim/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'fim'
pkgname=fim
version=0.7.1
revision=8
revision=9
build_style=gnu-configure
configure_args="--enable-poppler"
make_check_args="-j1"
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/gpgme-qt6/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'gpgme-qt6'
pkgname=gpgme-qt6
version=2.0.0
version=2.2.0
revision=1
build_style=cmake
hostmakedepends="gnupg pkg-config qt5-host-tools qt5-qmake qt6-base"
Expand All @@ -13,7 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.gnupg.org/software/gpgme/index.html"
changelog="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgmeqt.git;a=blob_plain;f=NEWS;hb=HEAD"
distfiles="https://www.gnupg.org/ftp/gcrypt/qgpgme/qgpgme-${version}.tar.xz"
checksum=15645b2475cca6118eb2ed331b3a8d9442c9d4019c3846ba3f6d25321b4a61ad
checksum=3c6290ff5bfeab981bb48b2951703761f1dbea640cb637beb3560d5fefb0e0b3

gpgmeqt_package() {
short_desc="GnuPG Made Easy - Qt5 binding"
Expand Down
1 change: 1 addition & 0 deletions srcpkgs/gpgme-qt6/update
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
site="https://www.gnupg.org/ftp/gcrypt/qgpgme/"
pkgname=qgpgme
4 changes: 2 additions & 2 deletions srcpkgs/gpgme/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'gpgme'
pkgname=gpgme
version=2.0.1
version=2.1.2
revision=1
build_style=gnu-configure
build_helper="python3"
Expand All @@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.gnupg.org/software/gpgme/index.html"
changelog="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob_plain;f=NEWS;hb=HEAD"
distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
checksum=821ab0695c842eab51752a81980c92b0410c7eadd04103f791d5d2a526784966
checksum=0687a95b299871c4141f507c0f740de6b429c9ac067d0fa4e062e3264df5fb77
CFLAGS="-D_LARGEFILE64_SOURCE"

if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/gpgmepp/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'gpgmepp'
pkgname=gpgmepp
version=2.0.0
version=2.1.0
revision=1
build_style=cmake
configure_args="-DENABLE_TESTING=ON"
Expand All @@ -12,7 +12,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.gnupg.org/software/gpgme/index.html"
changelog="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgmepp.git;a=blob_plain;f=ChangeLog;hb=HEAD"
distfiles="https://www.gnupg.org/ftp/gcrypt/gpgmepp/gpgmepp-${version}.tar.xz"
checksum=d4796049c06708a26f3096f748ef095347e1a3c1e570561701fe952c3f565382
checksum=57f804468f0204504b172c6b139cb05124b4263be7ad514932c7c4c5062a16e2

gpgmepp-devel_package() {
depends="${sourcepkg}>=${version}_${revision} $makedepends"
Expand Down
7 changes: 1 addition & 6 deletions srcpkgs/inkscape/patches/musl-ext-translations.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ Fixes https://gitlab.com/inkscape/inkscape/-/work_items/6126
src/extension/extension.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 47f3eca72f..b6ce3778e2 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -468,7 +468,7 @@ void Extension::lookup_translation_catalog() {
@@ -468,7 +468,7 @@ void Extension::lookup_translation_catal
// register catalog with gettext if found, disable translation for this extension otherwise
if (!_gettext_catalog_dir.empty()) {
char const *current_dir = bindtextdomain(_translationdomain, nullptr);
Expand All @@ -25,6 +23,3 @@ index 47f3eca72f..b6ce3778e2 100644
g_info("Binding textdomain '%s' to '%s'.", _translationdomain, _gettext_catalog_dir.c_str());
bindtextdomain(_translationdomain, _gettext_catalog_dir.c_str());
bind_textdomain_codeset(_translationdomain, "UTF-8");
--
GitLab

104 changes: 104 additions & 0 deletions srcpkgs/inkscape/patches/poppler_26.00.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 7b5e0ecb1db7aaa062fe0c9c2b0ee5476ada1329..45df931f00ea462c70ec78e1236ed4c383172eab 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -33,6 +33,7 @@
#include <poppler/glib/poppler.h>
#include <poppler/glib/poppler-document.h>
#include <poppler/glib/poppler-page.h>
+#include <poppler/goo/gmem.h>
#endif

#include <gdkmm/general.h>
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 6c78247dfbd21e3680dcac1396cfdda470d7995e..8b2e6f3d54341273eac5630ad95bc927d3519b7b 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -32,6 +32,7 @@
#include <poppler/GfxState.h>
#include <poppler/Page.h>
#include <poppler/Stream.h>
+#include <poppler/goo/gmem.h>

#include "color.h"
#include "color/cms-util.h"
@@ -2093,7 +2094,11 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height
} else {
image_stream = new ImageStream(str, width, 1, 1);
}
+#if POPPLER_CHECK_VERSION(26, 0, 0)
+ image_stream->rewind();
+#else
image_stream->reset();
+#endif

// Convert grayscale values
unsigned char *buffer = new unsigned char[width];
@@ -2119,7 +2124,11 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height
image_stream = new ImageStream(str, width,
color_map->getNumPixelComps(),
color_map->getBits());
+#if POPPLER_CHECK_VERSION(26, 0, 0)
+ image_stream->rewind();
+#else
image_stream->reset();
+#endif

// Convert RGB values
unsigned int *buffer = new unsigned int[width];

From 7e74f51fc097d725dde29fadff5440cc69658172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Faist?= <faist@rexcontrols.cz>
Date: Mon, 2 Feb 2026 17:39:08 +0100
Subject: [PATCH] Fix warning with poppler 26.x.x

---
.../internal/pdfinput/svg-builder.cpp | 24 +++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 8b2e6f3d54..94d4342dc4 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -2095,7 +2095,17 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height
image_stream = new ImageStream(str, width, 1, 1);
}
#if POPPLER_CHECK_VERSION(26, 0, 0)
- image_stream->rewind();
+ if(!image_stream->rewind())
+ {
+ g_warning("ImageStream: Failed to rewind image stream");
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ if (!_embed_images) {
+ fclose(fp);
+ g_free(file_name);
+ }
+ delete image_stream;
+ return nullptr;
+ }
#else
image_stream->reset();
#endif
@@ -2125,7 +2135,17 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height
color_map->getNumPixelComps(),
color_map->getBits());
#if POPPLER_CHECK_VERSION(26, 0, 0)
- image_stream->rewind();
+ if(!image_stream->rewind())
+ {
+ g_warning("ImageStream: Failed to rewind image stream");
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ if (!_embed_images) {
+ fclose(fp);
+ g_free(file_name);
+ }
+ delete image_stream;
+ return nullptr;
+ }
#else
image_stream->reset();
#endif
--
GitLab


Loading
Loading