[PR PATCH] xournalpp: update to 1.2.0.

[PR PATCH] xournalpp: update to 1.2.0.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

There is a new pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages xournalpp
https://github.com/void-linux/void-packages/pull/45359

xournalpp: update to 1.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/45359.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xournalpp-45359.patch --]
[-- Type: text/x-diff, Size: 4232 bytes --]

From f3468be291a9141590909665e7cc832c06e34554 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 31 Jul 2023 21:12:16 +0300
Subject: [PATCH] xournalpp: update to 1.2.0.

---
 .../xournalpp/patches/0001-backtrace.patch    | 24 +++++++++++++++++++
 srcpkgs/xournalpp/patches/backtrace.patch     | 10 --------
 srcpkgs/xournalpp/patches/plugin-path.patch   | 19 ---------------
 srcpkgs/xournalpp/template                    |  4 ++--
 4 files changed, 26 insertions(+), 31 deletions(-)
 create mode 100644 srcpkgs/xournalpp/patches/0001-backtrace.patch
 delete mode 100644 srcpkgs/xournalpp/patches/backtrace.patch
 delete mode 100644 srcpkgs/xournalpp/patches/plugin-path.patch

diff --git a/srcpkgs/xournalpp/patches/0001-backtrace.patch b/srcpkgs/xournalpp/patches/0001-backtrace.patch
new file mode 100644
index 0000000000000..da7e56f4b185d
--- /dev/null
+++ b/srcpkgs/xournalpp/patches/0001-backtrace.patch
@@ -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
+
diff --git a/srcpkgs/xournalpp/patches/backtrace.patch b/srcpkgs/xournalpp/patches/backtrace.patch
deleted file mode 100644
index ce896c015d5cd..0000000000000
--- a/srcpkgs/xournalpp/patches/backtrace.patch
+++ /dev/null
@@ -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})
diff --git a/srcpkgs/xournalpp/patches/plugin-path.patch b/srcpkgs/xournalpp/patches/plugin-path.patch
deleted file mode 100644
index 9b1dca1284469..0000000000000
--- a/srcpkgs/xournalpp/patches/plugin-path.patch
+++ /dev/null
@@ -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
- }
diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template
index 8a103521f9aa8..f8b8d8c16f836 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -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"

Re: [PR PATCH] [Merged]: xournalpp: update to 1.2.0.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]

There's a merged pull request on the void-packages repository

xournalpp: update to 1.2.0.
https://github.com/void-linux/void-packages/pull/45359

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->