From 0f15659d48c193027158492acb726297501202c5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Dec 2021 20:34:27 +0000 Subject: gentoo xmass resync : 25.12.2021 --- app-emulation/aqemu/Manifest | 2 + app-emulation/aqemu/aqemu-0.9.2-r2.ebuild | 43 ++++++++ .../aqemu/files/aqemu-0.9.2-crash-fix.patch | 116 +++++++++++++++++++++ 3 files changed, 161 insertions(+) create mode 100644 app-emulation/aqemu/aqemu-0.9.2-r2.ebuild create mode 100644 app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch (limited to 'app-emulation/aqemu') diff --git a/app-emulation/aqemu/Manifest b/app-emulation/aqemu/Manifest index 104b1885d4e1..8645772d1923 100644 --- a/app-emulation/aqemu/Manifest +++ b/app-emulation/aqemu/Manifest @@ -1,6 +1,8 @@ +AUX aqemu-0.9.2-crash-fix.patch 4881 BLAKE2B 6e16f480b9a0623ed1469b3a6eb7401323f65e7298d3e3a98b7410b809567d4d8774ebf22da0a43942d1dff9ba06fa0884502ce9ff016088ed736ec4291413f9 SHA512 ec99b5eb47d18accee560980376759475fb8d4f6f22f84dbae08775c9513b5c183891e048ae60655bcd9c7df63dc9b85913fd23f6ffeadae3d8fa97aa4d16259 AUX aqemu-0.9.2-docs.patch 537 BLAKE2B 5a96b909a29e78aaac8cd71551aa0f5223ef7e4782d365308241a71c59d9e4e8e2acd2e9cdc72d95e876d5ec5dcdae054716b0ed23bf66d5879b2263c691b5c5 SHA512 df50688b5abb1225ce48eb6a1626030869a0d42b701c72ca325e71073d35aad5fda56e97939e5a41f5d3da0af57d89e8c2535845d4c5f0f3eb898f294dc5bef8 AUX aqemu-0.9.2-include.patch 202 BLAKE2B 1f189a225adbda7e1b9e9e89820e1966c35c8b0f40bc1df0caf89117988c6ddfc4060a2cfeeffc082775b7f11be15fb3aecac623806a9a4d9567aee2746aa9ed SHA512 adb3a92fbfeb8bb5025fd1b3b7587af2b390d111cb42bd48f031b2d5eebebd132a03a84a7026bf0bb17fa627ed49558ef5237e6472d8558f3ba3fff82ab52dad AUX aqemu-0.9.2-qtbindir.patch 514 BLAKE2B 9d6245d1745248db021cf9883bf9f8a00223ba781a2ba9bbc6561e4fb7239aa6c2baab7a1324edbbf157d68a829116ecc07b24bb13d714321ce145de447b9bb6 SHA512 f85e6c2487dfef86470773949f6796af9efdf066d9871ac4cdfddd064c85fbf893574e602ab2c6cd1198dc9eb76f0722b5a85ec046b2dca2275a24799418c996 DIST aqemu-0.9.2.tar.gz 1373465 BLAKE2B 8b2b3ed311f8dd723a0d06ab74659514c6ccda67643c747af832f1677ab86ffcecde3607ead0b3410a310c38a2fe360a5ff187ef86b5953e4f5a5054a862c26c SHA512 9d4808172ee1be82509956560e4d3f9ee349fedd920342146083cc9bc79ef51fc95937c64f20ffb13e2849c577f95f59b5b65271d6e29e2d2e1ec2d1562006ba EBUILD aqemu-0.9.2-r1.ebuild 891 BLAKE2B c33021b00ad21604f8559c16d011da11fc58bce8bbf031e6610f445acc19242ec675df97a9eab9e012c4d28a7998cababffe3de0efc9d2f64a2cfcc58091fe90 SHA512 8c65a9956bfe81b400f26ad6d6107ce65c1d5a9042659ed413899da2fbb5a868f6e1bc0188b8c2a50e9f85634a079774ac3824afa034d00a2e48117c886f41bc +EBUILD aqemu-0.9.2-r2.ebuild 936 BLAKE2B cc58342ee28ecf4a19242177a8aa664d5883828da7342296a3c768bd71ab2778bf1943b878725869945ef7bdee3e03b200ca337eeb20d7b134b314c66885f80b SHA512 6c683ab55ba2215b0c1ed2bb8e6a2c2af974549646fb32f72d7fbef3bb607be4b7eaec26a37b2298f9e0f73f0643d4d5a77cedfc3802d43b926c8633bc011413 MISC metadata.xml 299 BLAKE2B e49f8725de4fe8aca9401286dff3d9cfbc980d916cc3310b49953db2b1e749e96121a9679adc4297435f89f57967fc08e98f0df8e8fd00d5245e293f327bd948 SHA512 bcbc0350f5f41fe9da0efd3c9e596f314cacd88661c4ec62b5694d45b6c03664935b9ac9c338612de63bd73f08b16d108d085db78fac7031449e3e3edcf0090e diff --git a/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild b/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild new file mode 100644 index 000000000000..30c5865b473a --- /dev/null +++ b/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Graphical interface for QEMU and KVM emulators, using Qt5" +HOMEPAGE="https://sourceforge.net/projects/aqemu" +SRC_URI="https://github.com/tobimensch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="vnc" + +RDEPEND=" + app-emulation/qemu + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qttest:5 + dev-qt/qtwidgets:5 + vnc? ( net-libs/libvncserver ) +" +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS CHANGELOG README TODO ) +PATCHES=( + "${FILESDIR}/${PN}-0.9.2-qtbindir.patch" + "${FILESDIR}/${PN}-0.9.2-include.patch" + "${FILESDIR}/${PN}-0.9.2-docs.patch" + "${FILESDIR}/${PN}-0.9.2-crash-fix.patch" +) + +src_configure() { + local mycmakeargs=( + -DMAN_PAGE_COMPRESSOR=OFF + -DWITHOUT_EMBEDDED_DISPLAY=$(usex vnc OFF ON) + ) + + cmake_src_configure +} diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch b/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch new file mode 100644 index 000000000000..ef4c1a146461 --- /dev/null +++ b/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch @@ -0,0 +1,116 @@ +https://github.com/tobimensch/aqemu/pull/116 +https://bugs.gentoo.org/738020 + +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 +--- a/src/Main_Window.ui ++++ b/src/Main_Window.ui +@@ -226,7 +226,7 @@ + + + +- ++ + + + 24 +@@ -275,9 +275,6 @@ + + 64 + +- +- QComboBox::AdjustToMinimumContentsLength +- + + + +@@ -294,9 +291,6 @@ + + 16 + +- +- QComboBox::AdjustToMinimumContentsLength +- + + + 1 +@@ -395,9 +389,6 @@ + 0 + + +- +- QComboBox::AdjustToMinimumContentsLength +- + + + +@@ -526,9 +517,6 @@ + + 8 + +- +- QComboBox::AdjustToMinimumContentsLength +- + + + Floppy +@@ -586,9 +574,6 @@ + + 8 + +- +- QComboBox::AdjustToMinimumContentsLength +- + + + +@@ -618,9 +603,6 @@ + + 128 + +- +- QComboBox::AdjustToMinimumContentsLength +- + + + en-us (default) +@@ -1333,7 +1315,7 @@ + + + +- widget ++ general_Machine_Sets + GB_Options + GB_Audio + GB_Memory +@@ -2457,7 +2439,7 @@ + + + +- ++ + + + 6 +@@ -2515,7 +2497,7 @@ + + + +- ++ + + + 6 +@@ -3018,7 +3000,7 @@ + 0 + 0 + 982 +- 32 ++ 22 + + + -- cgit v1.2.3