* [gentoo-commits] repo/gentoo:master commit in: app-emulation/aqemu/, app-emulation/aqemu/files/
@ 2015-08-19 2:08 Ian Delaney
0 siblings, 0 replies; 2+ messages in thread
From: Ian Delaney @ 2015-08-19 2:08 UTC (permalink / raw
To: gentoo-commits
commit: 65763ed080b0171742c0e79b0972c3511dfbe6ee
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 02:06:59 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 02:07:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65763ed0
app-emulation/aqemu: revbump; add sec. patch
submitted by René Rhéaume via sec. bug #521026
Package-Manager: portage-2.2.20
app-emulation/aqemu/aqemu-0.8.2-r3.ebuild | 41 ++++++++++++++++++++++
.../aqemu/files/aqemu-0.8.2_format-security.patch | 38 ++++++++++++++++++++
2 files changed, 79 insertions(+)
diff --git a/app-emulation/aqemu/aqemu-0.8.2-r3.ebuild b/app-emulation/aqemu/aqemu-0.8.2-r3.ebuild
new file mode 100644
index 0000000..688670f
--- /dev/null
+++ b/app-emulation/aqemu/aqemu-0.8.2-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="Graphical interface for QEMU and KVM emulators, using Qt4"
+HOMEPAGE="http://sourceforge.net/projects/aqemu"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vnc"
+
+DEPEND="${RDEPEND}"
+RDEPEND="app-emulation/qemu
+ vnc? ( net-libs/libvncserver )
+ dev-qt/qtgui:4
+ dev-qt/qttest:4
+ dev-qt/qtxmlpatterns:4"
+
+DOCS="AUTHORS CHANGELOG README TODO"
+
+PATCHES=(
+ "${FILESDIR}"/aqemu-0.8.2_sigsev_propertis.patch
+ "${FILESDIR}"/aqemu-0.8.2_qt48_build.patch
+ "${FILESDIR}"/aqemu-0.8.2_desktop_file.patch
+ "${FILESDIR}"/aqemu-0.8.2_format-security.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ "-DMAN_PAGE_COMPRESSOR="
+ "-DWITHOUT_EMBEDDED_DISPLAY=$(use vnc && echo "OFF" || echo "ON")"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/app-emulation/aqemu/files/aqemu-0.8.2_format-security.patch b/app-emulation/aqemu/files/aqemu-0.8.2_format-security.patch
new file mode 100644
index 0000000..d6ce939
--- /dev/null
+++ b/app-emulation/aqemu/files/aqemu-0.8.2_format-security.patch
@@ -0,0 +1,38 @@
+--- aqemu-0.8.2-orig/Utils.cpp
++++ aqemu-0.8.2-format-security/Utils.cpp
+@@ -66,9 +66,9 @@ void AQDebug( const QString &sender, con
+ std::cout << QString( "\nAQEMU Debug [%1] >>>\nSender: %2\nMessage: %3" )
+ .arg(Messages_Index).arg(sender).arg(mes).toStdString();
+ #else
+- qDebug( qPrintable(QString(
++ qDebug() << qPrintable(QString(
+ "\n\33[32mAQEMU Debug\33[0m [%1] >>>\n\33[32mSender:\33[0m %2\n\33[32mMessage:\33[0m %3")
+- .arg(Messages_Index).arg(sender).arg(mes)) );
++ .arg(Messages_Index).arg(sender).arg(mes));
+ #endif
+ }
+
+@@ -87,9 +87,9 @@ void AQWarning( const QString &sender, c
+ std::cout << QString( "\nAQEMU Warning [%1] >>>\nSender: %2\nMessage: %3" )
+ .arg(Messages_Index).arg(sender).arg(mes).toStdString();
+ #else
+- qDebug( qPrintable(QString(
++ qDebug() << qPrintable(QString(
+ "\n\33[34mAQEMU Warning\33[0m [%1] >>>\n\33[34mSender:\33[0m %2\n\33[34mMessage:\33[0m %3")
+- .arg(Messages_Index).arg(sender).arg(mes)) );
++ .arg(Messages_Index).arg(sender).arg(mes));
+ #endif
+ }
+
+@@ -108,9 +108,9 @@ void AQError( const QString &sender, con
+ std::cout << QString( "\nAQEMU Error [%1] >>>\nSender: %2\nMessage: %3" )
+ .arg(Messages_Index).arg(sender).arg(mes).toStdString();
+ #else
+- qDebug( qPrintable(QString(
++ qDebug() << qPrintable(QString(
+ "\n\33[31mAQEMU Error\33[0m [%1] >>>\n\33[31mSender:\33[0m %2\n\33[31mMessage:\33[0m %3")
+- .arg(Messages_Index).arg(sender).arg(mes)) );
++ .arg(Messages_Index).arg(sender).arg(mes));
+ #endif
+ }
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/aqemu/, app-emulation/aqemu/files/
@ 2022-12-20 16:31 Jakov Smolić
0 siblings, 0 replies; 2+ messages in thread
From: Jakov Smolić @ 2022-12-20 16:31 UTC (permalink / raw
To: gentoo-commits
commit: 8006b92302d15783fa3a7cc6f4ee91cd3062e44e
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 16:27:39 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 16:30:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8006b923
app-emulation/aqemu: treeclean
Closes: https://bugs.gentoo.org/806421
Closes: https://bugs.gentoo.org/844079
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
app-emulation/aqemu/Manifest | 1 -
app-emulation/aqemu/aqemu-0.9.2-r2.ebuild | 43 --------
.../aqemu/files/aqemu-0.9.2-crash-fix.patch | 116 ---------------------
app-emulation/aqemu/files/aqemu-0.9.2-docs.patch | 15 ---
.../aqemu/files/aqemu-0.9.2-include.patch | 10 --
.../aqemu/files/aqemu-0.9.2-qtbindir.patch | 15 ---
app-emulation/aqemu/metadata.xml | 9 --
7 files changed, 209 deletions(-)
diff --git a/app-emulation/aqemu/Manifest b/app-emulation/aqemu/Manifest
deleted file mode 100644
index 966ea6c08330..000000000000
--- a/app-emulation/aqemu/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aqemu-0.9.2.tar.gz 1373465 BLAKE2B 8b2b3ed311f8dd723a0d06ab74659514c6ccda67643c747af832f1677ab86ffcecde3607ead0b3410a310c38a2fe360a5ff187ef86b5953e4f5a5054a862c26c SHA512 9d4808172ee1be82509956560e4d3f9ee349fedd920342146083cc9bc79ef51fc95937c64f20ffb13e2849c577f95f59b5b65271d6e29e2d2e1ec2d1562006ba
diff --git a/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild b/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
deleted file mode 100644
index 6a2be65aaa60..000000000000
--- a/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 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
deleted file mode 100644
index ef4c1a146461..000000000000
--- a/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-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 @@
- </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>
-@@ -275,9 +275,6 @@
- <property name="maxCount">
- <number>64</number>
- </property>
-- <property name="sizeAdjustPolicy">
-- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-- </property>
- </widget>
- </item>
- <item row="3" column="1">
-@@ -294,9 +291,6 @@
- <property name="maxCount">
- <number>16</number>
- </property>
-- <property name="sizeAdjustPolicy">
-- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-- </property>
- <item>
- <property name="text">
- <string>1</string>
-@@ -395,9 +389,6 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="sizeAdjustPolicy">
-- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-- </property>
- </widget>
- </item>
- <item row="2" column="2">
-@@ -526,9 +517,6 @@
- <property name="maxCount">
- <number>8</number>
- </property>
-- <property name="sizeAdjustPolicy">
-- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-- </property>
- <item>
- <property name="text">
- <string>Floppy</string>
-@@ -586,9 +574,6 @@
- <property name="maxCount">
- <number>8</number>
- </property>
-- <property name="sizeAdjustPolicy">
-- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-- </property>
- </widget>
- </item>
- <item row="3" column="0">
-@@ -618,9 +603,6 @@
- <property name="maxCount">
- <number>128</number>
- </property>
-- <property name="sizeAdjustPolicy">
-- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-- </property>
- <item>
- <property name="text">
- <string>en-us (default)</string>
-@@ -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>
-@@ -3018,7 +3000,7 @@
- <x>0</x>
- <y>0</y>
- <width>982</width>
-- <height>32</height>
-+ <height>22</height>
- </rect>
- </property>
- <widget class="QMenu" name="menuVM">
diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-docs.patch b/app-emulation/aqemu/files/aqemu-0.9.2-docs.patch
deleted file mode 100644
index e3fab7fbf209..000000000000
--- a/app-emulation/aqemu/files/aqemu-0.9.2-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -273,9 +273,9 @@ MACRO( create_docs _sources )
- ENDFOREACH( curFile )
- ENDMACRO( create_docs )
-
--CREATE_DOCS( docs_bz2 AUTHORS CHANGELOG README TODO )
--ADD_CUSTOM_TARGET( docs ALL DEPENDS ${docs_bz2} )
--INSTALL( FILES ${docs_bz2} DESTINATION share/doc/aqemu )
-+#CREATE_DOCS( docs_bz2 AUTHORS CHANGELOG README TODO )
-+#ADD_CUSTOM_TARGET( docs ALL DEPENDS ${docs_bz2} )
-+#INSTALL( FILES ${docs_bz2} DESTINATION share/doc/aqemu )
-
- # Build RCC files (GUI icons)
- MACRO( pack_icons _sources )
diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-include.patch b/app-emulation/aqemu/files/aqemu-0.9.2-include.patch
deleted file mode 100644
index 98a14068a7cd..000000000000
--- a/app-emulation/aqemu/files/aqemu-0.9.2-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/docopt/docopt_value.h
-+++ b/src/docopt/docopt_value.h
-@@ -13,6 +13,7 @@
- #include <vector>
- #include <functional> // std::hash
- #include <iosfwd>
-+#include <stdexcept>
-
- namespace docopt {
-
diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch b/app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch
deleted file mode 100644
index 5c5548058427..000000000000
--- a/app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Ensure the Qt 5 version of rcc is used instead of whatever is in $PATH.
-
-Gentoo-bug: 589332
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -285,7 +285,7 @@
-
- SET( _out ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.rcc )
-
-- ADD_CUSTOM_COMMAND( OUTPUT ${_out} COMMAND rcc ARGS ${_in} -binary -o ${_out} DEPENDS ${_in} )
-+ ADD_CUSTOM_COMMAND( OUTPUT ${_out} COMMAND ${Qt5Core_RCC_EXECUTABLE} ARGS ${_in} -binary -o ${_out} DEPENDS ${_in} )
-
- SET( ${_sources} ${${_sources}} ${_out} )
- ENDFOREACH( curFile )
diff --git a/app-emulation/aqemu/metadata.xml b/app-emulation/aqemu/metadata.xml
deleted file mode 100644
index b13470d746c5..000000000000
--- a/app-emulation/aqemu/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">aqemu</remote-id>
- <remote-id type="github">tobimensch/aqemu</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-20 16:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-19 2:08 [gentoo-commits] repo/gentoo:master commit in: app-emulation/aqemu/, app-emulation/aqemu/files/ Ian Delaney
-- strict thread matches above, loose matches on Subject: below --
2022-12-20 16:31 Jakov Smolić
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox