xournalpp: update to 1.2.0.

This commit is contained in:
mobinmob 2023-07-31 21:12:16 +03:00 committed by Andrew Benson
parent 1fac2dfdff
commit 0a9df126b0
4 changed files with 26 additions and 31 deletions

View file

@ -0,0 +1,24 @@
From 54e48d3e81350b4472aec34f7c59bf6d00c8fe12 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 31 Jul 2023 21:00:19 +0300
Subject: [PATCH] backtrace.patch
---
src/xoj-preview-extractor/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/xoj-preview-extractor/CMakeLists.txt b/src/xoj-preview-extractor/CMakeLists.txt
index a462a40..b08f3cd 100644
--- a/src/xoj-preview-extractor/CMakeLists.txt
+++ b/src/xoj-preview-extractor/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries (xournalpp-thumbnailer
${librsvg_LDFLAGS}
${Glib_LDFLAGS}
${ZIP_LDFLAGS}
+ ${Backtrace_LIBRARIES}
)
target_include_directories (xournalpp-thumbnailer PRIVATE ${librsvg_INCLUDE_DIRS})
--
2.41.0

View file

@ -1,10 +0,0 @@
--- a/src/xoj-preview-extractor/CMakeLists.txt 2022-02-13 16:30:45.000000000 -0300
+++ b/src/xoj-preview-extractor/CMakeLists.txt 2022-02-14 16:03:48.561654740 -0300
@@ -35,6 +35,7 @@
${librsvg_LDFLAGS}
${Glib_LDFLAGS}
${ZIP_LDFLAGS}
+ ${Backtrace_LIBRARIES}
)
target_include_directories (xournalpp-thumbnailer PRIVATE ${librsvg_INCLUDE_DIRS})

View file

@ -1,19 +0,0 @@
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
}

View file

@ -1,6 +1,6 @@
# Template file for 'xournalpp'
pkgname=xournalpp
version=1.1.3
version=1.2.0
revision=1
build_style=cmake
hostmakedepends="pkg-config gettext"
@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
homepage="https://xournalpp.github.io/"
changelog="https://raw.githubusercontent.com/xournalpp/xournalpp/master/CHANGELOG.md"
distfiles="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${version}.tar.gz"
checksum=5021c7a8f53687edb3a759e079c54d23d5918d83f8d1f5fcd08a1da2ce81bd8b
checksum=39e6e9b9c9eee44170a81e05c152e31a83d6a42ac7f8eebf7eea6b752a446377
if [ -z "$CROSS_BUILD" ]; then
hostmakedepends+=" help2man"