* [PR PATCH] zathura: import fix for 32-bit
@ 2024-06-08 17:14 mtboehlke
2024-06-08 17:20 ` mtboehlke
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: mtboehlke @ 2024-06-08 17:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1387 bytes --]
There is a new pull request by mtboehlke against master on the void-packages repository
https://github.com/mtboehlke/void-packages zathura
https://github.com/void-linux/void-packages/pull/50751
zathura: import fix for 32-bit
<!-- Uncomment relevant sections and delete options which are not applicable -->
zathura-0.5.6 crashes with `*** stack smashing detected ***: terminated` on i686. This brings in the upstream fix.
#### Testing the changes
- I tested the changes in this PR: **briefly**
Tested on i686
<!--
#### 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/50751.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zathura-50751.patch --]
[-- Type: text/x-diff, Size: 2018 bytes --]
From 4a1f0396e2b053937259acaa10fa167e889bd8ec Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sat, 8 Jun 2024 12:05:23 -0500
Subject: [PATCH] zathura: import fix for 32-bit
---
.../zathura/patches/fix_type_mismatch.patch | 24 +++++++++++++++++++
srcpkgs/zathura/template | 2 +-
2 files changed, 25 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/zathura/patches/fix_type_mismatch.patch
diff --git a/srcpkgs/zathura/patches/fix_type_mismatch.patch b/srcpkgs/zathura/patches/fix_type_mismatch.patch
new file mode 100644
index 00000000000000..e817a20ca57dc2
--- /dev/null
+++ b/srcpkgs/zathura/patches/fix_type_mismatch.patch
@@ -0,0 +1,24 @@
+From 0c344affeaaae5b1360d0958fb23b3481f63945c
+From: Adam Sampson <ats@offog.org>
+Date: Mon, 13 May 2024 01:07:10 +0100
+Subject: [PATCH] Fix type mismatch with g_ascii_string_to_unsigned
+
+The out_num argument is a guint64, which isn't the same as unsigned long
+on some platforms (e.g. AArch32 Linux).
+---
+ zathura/utils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/zathura/utils.c b/zathura/utils.c
+index 2b3b39b3..bda6f86a 100644
+--- a/zathura/utils.c
++++ b/zathura/utils.c
+@@ -321,7 +321,7 @@ parse_first_page_column_list(const char* first_page_column_list, unsigned int* s
+ unsigned int* settings = g_malloc_n(length, sizeof(unsigned int));
+
+ for (unsigned int i=0; i<length; i++) {
+- unsigned long column = 1;
++ guint64 column = 1;
+
+ if (g_ascii_string_to_unsigned(tokens[i], 10, 1, i+1, &column, NULL)) {
+ settings[i] = (unsigned int)column;
diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index f63fb3ddcd3817..f31f37c58609df 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -1,7 +1,7 @@
# Template file for 'zathura'
pkgname=zathura
version=0.5.6
-revision=1
+revision=2
build_style=meson
configure_args="-Dsynctex=enabled"
hostmakedepends="pkg-config gettext python3-Sphinx desktop-file-utils
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: zathura: import fix for 32-bit
2024-06-08 17:14 [PR PATCH] zathura: import fix for 32-bit mtboehlke
@ 2024-06-08 17:20 ` mtboehlke
2024-06-08 17:22 ` [PR PATCH] [Merged]: " lemmi
2024-06-08 17:22 ` lemmi
2 siblings, 0 replies; 4+ messages in thread
From: mtboehlke @ 2024-06-08 17:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 155 bytes --]
New comment by mtboehlke on void-packages repository
https://github.com/void-linux/void-packages/pull/50751#issuecomment-2156110615
Comment:
cc: @lemmi
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: zathura: import fix for 32-bit
2024-06-08 17:14 [PR PATCH] zathura: import fix for 32-bit mtboehlke
2024-06-08 17:20 ` mtboehlke
@ 2024-06-08 17:22 ` lemmi
2024-06-08 17:22 ` lemmi
2 siblings, 0 replies; 4+ messages in thread
From: lemmi @ 2024-06-08 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1232 bytes --]
There's a merged pull request on the void-packages repository
zathura: import fix for 32-bit
https://github.com/void-linux/void-packages/pull/50751
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
zathura-0.5.6 crashes with `*** stack smashing detected ***: terminated` on i686. This brings in the upstream fix.
#### Testing the changes
- I tested the changes in this PR: **briefly**
Tested on i686
<!--
#### 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
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: zathura: import fix for 32-bit
2024-06-08 17:14 [PR PATCH] zathura: import fix for 32-bit mtboehlke
2024-06-08 17:20 ` mtboehlke
2024-06-08 17:22 ` [PR PATCH] [Merged]: " lemmi
@ 2024-06-08 17:22 ` lemmi
2 siblings, 0 replies; 4+ messages in thread
From: lemmi @ 2024-06-08 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 146 bytes --]
New comment by lemmi on void-packages repository
https://github.com/void-linux/void-packages/pull/50751#issuecomment-2156111235
Comment:
Thx :)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-08 17:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-08 17:14 [PR PATCH] zathura: import fix for 32-bit mtboehlke
2024-06-08 17:20 ` mtboehlke
2024-06-08 17:22 ` [PR PATCH] [Merged]: " lemmi
2024-06-08 17:22 ` lemmi
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).