From: mobinmob <mobinmob@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] xournalpp: update to 1.1.0.
Date: Tue, 20 Jul 2021 21:09:30 +0200 [thread overview]
Message-ID: <20210720190930.yi-Y0uSjrZUtjYXwNKv5UW2IVTMEdMpKXL1sl_yZQMk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32045@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2021-07-20 19:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-19 17:57 [PR PATCH] " mobinmob
2021-07-20 14:44 ` ericonr
2021-07-20 16:53 ` tornaria
2021-07-20 17:07 ` mobinmob
2021-07-20 17:48 ` [PR PATCH] [Updated] " mobinmob
2021-07-20 17:51 ` mobinmob
2021-07-20 18:00 ` tornaria
2021-07-20 18:03 ` [PR PATCH] [Updated] " mobinmob
2021-07-20 18:12 ` [PR REVIEW] " ahesford
2021-07-20 19:08 ` [PR PATCH] [Updated] " mobinmob
2021-07-20 19:09 ` mobinmob [this message]
2021-07-20 19:09 ` [PR REVIEW] " mobinmob
2021-07-20 19:31 ` [PR PATCH] [Merged]: " ericonr
2021-07-19 23:28 [PR PATCH] " tornaria
2021-07-20 2:39 ` [PR PATCH] [Updated] " tornaria
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210720190930.yi-Y0uSjrZUtjYXwNKv5UW2IVTMEdMpKXL1sl_yZQMk@z \
--to=mobinmob@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).