From: mobinmob <mobinmob@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] xournalpp: update to 1.1.1.
Date: Tue, 15 Feb 2022 15:10:05 +0100 [thread overview]
Message-ID: <20220215141005.jagtsKJhJo702vQCGhc9VQ02Ij0oyAR-161J4TkLZ-Q@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35621@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1221 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/35621
xournalpp: update to 1.1.1.
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/35621.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xournalpp-35621.patch --]
[-- Type: text/x-diff, Size: 2491 bytes --]
From 9f1ea4d066c4a582bd1f246baf52284d0fa8c5d3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 14 Feb 2022 19:57:40 +0200
Subject: [PATCH] xournalpp: update to 1.1.1.
Also:
- add a patch to fix building on musl
- remove configure_args - no longer needed on musl.
(both changes by @tornaria)
---
srcpkgs/xournalpp/patches/backtrace.patch | 10 ++++++++++
srcpkgs/xournalpp/template | 11 +++++------
2 files changed, 15 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/xournalpp/patches/backtrace.patch
diff --git a/srcpkgs/xournalpp/patches/backtrace.patch b/srcpkgs/xournalpp/patches/backtrace.patch
new file mode 100644
index 000000000000..ce896c015d5c
--- /dev/null
+++ b/srcpkgs/xournalpp/patches/backtrace.patch
@@ -0,0 +1,10 @@
+--- 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/template b/srcpkgs/xournalpp/template
index 0ed6e76a3ac8..e235dcfe40fb 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -1,6 +1,6 @@
# Template file for 'xournalpp'
pkgname=xournalpp
-version=1.1.0
+version=1.1.1
revision=1
build_style=cmake
hostmakedepends="pkg-config gettext"
@@ -9,16 +9,15 @@ makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-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"
+homepage="https://xournalpp.github.io/"
changelog="https://raw.githubusercontent.com/xournalpp/xournalpp/master/CHANGELOG.md"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=31b99282bcd1d829f05f1c9ccd07c5d599acc0e69725d135cdc97e1dcaf2baee
+distfiles="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${version}.tar.gz"
+checksum=0d7fea5392758d5180eb24cc219660e997f087ae5a62d5f30515a063f81252e2
if [ -z "$CROSS_BUILD" ]; then
hostmakedepends+=" help2man"
fi
case "$XBPS_TARGET_MACHINE" in
- *-musl) makedepends+=" libexecinfo-devel"
- configure_args+=" -Dxournalpp_LDFLAGS=-lexecinfo";;
+ *-musl) makedepends+=" libexecinfo-devel";;
esac
next prev parent reply other threads:[~2022-02-15 14:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 17:59 [PR PATCH] " mobinmob
2022-02-14 18:29 ` tornaria
2022-02-14 18:35 ` Johnnynator
2022-02-14 18:50 ` tornaria
2022-02-14 19:25 ` tornaria
2022-02-14 19:27 ` mobinmob
2022-02-15 14:10 ` mobinmob [this message]
2022-02-15 14:10 ` mobinmob
2022-02-15 14:34 ` tornaria
2022-02-20 0:06 ` [PR PATCH] [Merged]: " paper42
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=20220215141005.jagtsKJhJo702vQCGhc9VQ02Ij0oyAR-161J4TkLZ-Q@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).