Github messages for voidlinux
 help / color / mirror / Atom feed
From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] mumble: fix build for 32 bit system
Date: Sat, 03 Dec 2022 15:34:12 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40891@inbox.vuxu.org> (raw)

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

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

https://github.com/sgn/void-packages mumble-32-bits
https://github.com/void-linux/void-packages/pull/40891

mumble: fix build for 32 bit system
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### 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/40891.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mumble-32-bits-40891.patch --]
[-- Type: text/x-diff, Size: 1706 bytes --]

From 22a1afcdc3c9a5a21e79742737e48880fdc60c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 3 Dec 2022 21:31:39 +0700
Subject: [PATCH] mumble: fix build for 32 bit system

---
 srcpkgs/mumble/patches/struct-padding.patch | 13 +++++++++++++
 srcpkgs/mumble/template                     |  4 ----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/mumble/patches/struct-padding.patch

diff --git a/srcpkgs/mumble/patches/struct-padding.patch b/srcpkgs/mumble/patches/struct-padding.patch
new file mode 100644
index 000000000000..8e530e02fa58
--- /dev/null
+++ b/srcpkgs/mumble/patches/struct-padding.patch
@@ -0,0 +1,13 @@
+Index: mumble-1.4.287/plugins/gtav/structs.h
+===================================================================
+--- mumble-1.4.287.orig/plugins/gtav/structs.h
++++ mumble-1.4.287/plugins/gtav/structs.h
+@@ -121,7 +121,7 @@ struct CCameraManagerAngles {
+ struct CCameraAngles {
+ 	uint8_t pad1[960];
+ 	ptr_t playerAngles; // CPlayerAngles *
+-	uint8_t pad2[60];
++	uint8_t pad2[64]; // 64 bits system align 8 byte
+ };
+ 
+ struct CPlayerAngles {
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index dfa46a25be14..2e6f50da0140 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -25,10 +25,6 @@ checksum=378e61d5bfa58ba51bfbb645067f459214a9872da09b306f2c2c3f1902200547
 build_options="jack portaudio"
 build_options_default="jack portaudio"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/39031/steps/shell_3/logs/stdio" ;;
-esac
-
 
 export CMAKE_GENERATOR="Unix Makefiles"
 

             reply	other threads:[~2022-12-03 14:34 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-03 14:34 sgn [this message]
2023-01-06  0:59 ` [PR PATCH] [Closed]: " sgn

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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40891@inbox.vuxu.org \
    --to=sgn@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).