public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-boxes/files/, gnome-extra/gnome-boxes/
@ 2020-02-19 15:19 Mart Raudsepp
  0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2020-02-19 15:19 UTC (permalink / raw
  To: gentoo-commits

commit:     aefbe47b96c4d0bd172f0fb19c57fa2430702b86
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 15:15:10 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 15:15:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aefbe47b

gnome-extra/gnome-boxes: bump to 3.32.2

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-extra/gnome-boxes/Manifest                   |   1 +
 .../gnome-boxes/files/3.32.2-vala-compat.patch     |  28 +++++
 gnome-extra/gnome-boxes/gnome-boxes-3.32.2.ebuild  | 134 +++++++++++++++++++++
 3 files changed, 163 insertions(+)

diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index a4c40411123..b0c9304738d 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1 +1,2 @@
 DIST gnome-boxes-3.30.3.tar.xz 1198224 BLAKE2B 1c65d3f051d32dc85284da4d392e3ec418edf028b61f1166173ac6ced3e6cba687b297ea135a4e54058c561eb5fe69d767e9ee698fb6b16f6bd4cd09b00d5c3a SHA512 fc8a06bb8c71356d50002468f7722aee14abe8432ccce319ada3032746b53eb2f679a93f991c04ae34832a315fc95d561ffc169c4560a23573c046705b5446b4
+DIST gnome-boxes-3.32.2.tar.xz 1178340 BLAKE2B 9c345e69cc53b3b06b609c3ddfb0f3e1cb54aaffb9ebad4deafd0414913e6d5bc4faecce6e9714a448da7c6094b27d97f039bb8db512973ffd665a5190ff6561 SHA512 f3208f5185ad65750b2f745e8170aaff6a097aa9d706e5abc74259c0940da8fafb046b55dfcc144e8c64782942dfebb711622b552f6daa2dc45ad863d480855f

diff --git a/gnome-extra/gnome-boxes/files/3.32.2-vala-compat.patch b/gnome-extra/gnome-boxes/files/3.32.2-vala-compat.patch
new file mode 100644
index 00000000000..548064be909
--- /dev/null
+++ b/gnome-extra/gnome-boxes/files/3.32.2-vala-compat.patch
@@ -0,0 +1,28 @@
+From 8aaf59870b9972f228e073a674b254b1e4cda2de Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+Date: Mon, 28 Oct 2019 10:36:20 -0500
+Subject: [PATCH] app-window: Fix build with vala master
+
+Cherry-picked from a1522749a9651915132fc1171d31a1c22df423ab
+
+See #431
+---
+ src/app-window.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/app-window.vala b/src/app-window.vala
+index 8a1ebb6a..82a9f834 100644
+--- a/src/app-window.vala
++++ b/src/app-window.vala
+@@ -438,7 +438,7 @@ public bool on_key_pressed (Widget widget, Gdk.EventKey event) {
+ 
+             return true;
+         } else if (event.keyval == Gdk.Key.A &&
+-                   (event.state & default_modifiers) == Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK) {
++                   (event.state & default_modifiers) == (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK)) {
+             foreach_view ((view) => { view.unselect_all (); });
+ 
+             return true;
+-- 
+2.20.1
+

diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.32.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.32.2.ebuild
new file mode 100644
index 00000000000..b29f17ed72d
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.32.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
+HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
+
+LICENSE="LGPL-2+ CC-BY-2.0"
+SLOT="0"
+
+IUSE="rdp"
+KEYWORDS="~amd64"
+
+# FIXME: ovirt is not available in tree; though it seems the gnome-boxes ovirt broker is too buggy atm anyways (would need rest[vala] as well)
+# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
+# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
+# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
+# gtk-vnc raised due to missing vala bindings in earlier ebuilds
+DEPEND="
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.22.20:3
+	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
+	>=sys-libs/libosinfo-1.4.0
+	app-crypt/libsecret
+	>=net-libs/libsoup-2.44:2.4
+	virtual/libusb:1
+	>=app-emulation/libvirt-glib-2.0.0
+	>=dev-libs/libxml2-2.7.8:2
+	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
+	app-misc/tracker:0/2.0
+	>=x11-libs/vte-0.40.2:2.91
+	net-libs/webkit-gtk:4
+
+	>=dev-libs/gobject-introspection-1.56:=
+	>=dev-libs/libgudev-165:=
+	rdp? ( net-misc/freerdp:= )
+" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
+# These are called via exec():
+# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
+# virtual/cdrtools mkisofs is needed for unattended installer secondary disk image creation
+# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
+# sys-apps/policycoreutils restorecon is used for checking selinux context
+# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
+# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
+# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
+RDEPEND="${DEPEND}
+	>=app-misc/tracker-miners-2[iso]
+	app-emulation/spice[smartcard]
+	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
+	sys-fs/mtools
+	virtual/cdrtools
+	sys-auth/polkit
+"
+# gtk-frdp generates gir and needs gtk+ introspection for it
+# This is only needed for creating the .vapi file, but gnome-boxes needs it
+BDEPEND="
+	$(vala_depend)
+	net-libs/gtk-vnc[vala]
+	sys-libs/libosinfo[vala]
+	app-crypt/libsecret[vala]
+	net-libs/libsoup:2.4[vala]
+	app-emulation/libvirt-glib[vala]
+	net-misc/spice-gtk[vala]
+	x11-libs/vte:2.91[vala]
+	dev-libs/appstream-glib
+	rdp? ( x11-libs/gtk+:3[introspection] )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
+If you have an Intel Processor, run:
+# modprobe kvm-intel
+
+If you have an AMD Processor, run:
+# modprobe kvm-amd"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-vala-compat.patch
+)
+
+pkg_pretend() {
+	linux-info_get_any_version
+
+	if linux_config_exists; then
+		if ! { linux_chkconfig_present KVM_AMD || \
+			linux_chkconfig_present KVM_INTEL; }; then
+			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
+		fi
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddistributor_name=Gentoo
+		-Ddistributor_version=${PVR}
+		-Dovirt=false
+		$(meson_use rdp)
+		-Dinstalled_tests=false
+		-Dflatpak=false
+		-Dprofile=default
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-boxes/files/, gnome-extra/gnome-boxes/
@ 2024-12-14 16:33 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-12-14 16:33 UTC (permalink / raw
  To: gentoo-commits

commit:     a21d69c3cf7af7e9e4993137fc72ac1f296d6cd5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 16:33:07 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 16:33:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a21d69c3

gnome-extra/gnome-boxes: fix Modern C issues

Closes: https://bugs.gentoo.org/936516
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gnome-boxes/files/gnome-boxes-46.1-c99.patch   | 27 ++++++++++++++++++++++
 gnome-extra/gnome-boxes/gnome-boxes-46.1.ebuild    |  4 ++++
 2 files changed, 31 insertions(+)

diff --git a/gnome-extra/gnome-boxes/files/gnome-boxes-46.1-c99.patch b/gnome-extra/gnome-boxes/files/gnome-boxes-46.1-c99.patch
new file mode 100644
index 000000000000..a58797b44ece
--- /dev/null
+++ b/gnome-extra/gnome-boxes/files/gnome-boxes-46.1-c99.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/936516
+https://gitlab.gnome.org/GNOME/gnome-boxes/-/merge_requests/648
+
+From 00183fd26a7b51905c179a427a38bfa18d9eb2d3 Mon Sep 17 00:00:00 2001
+From: sid <sidtosh4@gmail.com>
+Date: Wed, 22 May 2024 19:32:06 +0100
+Subject: [PATCH] libvirt-broker: Check when broker is not valid
+
+Related: #863
+--- a/src/libvirt-broker.vala
++++ b/src/libvirt-broker.vala
+@@ -24,9 +24,10 @@ public GVir.Connection get_connection (string name) {
+         return broker.connections.get (name);
+     }
+ 
+-    public async LibvirtMachine add_domain (CollectionSource source, GVir.Connection connection, GVir.Domain domain)
+-                                            throws GLib.Error {
+-        return_val_if_fail (broker != null, null);
++    public async LibvirtMachine? add_domain (CollectionSource source, GVir.Connection connection, GVir.Domain domain)
++                                             throws GLib.Error {
++        if (broker == null)
++            return null;
+ 
+         if (pending_domains.find (domain) != null) {
+             // Already being added asychronously
+-- 
+GitLab

diff --git a/gnome-extra/gnome-boxes/gnome-boxes-46.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-46.1.ebuild
index 568ae54a4ce0..e7ff1fecaa61 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-46.1.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-46.1.ebuild
@@ -75,6 +75,10 @@ If you have an Intel Processor, run:
 If you have an AMD Processor, run:
 # modprobe kvm-amd"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-46.1-c99.patch
+)
+
 pkg_pretend() {
 	linux-info_get_any_version
 


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

end of thread, other threads:[~2024-12-14 16:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-14 16:33 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-boxes/files/, gnome-extra/gnome-boxes/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2020-02-19 15:19 Mart Raudsepp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox