CVS commit: pkgsrc/editors/xournalpp

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Oct 18 20:38:24 UTC 2024

Modified Files:
        pkgsrc/editors/xournalpp: Makefile distinfo
Added Files:
        pkgsrc/editors/xournalpp/patches: patch-src_core_view_TexImageView.cpp

Log Message:
xournalpp: fix build with poppler 24.10.0.

pkglint cleanup while here.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/editors/xournalpp/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/editors/xournalpp/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/xournalpp/patches/patch-src_core_view_TexImageView.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/xournalpp/Makefile
diff -u pkgsrc/editors/xournalpp/Makefile:1.70 pkgsrc/editors/xournalpp/Makefile:1.71
--- pkgsrc/editors/xournalpp/Makefile:1.70      Tue Oct 15 16:15:33 2024
+++ pkgsrc/editors/xournalpp/Makefile   Fri Oct 18 20:38:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2024/10/15 16:15:33 adam Exp $
+# $NetBSD: Makefile,v 1.71 2024/10/18 20:38:24 wiz Exp $
 
 DISTNAME=      xournalpp-1.2.3
 PKGREVISION=   6
@@ -15,7 +15,7 @@ USE_TOOLS+=   pkg-config
 USE_TOOLS+=    msgfmt msgmerge xgettext
 USE_LANGUAGES= c c++
 
-BUILD_TARGET=  translations xournalpp
+BUILD_TARGET=          translations xournalpp
 CMAKE_CONFIGURE_ARGS+= -DPKGSRC_CMAKE_MODS=${BUILDLINK_DIR}/cmake-Modules
 
 USE_CXX_FEATURES+=     c++17 filesystem

Index: pkgsrc/editors/xournalpp/distinfo
diff -u pkgsrc/editors/xournalpp/distinfo:1.15 pkgsrc/editors/xournalpp/distinfo:1.16
--- pkgsrc/editors/xournalpp/distinfo:1.15      Sun Mar  3 11:32:40 2024
+++ pkgsrc/editors/xournalpp/distinfo   Fri Oct 18 20:38:24 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2024/03/03 11:32:40 wiz Exp $
+$NetBSD: distinfo,v 1.16 2024/10/18 20:38:24 wiz Exp $
 
 BLAKE2s (xournalpp-1.2.3.tar.gz) = d50e04aaf4c1f7cbed031c50a3c546a76b72584e0084f4513e1746596ab8ee42
 SHA512 (xournalpp-1.2.3.tar.gz) = 17303314d49001f492469d855155a019659cdafc67509d4e176f60a93322f4ee1d4b999e8a25a9a23bde27b878012c06aa11f15bc2a54a730098964053834d1f
@@ -7,3 +7,4 @@ SHA1 (patch-CMakeLists.txt) = 87ba10a924
 SHA1 (patch-po_CMakeLists.txt) = 897b4f9507b48be394409deda8170fe7d39f008c
 SHA1 (patch-src_core_control_DeviceListHelper.cpp) = 069fae3eb58798406e4fa8dbff0d02aa8e0a27ef
 SHA1 (patch-src_core_control_settings_Settings.cpp) = 19cf2b2ceedc3d59c0290ea81727cb0c27e02ba5
+SHA1 (patch-src_core_view_TexImageView.cpp) = b38f4d589d4291e753d66c2d3b0555c86e58ec9f

Added files:

Index: pkgsrc/editors/xournalpp/patches/patch-src_core_view_TexImageView.cpp
diff -u /dev/null pkgsrc/editors/xournalpp/patches/patch-src_core_view_TexImageView.cpp:1.1
--- /dev/null   Fri Oct 18 20:38:24 2024
+++ pkgsrc/editors/xournalpp/patches/patch-src_core_view_TexImageView.cpp       Fri Oct 18 20:38:24 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_core_view_TexImageView.cpp,v 1.1 2024/10/18 20:38:24 wiz Exp $
+
+Compatibility with poppler 24.10.0.
+
+--- src/core/view/TexImageView.cpp.orig        2024-10-18 20:36:17.087214090 +0000
++++ src/core/view/TexImageView.cpp
+@@ -4,9 +4,7 @@
+ 
+ #include <cairo.h>             // for cairo_paint_with_alpha, cairo_scale
+ #include <glib.h>              // for g_warning
+-#include <poppler-document.h>  // for poppler_document_get_n_pages, poppler_...
+-#include <poppler-page.h>      // for poppler_page_render, poppler_page_get_...
+-#include <poppler.h>           // for PopplerPage, PopplerDocument, g_clear_...
++#include <poppler.h>           // for poppler, poppler_...
+ 
+ #include "model/TexImage.h"  // for TexImage
+ #include "view/View.h"       // for Context, OPACITY_NO_AUDIO, view