Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] aqemu: fix segfault
@ 2023-04-08  9:53 0x5c
  2023-04-08 10:09 ` [PR PATCH] [Merged]: " classabbyamp
  0 siblings, 1 reply; 2+ messages in thread
From: 0x5c @ 2023-04-08  9:53 UTC (permalink / raw)
  To: ml

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

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

https://github.com/0x5c/void-packages fix/aqemu-segfault
https://github.com/void-linux/void-packages/pull/43342

aqemu: fix segfault
A repeated error in a UI layout file ceased to be accepted in recent-ish QT versions.

Closes #39101

<!-- 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 [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/43342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/aqemu-segfault-43342.patch --]
[-- Type: text/x-diff, Size: 3424 bytes --]

From 37180dfd5fde3f5aab9cade94d42c93ef96f012d Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 8 Apr 2023 05:49:52 -0400
Subject: [PATCH] aqemu: fix segfault

A repeated error in a UI layout file ceased to be accepted in recent-ish QT
versions.

Closes #39101
---
 srcpkgs/aqemu/patches/widgets.patch | 53 +++++++++++++++++++++++++++++
 srcpkgs/aqemu/template              |  2 +-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/aqemu/patches/widgets.patch

diff --git a/srcpkgs/aqemu/patches/widgets.patch b/srcpkgs/aqemu/patches/widgets.patch
new file mode 100644
index 000000000000..5c2873b0cf8a
--- /dev/null
+++ b/srcpkgs/aqemu/patches/widgets.patch
@@ -0,0 +1,53 @@
+Taken from https://github.com/tobimensch/aqemu/pull/116, and simplified
+
+PATCH MUST KEEP CRLF LINE TERMINATORS
+
+--
+
+From dc19121a923c71eed248cd6310b9b06ec0af6abe Mon Sep 17 00:00:00 2001
+From: Moskaliou Nikita <44800696+nikitamos@users.noreply.github.com>
+Date: Sun, 5 Dec 2021 19:36:44 +0300
+Subject: [PATCH] Change widgets names
+
+Several widgets in the src/Main_Window.ui file had the same name ("widget"), for several users AQEMU crashed with SEGFAULT. So, the names were changed and now everything works fine
+
+diff --git a/src/Main_Window.ui b/src/Main_Window.ui
+index fab69f4..52b7c71 100644
+--- a/src/Main_Window.ui
++++ b/src/Main_Window.ui
+@@ -226,7 +226,7 @@
+              </widget>
+             </item>
+             <item>
+-             <widget class="QWidget" name="widget" native="true">
++             <widget class="QWidget" name="general_Machine_Sets" native="true">
+               <layout class="QGridLayout" name="gridLayout_12">
+                <property name="leftMargin">
+                 <number>24</number>
+@@ -1333,7 +1315,7 @@
+              </widget>
+             </item>
+            </layout>
+-           <zorder>widget</zorder>
++           <zorder>general_Machine_Sets</zorder>
+            <zorder>GB_Options</zorder>
+            <zorder>GB_Audio</zorder>
+            <zorder>GB_Memory</zorder>
+@@ -2457,7 +2439,7 @@
+                     </layout>
+                    </item>
+                    <item row="1" column="0" colspan="2">
+-                    <widget class="QWidget" name="widget" native="true">
++                    <widget class="QWidget" name="protocol_Sets" native="true">
+                      <layout class="QHBoxLayout" name="Widget_Redirection_Protocol">
+                       <property name="spacing">
+                        <number>6</number>
+@@ -2515,7 +2497,7 @@
+                     </widget>
+                    </item>
+                    <item row="2" column="0" colspan="2">
+-                    <widget class="QWidget" name="widget" native="true">
++                    <widget class="QWidget" name="ip_Sets" native="true">
+                      <layout class="QHBoxLayout" name="Widget_Redirection_Net">
+                       <property name="spacing">
+                        <number>6</number>
diff --git a/srcpkgs/aqemu/template b/srcpkgs/aqemu/template
index 28cb67084bc7..f55d30f4de9c 100644
--- a/srcpkgs/aqemu/template
+++ b/srcpkgs/aqemu/template
@@ -1,7 +1,7 @@
 # Template file for 'aqemu'
 pkgname=aqemu
 version=0.9.4
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DWITHOUT_EMBEDDED_DISPLAY=1"
 makedepends="qt5-devel qemu desktop-file-utils"

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

* Re: [PR PATCH] [Merged]: aqemu: fix segfault
  2023-04-08  9:53 [PR PATCH] aqemu: fix segfault 0x5c
@ 2023-04-08 10:09 ` classabbyamp
  0 siblings, 0 replies; 2+ messages in thread
From: classabbyamp @ 2023-04-08 10:09 UTC (permalink / raw)
  To: ml

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

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

aqemu: fix segfault
https://github.com/void-linux/void-packages/pull/43342

Description:
A repeated error in a UI layout file ceased to be accepted in recent-ish QT versions.

Closes #39101

<!-- 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 [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] 2+ messages in thread

end of thread, other threads:[~2023-04-08 10:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-08  9:53 [PR PATCH] aqemu: fix segfault 0x5c
2023-04-08 10:09 ` [PR PATCH] [Merged]: " classabbyamp

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