From 520b89997a644de4554a75245277604c01bb4efe Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 19 Jul 2021 20:54:47 +0300 Subject: [PATCH] xournalpp: update to 1.1.0. Also: - add libsrvg-devel (new dependency) - add lua53-devel (plugins dep - @tornaria) - add help2man to hostmakedepends ( man page - @tornaria) - remove virtual?tex - remove INSTALL.msg - add patch by @tornaria to load plugins from the users home dir. --- srcpkgs/xournalpp/INSTALL.msg | 4 ---- srcpkgs/xournalpp/patches/plugin-path.patch | 19 +++++++++++++++++++ srcpkgs/xournalpp/template | 11 +++++++---- 3 files changed, 26 insertions(+), 8 deletions(-) delete mode 100644 srcpkgs/xournalpp/INSTALL.msg create mode 100644 srcpkgs/xournalpp/patches/plugin-path.patch diff --git a/srcpkgs/xournalpp/INSTALL.msg b/srcpkgs/xournalpp/INSTALL.msg deleted file mode 100644 index 9a713b91602f..000000000000 --- a/srcpkgs/xournalpp/INSTALL.msg +++ /dev/null @@ -1,4 +0,0 @@ - You need to install the standalone package to use LaTeX with - xournalpp. The following command will install it (needs root privileges). - - 'tlmgr install standalone' diff --git a/srcpkgs/xournalpp/patches/plugin-path.patch b/srcpkgs/xournalpp/patches/plugin-path.patch new file mode 100644 index 000000000000..9b1dca128446 --- /dev/null +++ b/srcpkgs/xournalpp/patches/plugin-path.patch @@ -0,0 +1,19 @@ +Temporary patch to load plugins from $CONFIG_FOLDER/plugins/, +usually $HOME/.config/xournalpp/plugins/ + +Otherwise, the only way to load plugins is to place them in the +system directory /usr/share/xournalpp/plugins. + +A more general approach for plugin paths is planned, see +https://github.com/xournalpp/xournalpp/issues/1155#issuecomment-623234420 + +--- a/src/plugin/PluginController.cpp 2021-03-14 00:26:17.633925344 -0300 ++++ b/src/plugin/PluginController.cpp 2021-03-14 00:27:08.487299784 -0300 +@@ -15,6 +15,7 @@ + PluginController::PluginController(Control* control): control(control) { + #ifdef ENABLE_PLUGINS + auto searchPath = control->getGladeSearchPath()->getFirstSearchPath(); ++ loadPluginsFrom(Util::getConfigSubfolder("plugins")); + loadPluginsFrom((searchPath /= "../plugins").lexically_normal()); + #endif + } diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template index 1f75e7e93eda..0ed6e76a3ac8 100644 --- a/srcpkgs/xournalpp/template +++ b/srcpkgs/xournalpp/template @@ -1,19 +1,22 @@ # Template file for 'xournalpp' pkgname=xournalpp -version=1.0.20 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config gettext" makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-devel - portaudio-cpp-devel libsndfile-devel libzip-devel" -depends="virtual?tex" + portaudio-cpp-devel libsndfile-devel libzip-devel librsvg-devel lua53-devel" short_desc="Handwriting Notetaking software with PDF annotation support" maintainer="mobinmob " license="GPL-2.0-or-later" homepage="https://github.com/xournalpp/xournalpp" changelog="https://raw.githubusercontent.com/xournalpp/xournalpp/master/CHANGELOG.md" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" -checksum=1abf9925f11f0944c8142194be3e72541e230afa83490b074f5c6e613b0e2a02 +checksum=31b99282bcd1d829f05f1c9ccd07c5d599acc0e69725d135cdc97e1dcaf2baee + +if [ -z "$CROSS_BUILD" ]; then + hostmakedepends+=" help2man" +fi case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libexecinfo-devel"