Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] xournalpp: update to 1.1.1.
@ 2022-02-14 17:59 mobinmob
  2022-02-14 18:29 ` tornaria
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: mobinmob @ 2022-02-14 17:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1216 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/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: 1434 bytes --]

From b07b0ace011ea4440a80b1c719d499f58bd6f743 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.

---
 srcpkgs/xournalpp/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template
index 0ed6e76a3ac8..e245b9e15627 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,10 +9,10 @@ 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"

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: xournalpp: update to 1.1.1.
  2022-02-14 17:59 [PR PATCH] xournalpp: update to 1.1.1 mobinmob
@ 2022-02-14 18:29 ` tornaria
  2022-02-14 18:35 ` Johnnynator
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: tornaria @ 2022-02-14 18:29 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/35621#issuecomment-1039415869

Comment:
Works for me on x86_64.

What's up with musl? Build fails with
```
...
/usr/bin/ld: src/xoj-preview-extractor/CMakeFiles/xournalpp-thumbnailer.dir/__/util/Stacktrace.cpp.o: in function `Stacktrace::printStracktrace(std::ostream&)':
Stacktrace.cpp:(.text+0x24a): undefined reference to `backtrace'
/usr/bin/ld: Stacktrace.cpp:(.text+0x25f): undefined reference to `backtrace_symbols'
collect2: error: ld returned 1 exit status
...
```

IIRC this was working ok on the 1.1.0 PR (#32045, 8 checks passed).


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: xournalpp: update to 1.1.1.
  2022-02-14 17:59 [PR PATCH] xournalpp: update to 1.1.1 mobinmob
  2022-02-14 18:29 ` tornaria
@ 2022-02-14 18:35 ` Johnnynator
  2022-02-14 18:50 ` tornaria
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2022-02-14 18:35 UTC (permalink / raw)
  To: ml

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/35621#issuecomment-1039421444

Comment:
> 

They somwhat reorganized their build system int 1.1.1, it seems like they dropped linking against `execinfo` somewhere.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: xournalpp: update to 1.1.1.
  2022-02-14 17:59 [PR PATCH] xournalpp: update to 1.1.1 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
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: tornaria @ 2022-02-14 18:50 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/35621#issuecomment-1039434341

Comment:
> > 
> 
> They somwhat reorganized their build system int 1.1.1, it seems like they dropped linking against `execinfo` somewhere.

The void template has `configure_args+=" -Dxournalpp_LDFLAGS=-lexecinfo"` for musl, it seems this is not being taken into account anymore.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: xournalpp: update to 1.1.1.
  2022-02-14 17:59 [PR PATCH] xournalpp: update to 1.1.1 mobinmob
                   ` (2 preceding siblings ...)
  2022-02-14 18:50 ` tornaria
@ 2022-02-14 19:25 ` tornaria
  2022-02-14 19:27 ` mobinmob
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: tornaria @ 2022-02-14 19:25 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/35621#issuecomment-1039466772

Comment:
This patch seems to work:
```
--- 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})
```

Also, the setting of `xournalpp_LDFLAGS` in the template is not needed anymore.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: xournalpp: update to 1.1.1.
  2022-02-14 17:59 [PR PATCH] xournalpp: update to 1.1.1 mobinmob
                   ` (3 preceding siblings ...)
  2022-02-14 19:25 ` tornaria
@ 2022-02-14 19:27 ` mobinmob
  2022-02-15 14:10 ` [PR PATCH] [Updated] " mobinmob
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: mobinmob @ 2022-02-14 19:27 UTC (permalink / raw)
  To: ml

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/35621#issuecomment-1039469160

Comment:
> This patch seems to work:
> 
> ```
> --- 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})
> ```
> 
> Also, the setting of `xournalpp_LDFLAGS` in the template is not needed anymore.

Thank you :) Ι will test tommorow - no time rn :(

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] xournalpp: update to 1.1.1.
  2022-02-14 17:59 [PR PATCH] xournalpp: update to 1.1.1 mobinmob
                   ` (4 preceding siblings ...)
  2022-02-14 19:27 ` mobinmob
@ 2022-02-15 14:10 ` mobinmob
  2022-02-15 14:10 ` mobinmob
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: mobinmob @ 2022-02-15 14:10 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: xournalpp: update to 1.1.1.
  2022-02-14 17:59 [PR PATCH] xournalpp: update to 1.1.1 mobinmob
                   ` (5 preceding siblings ...)
  2022-02-15 14:10 ` [PR PATCH] [Updated] " mobinmob
@ 2022-02-15 14:10 ` mobinmob
  2022-02-15 14:34 ` tornaria
  2022-02-20  0:06 ` [PR PATCH] [Merged]: " paper42
  8 siblings, 0 replies; 10+ messages in thread
From: mobinmob @ 2022-02-15 14:10 UTC (permalink / raw)
  To: ml

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/35621#issuecomment-1040319435

Comment:
Pushed the changes, I bult it locally for x86_64-musl and aarch64-musl. Thanx @tornaria !

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: xournalpp: update to 1.1.1.
  2022-02-14 17:59 [PR PATCH] xournalpp: update to 1.1.1 mobinmob
                   ` (6 preceding siblings ...)
  2022-02-15 14:10 ` mobinmob
@ 2022-02-15 14:34 ` tornaria
  2022-02-20  0:06 ` [PR PATCH] [Merged]: " paper42
  8 siblings, 0 replies; 10+ messages in thread
From: tornaria @ 2022-02-15 14:34 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/35621#issuecomment-1040346041

Comment:
LGTM

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Merged]: xournalpp: update to 1.1.1.
  2022-02-14 17:59 [PR PATCH] xournalpp: update to 1.1.1 mobinmob
                   ` (7 preceding siblings ...)
  2022-02-15 14:34 ` tornaria
@ 2022-02-20  0:06 ` paper42
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2022-02-20  0:06 UTC (permalink / raw)
  To: ml

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

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

xournalpp: update to 1.1.1.
https://github.com/void-linux/void-packages/pull/35621

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 [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
-->


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2022-02-20  0:06 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-14 17:59 [PR PATCH] xournalpp: update to 1.1.1 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 ` [PR PATCH] [Updated] " mobinmob
2022-02-15 14:10 ` mobinmob
2022-02-15 14:34 ` tornaria
2022-02-20  0:06 ` [PR PATCH] [Merged]: " paper42

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).