CVS commit: pkgsrc/editors/xournalpp

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jul  6 14:33:22 UTC 2026

Modified Files:
        pkgsrc/editors/xournalpp: Makefile PLIST distinfo
Added Files:
        pkgsrc/editors/xournalpp/patches: patch-man_CMakeLists.txt

Log Message:
xournalpp: updated to 1.3.5

1.3.5

This is a new minor version of Xournal++ with bug fixes and improvements from the community.

Fixed crash when exiting after playing sound
Fixed some button-to-tools configuration issues
Fixed crash involving page background selection
Added multidevice support for X11 palm rejection
Reduced PDF cache retention for off-screen pages
Fixed moving display when selecting "Fit to Screen"
Fixed disabled "Merge layer" menu entry
Fixed a concurrency crash when using layers
Improved setting up environment on MacOS
Fixed typos in some displayed strings
Fixed "Missing background" display when missing PDF page
Bumped dependency versions on MacOS and Windows
Added Georgian translations
Updated translations


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 pkgsrc/editors/xournalpp/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/editors/xournalpp/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/editors/xournalpp/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/xournalpp/patches/patch-man_CMakeLists.txt

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.100 pkgsrc/editors/xournalpp/Makefile:1.101
--- pkgsrc/editors/xournalpp/Makefile:1.100     Wed Jun 24 21:58:37 2026
+++ pkgsrc/editors/xournalpp/Makefile   Mon Jul  6 14:33:22 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.100 2026/06/24 21:58:37 wiz Exp $
+# $NetBSD: Makefile,v 1.101 2026/07/06 14:33:22 adam Exp $
 
-DISTNAME=      xournalpp-1.3.3
-PKGREVISION=   3
+DISTNAME=      xournalpp-1.3.5
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=xournalpp/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,17 +10,16 @@ HOMEPAGE=   https://github.com/xournalpp/x
 COMMENT=       Take notes, sketch and annotate PDFs
 LICENSE=       gnu-gpl-v2
 
-USE_TOOLS+=    pkg-config
-USE_TOOLS+=    msgfmt msgmerge xgettext
-USE_LANGUAGES= c c++
-
-BUILD_TARGET=          translations xournalpp
-CMAKE_CONFIGURE_ARGS+= -DPKGSRC_CMAKE_MODS=${BUILDLINK_DIR}/cmake-Modules
-CMAKE_REQD+=           3.18
+USE_CXX_FEATURES=      c++17 filesystem
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            msgfmt msgmerge pkg-config xgettext
 
-USE_CXX_FEATURES+=     c++17 filesystem
 # downloads files during configure stage
 CMAKE_CONFIGURE_ARGS+= -DENABLE_CPPTRACE=OFF
+# Always install desktop file for consistent PLIST.
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DESKTOP_FILES=ON
+# Let PkgSrc handle man page compression.
+CMAKE_CONFIGURE_ARGS+= -DMAN_COMPRESS=OFF
 
 TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man
 DEPENDS+=      tex-amsfonts-[0-9]*:../../fonts/tex-amsfonts
@@ -30,16 +28,11 @@ DEPENDS+=   tex-latex-[0-9]*:../../print/t
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=      tex-standalone-[0-9]*:../../print/tex-standalone
 
-INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
-
-post-install:
-       ${MV} ${DESTDIR}${PREFIX}/share/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 || ${TRUE}
-
-.include "../../devel/cmake/build.mk"
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/portaudio/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/adwaita-icon-theme/buildlink3.mk"
@@ -48,12 +41,10 @@ post-install:
 .include "../../lang/lua54/buildlink3.mk"
 BUILDLINK_API_DEPENDS.poppler+=        poppler>=23.12.0
 .include "../../print/poppler/buildlink3.mk"
+.include "../../print/poppler-cpp/buildlink3.mk"
 .include "../../print/qpdf/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/gtksourceview4/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/editors/xournalpp/PLIST
diff -u pkgsrc/editors/xournalpp/PLIST:1.8 pkgsrc/editors/xournalpp/PLIST:1.9
--- pkgsrc/editors/xournalpp/PLIST:1.8  Mon Feb  9 22:55:41 2026
+++ pkgsrc/editors/xournalpp/PLIST      Mon Jul  6 14:33:22 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2026/02/09 22:55:41 yhardy Exp $
+@comment $NetBSD: PLIST,v 1.9 2026/07/06 14:33:22 adam Exp $
 bin/xournalpp
 bin/xournalpp-thumbnailer
 bin/xournalpp-wrapper
@@ -32,6 +32,7 @@ share/locale/hu/LC_MESSAGES/xournalpp.mo
 share/locale/id/LC_MESSAGES/xournalpp.mo
 share/locale/it/LC_MESSAGES/xournalpp.mo
 share/locale/ja/LC_MESSAGES/xournalpp.mo
+share/locale/ka_GE/LC_MESSAGES/xournalpp.mo
 share/locale/ko/LC_MESSAGES/xournalpp.mo
 share/locale/ml_IN/LC_MESSAGES/xournalpp.mo
 share/locale/nl/LC_MESSAGES/xournalpp.mo

Index: pkgsrc/editors/xournalpp/distinfo
diff -u pkgsrc/editors/xournalpp/distinfo:1.24 pkgsrc/editors/xournalpp/distinfo:1.25
--- pkgsrc/editors/xournalpp/distinfo:1.24      Thu Mar 12 21:21:50 2026
+++ pkgsrc/editors/xournalpp/distinfo   Mon Jul  6 14:33:22 2026
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.24 2026/03/12 21:21:50 yhardy Exp $
+$NetBSD: distinfo,v 1.25 2026/07/06 14:33:22 adam Exp $
 
-BLAKE2s (xournalpp-1.3.3.tar.gz) = 3c52b23261e18d5185366fe24745d1e048d19e0e1475394c1f0fba405b971bc4
-SHA512 (xournalpp-1.3.3.tar.gz) = d93e05c073495e31fac128b88b44772286fe312df1b1eef8fbd79e71e5d4859f2733d667eaa653b4d550660f7de7a99ebe2c51466b73b949d29b4c86c6744733
-Size (xournalpp-1.3.3.tar.gz) = 17164254 bytes
+BLAKE2s (xournalpp-1.3.5.tar.gz) = 6c4df24129a5d90e85ca5190ce2d02dccd6d72ac3cb673e41346f84d3d362101
+SHA512 (xournalpp-1.3.5.tar.gz) = 0906cbf40ec9b12493c1b021ca3dd7fa123934b4cd97a36a78960d3af38fbec25b8097a9d9a1610e392132caeac40e34065b87b769872f93afa999b08ac8724d
+Size (xournalpp-1.3.5.tar.gz) = 17193152 bytes
 SHA1 (patch-CMakeLists.txt) = ce6d76c6f07c895045c6df6740dcceae7689e4b8
+SHA1 (patch-man_CMakeLists.txt) = 359c78c296c6bf0c6ba45dd98736b43fda66c520
 SHA1 (patch-po_CMakeLists.txt) = a682febd9205ad54b56bcf4ca46c984d32446d2b
 SHA1 (patch-src_core_control_DeviceListHelper.cpp) = 069fae3eb58798406e4fa8dbff0d02aa8e0a27ef
 SHA1 (patch-src_core_control_settings_Settings.cpp) = 19cf2b2ceedc3d59c0290ea81727cb0c27e02ba5

Added files:

Index: pkgsrc/editors/xournalpp/patches/patch-man_CMakeLists.txt
diff -u /dev/null pkgsrc/editors/xournalpp/patches/patch-man_CMakeLists.txt:1.1
--- /dev/null   Mon Jul  6 14:33:22 2026
+++ pkgsrc/editors/xournalpp/patches/patch-man_CMakeLists.txt   Mon Jul  6 14:33:22 2026
@@ -0,0 +1,33 @@
+$NetBSD: patch-man_CMakeLists.txt,v 1.1 2026/07/06 14:33:22 adam Exp $
+
+Install man pages on Darwin.
+Use proper path for man pages.
+
+--- man/CMakeLists.txt.orig    2026-07-06 13:59:22.316035582 +0000
++++ man/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 3.12)
+ cmake_policy(VERSION 3.12)
+ 
+-if (WIN32 OR APPLE)
++if (WIN32)
+   # Windows does not support man pages and has no thumbnailer like this
+   # MacOS does not have help2man so no man pages can be generated
+   return ()
+@@ -38,7 +38,7 @@ if(WITH_MAN)
+ 
+   if (NOT MAN_COMPRESS)
+     add_custom_target(manpage ALL DEPENDS ${MAN_PAGE} ${MAN_PAGE_THUMB})
+-    install(FILES ${MAN_PAGE} ${MAN_PAGE_THUMB} DESTINATION "share/man/man1")
++    install(FILES ${MAN_PAGE} ${MAN_PAGE_THUMB} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+   else()
+     set(MAN_FILE "${MAN_PAGE}.gz")
+     set(MAN_FILE_THUMB "${MAN_PAGE_THUMB}.gz")
+@@ -50,6 +50,6 @@ if(WITH_MAN)
+     )
+ 
+     add_custom_target(manpage ALL DEPENDS ${MAN_FILE} ${MAN_FILE_THUMB})
+-    install(FILES ${MAN_FILE} ${MAN_FILE_THUMB} DESTINATION "share/man/man1")
++    install(FILES ${MAN_FILE} ${MAN_FILE_THUMB} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+   endif()
+ endif()