[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-boxes/, gnome-extra/gnome-boxes/files/
commit: 0cbd505fd408e3f45e818ad69105ccce662e
Author: Christophe Lermytte lermytte be>
AuthorDate: Mon Jan 24 21:06:18 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 25 00:49:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cbd505f
gnome-extra/gnome-boxes: fix build with meson-0.61
Closes: https://bugs.gentoo.org/831934
Signed-off-by: Christophe Lermytte lermytte.be>
Signed-off-by: Sam James gentoo.org>
.../files/41.3-fix-build-with-meson-0.61.1.patch | 38 ++
gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild| 4 +++
2 files changed, 42 insertions(+)
diff --git
a/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch
b/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index ..d777e414f9f7
--- /dev/null
+++ b/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,38 @@
+https://gitlab.gnome.org/GNOME/gnome-boxes/-/commit/fd0acfbe79444687c73dea182c2d1a5fa1c77324
+https://bugs.gentoo.org/831934
+
+From: Michal Vasilek
+Date: Sat, 15 Jan 2022 00:07:31 +0100
+Subject: [PATCH] build: remove positional i18n.merge_file arguments
+
+otherwise building with meson 0.61+ fails:
+
+ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index d32638a8..2dc1798b 100644
+--- a/data/meson.build
b/data/meson.build
+@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes',
+ desktop_conf = configuration_data ()
+ desktop_conf.set ('icon', application_id)
+ desktop = i18n.merge_file (
+- 'desktop',
+ input: configure_file (
+ input: files ('org.gnome.Boxes.desktop.in'),
+ output: 'org.gnome.Boxes.desktop.in',
+@@ -65,7 +64,7 @@ configure_file (
+
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+ input: configure_file (
+ input: files ('org.gnome.Boxes.appdata.xml.in'),
+ output: 'org.gnome.Boxes.appdata.xml.in',
+--
+GitLab
+
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
b/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
index a2108ec7a02c..1c25fa6b9c26 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
@@ -76,6 +76,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
+)
+
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:
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-boxes/, gnome-extra/gnome-boxes/files/
commit: d2a931b54ada19e8f6eed3b7527e4c5a79a278dc
Author: Mart Raudsepp gentoo org>
AuthorDate: Mon Apr 20 20:34:59 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon Apr 20 20:42:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a931b5
gnome-extra/gnome-boxes: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
gnome-extra/gnome-boxes/Manifest | 2 -
.../gnome-boxes/files/3.32.2-vala-compat.patch | 28 -
gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild | 127 ---
gnome-extra/gnome-boxes/gnome-boxes-3.32.2.ebuild | 134 -
4 files changed, 291 deletions(-)
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 9d5a7000b40..e1b666ef611 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,3 +1 @@
-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
DIST gnome-boxes-3.34.4.tar.xz 1191668 BLAKE2B
98a206abdd8a181979b6d40f176b0a1518b51ebd312929c8eab549e6de83b1d299f4c3177d6b2b07873c2e620a744b627adce6bc1c0ef5ae2aac55189377de4f
SHA512
025bfe6fe583cedd80b376b96e87a8ecbbb8f4d723490cf18cc2ca73cb959d9e2bae1b784cc1018866c594962d1e508e5a3b9c9562763eb76e7291c5f6189463
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
deleted file mode 100644
index 548064be909..000
--- a/gnome-extra/gnome-boxes/files/3.32.2-vala-compat.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8aaf59870b9972f228e073a674b254b1e4cda2de Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro
-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.30.3.ebuild
b/gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild
deleted file mode 100644
index 5ea890daa90..000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.36"
-# 0.46 has problems with spice-client-glib-2.0.vapi exposing a bad constructor
-# 0.40 and 0.44 have problems with gdk modifier types, for which we have patch
in 3.32 bump
-VALA_MAX_API_VERSION="0.36"
-
-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
-COMMON_DEPEND="
- >=app-arch/libarchive-3:=
- >=dev-libs/glib-2.52:2
- >=dev-libs/gobject-introspection-1.54:=
- >=x11-libs/gtk+-3.22.20:3[introspection]
- >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
- >=dev-libs/libgudev-165:=
- >=sys-libs/libosinfo-1.1.0
- app-crypt/libsecret
- >=net-libs/libsoup-2.44:2.4
-
