[PR PATCH] xournalpp: update to 1.1.0.

[PR PATCH] xournalpp: update to 1.1.0.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1743 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/32045

xournalpp: update to 1.1.0.
Also:
- add libsrvg-devel (new dependency)
- replace virtual?tex with texlive-latexextra
- remove INSTALL.msg (latexextra contains standalone).

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32045.patch is attached

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

From 584a197477c154a7120006f25def8cb7213bb286 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 19 Jul 2021 20:54:47 +0300
Subject: [PATCH] xournalpp: update to 1.1.0.

Also:
- add libsrvg-devel (new dependency)
- replace virtual?tex with texlive-latexextra
- remove INSTALL.msg (latexextra contains standalone).
---
 srcpkgs/xournalpp/INSTALL.msg | 4 ----
 srcpkgs/xournalpp/template    | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 srcpkgs/xournalpp/INSTALL.msg

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/template b/srcpkgs/xournalpp/template
index 1f75e7e93eda..bc6ee57e61ab 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -1,19 +1,19 @@
 # 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"
+depends="texlive-latexextra"
 short_desc="Handwriting Notetaking software with PDF annotation support"
 maintainer="mobinmob <mobinmob@disroot.org>"
 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
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libexecinfo-devel"

Re: xournalpp: update to 1.1.0.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32045#issuecomment-883451833

Comment:
Both PRs (#32049) have  changes I"d like to keep.

Can either of you or @tornaria pick up changes from the other?

Re: xournalpp: update to 1.1.0.

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/32045#issuecomment-883545177

Comment:
Sorry, my bad for not checking before doing my PR.

Comments on the current PR:
 - Can we enable plugins? It's just a matter of adding `lua53-devel` to `makedepends`.
 - I'd really like to include the (very simple) patch I included to load user plugins, please?
 - I understand the reasons for the change from `virtual?tex` to `texlive-latexextra`. However, I'm still using `texlive-bin` because of #30340 which is a serious blocker for my (quite heavy) usage of TeX.
 - OTOH, latex is not really necessary to use Xournal++ so maybe the best choice is to *not* depend on it at all. In my box installing `xournalpp` requires 5MB of disk, while installing `texlive-latexextra` requires 500MB. I use xournalpp every day to teach and write notes and it's a nice feature but completely optional.

Re: xournalpp: update to 1.1.0.

[mobinmob]

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/32045#issuecomment-883554081

Comment:
> Sorry, my bad for not checking before doing my PR.
> 

No problem - your changes make the package better without a doubt.

> Comments on the current PR:
> 
> * Can we enable plugins? It's just a matter of adding `lua53-devel` to `makedepends`.

The only reason that plugins are not enabled is that... I do not use any :P Ι have no problem enabling them, lua is not a problematic dependency. Thank you for the suggestion.

> * I'd really like to include the (very simple) patch I included to load user plugins, please?

I am all for it. I maintain a package that needs plugins to be in a system directory and I really hate that.

> * I understand the reasons for the change from `virtual?tex` to `texlive-latexextra`. However, I'm still using `texlive-bin` because of [texdoc doesn't work / texlive documentation missing #30340](https://github.com/void-linux/void-packages/issues/30340) which is a serious blocker for my (quite heavy) usage of TeX.

I was not aware of https://github.com/void-linux/void-packages/issues/30340 . That is a big problem indeed :(

> * OTOH, latex is not really necessary to use Xournal++ so maybe the best choice is to _not_ depend on it at all. In my box installing `xournalpp` requires 5MB of disk, while installing `texlive-latexextra` requires 500MB. I use xournalpp every day to teach and write notes and it's a nice feature but completely optional.

It is not necessary - maybe I can propose the necessary packages in the INSTALL.msg.

Re: [PR PATCH] [Updated] xournalpp: update to 1.1.0.

[mobinmob]

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

There is an updated 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/32045

xournalpp: update to 1.1.0.
Also:
- add libsrvg-devel (new dependency)
- replace virtual?tex with texlive-latexextra
- remove INSTALL.msg (latexextra contains standalone).

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32045.patch is attached

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

From 01dfea19114af3462f24d926d5d5abb8812bdcd5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
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
- add instructions on how to install
latex and standalone on INSTALL.msg
- add patch by @tornaria to load plugins from the
users path.
---
 srcpkgs/xournalpp/INSTALL.msg               |  7 ++++---
 srcpkgs/xournalpp/patches/plugin-path.patch | 19 +++++++++++++++++++
 srcpkgs/xournalpp/template                  | 11 +++++++----
 3 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/xournalpp/patches/plugin-path.patch

diff --git a/srcpkgs/xournalpp/INSTALL.msg b/srcpkgs/xournalpp/INSTALL.msg
index 9a713b91602f..98e4962395ea 100644
--- a/srcpkgs/xournalpp/INSTALL.msg
+++ b/srcpkgs/xournalpp/INSTALL.msg
@@ -1,4 +1,5 @@
-  You  need to install the standalone package to  use LaTeX with
-  xournalpp. The following command will install it (needs root privileges).
-
+You  need install LaTeX and the standalone package in order to take
+advantage of some xournalpp features. You can install them either by
+installing texlive-latexextra or by installing texlive-bin and then
+using tlmgr (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 <mobinmob@disroot.org>"
 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"

Re: xournalpp: update to 1.1.0.

[mobinmob]

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/32045#issuecomment-883581371

Comment:
@ericonr , @tornaria :
I added the patch and changes from the suggestions and explained the changes in the commit message.
`INSTALL.msg` is now directing the user to install latex and standalone with any method they see fit.

Re: xournalpp: update to 1.1.0.

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/32045#issuecomment-883586892

Comment:
Looks good to me, thanks!

Re: [PR PATCH] [Updated] xournalpp: update to 1.1.0.

[mobinmob]

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

There is an updated 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/32045

xournalpp: update to 1.1.0.
Also:
- add libsrvg-devel (new dependency)
- replace virtual?tex with texlive-latexextra
- remove INSTALL.msg (latexextra contains standalone).

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32045.patch is attached

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

From ad10183c948629f17a4ba294bc930a19e1274930 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
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
- add instructions on how to install latex and standalone on INSTALL.msg
- add patch by @tornaria to load plugins from the users home dir.
---
 srcpkgs/xournalpp/INSTALL.msg               |  7 ++++---
 srcpkgs/xournalpp/patches/plugin-path.patch | 19 +++++++++++++++++++
 srcpkgs/xournalpp/template                  | 11 +++++++----
 3 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/xournalpp/patches/plugin-path.patch

diff --git a/srcpkgs/xournalpp/INSTALL.msg b/srcpkgs/xournalpp/INSTALL.msg
index 9a713b91602f..98e4962395ea 100644
--- a/srcpkgs/xournalpp/INSTALL.msg
+++ b/srcpkgs/xournalpp/INSTALL.msg
@@ -1,4 +1,5 @@
-  You  need to install the standalone package to  use LaTeX with
-  xournalpp. The following command will install it (needs root privileges).
-
+You  need install LaTeX and the standalone package in order to take
+advantage of some xournalpp features. You can install them either by
+installing texlive-latexextra or by installing texlive-bin and then
+using tlmgr (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 <mobinmob@disroot.org>"
 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"

Re: [PR REVIEW] xournalpp: update to 1.1.0.

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/32045#discussion_r673369141

Comment:
Please drop `INSTALL.msg` entirely. `xournalpp` provides meaningful errors about needing `pdflatex` when you try to use a feature that requires it, so we don't need extra noise here.

Re: [PR PATCH] [Updated] xournalpp: update to 1.1.0.

[mobinmob]

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

There is an updated 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/32045

xournalpp: update to 1.1.0.
Also:
- add libsrvg-devel (new dependency)
- replace virtual?tex with texlive-latexextra
- remove INSTALL.msg (latexextra contains standalone).

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32045.patch is attached

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

From 520b89997a644de4554a75245277604c01bb4efe Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
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 <mobinmob@disroot.org>"
 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"

Re: [PR PATCH] [Updated] xournalpp: update to 1.1.0.

[mobinmob]

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

There is an updated 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/32045

xournalpp: update to 1.1.0.
Also:
- add libsrvg-devel (new dependency)
- replace virtual?tex with texlive-latexextra
- remove INSTALL.msg (latexextra contains standalone).

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32045.patch is attached

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

From b6a1695d0c97c6a296cf582f851bba4ce1ee0998 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
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 <mobinmob@disroot.org>"
 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"

Re: [PR REVIEW] xournalpp: update to 1.1.0.

[mobinmob]

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

New review comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/32045#discussion_r673405261

Comment:
Done ;) 

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

[ericonr]

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

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

xournalpp: update to 1.1.0.
https://github.com/void-linux/void-packages/pull/32045

Description:
Also:
- add libsrvg-devel (new dependency)
- replace virtual?tex with texlive-latexextra
- remove INSTALL.msg (latexextra contains standalone).

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->

[PR PATCH] xournalpp: update to 1.1.0.

[tornaria]

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

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

https://github.com/tornaria/void-packages xournalpp
https://github.com/void-linux/void-packages/pull/32049

xournalpp: update to 1.1.0.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

I've been following git HEAD of xournalpp, updating every once in a while, and using it every day to teach, I can say it works and it has several nice improvements over the previous version.

In particular it is now possible to write lua plugins to enhance the program. I'm using plugins and I included a trivial very tiny patch so that plugins can be loaded from user configuration (`$HOME/.config/xournalpp/plugins/`) and not only from system directory (`/usr/share/xournalpp/plugins/`). I hope this is ok, since it is otherwise impossible to load plugins without changing system files. Note that a more general approach for plugin paths is planned (https://github.com/xournalpp/xournalpp/issues/1155#issuecomment-623234420); it should be compatible with my workaround (in the sense that once they implement what they are planning we can remove this temporary patch).

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

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

From 1e3aa0c62ee7c02b58b1a756649dcafa0a5d619a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 19 Jul 2021 20:13:00 -0300
Subject: [PATCH] xournalpp: update to 1.1.0.

---
 srcpkgs/xournalpp/patches/plugin-path.patch | 20 ++++++++++++++++++++
 srcpkgs/xournalpp/template                  |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/xournalpp/patches/plugin-path.patch

diff --git a/srcpkgs/xournalpp/patches/plugin-path.patch b/srcpkgs/xournalpp/patches/plugin-path.patch
new file mode 100644
index 000000000000..36bfbb36ae91
--- /dev/null
+++ b/srcpkgs/xournalpp/patches/plugin-path.patch
@@ -0,0 +1,20 @@
+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..4a3baaf57086 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -1,11 +1,11 @@
 # Template file for 'xournalpp'
 pkgname=xournalpp
-version=1.0.20
+version=1.1.0
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext help2man"
 makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-devel
- portaudio-cpp-devel libsndfile-devel libzip-devel"
+ portaudio-cpp-devel libsndfile-devel libzip-devel librsvg-devel lua53-devel"
 depends="virtual?tex"
 short_desc="Handwriting Notetaking software with PDF annotation support"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,7 +13,7 @@ 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
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libexecinfo-devel"