From patchwork Fri Feb 17 17:00:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 47051 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 90C471688A; Fri, 17 Feb 2023 17:03:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CD73C16793 for ; Fri, 17 Feb 2023 17:03:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pT484-0007MQ-ED; Fri, 17 Feb 2023 12:02:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pT47b-0006mi-MB for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pT47a-0000Le-Oc for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pT47a-00082k-K8 for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61576] [PATCH 11/21] gnu: spice-vdagent: Update to 0.22.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Feb 2023 17:02:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61576 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61576@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 61576-submit@debbugs.gnu.org id=B61576.167665330930755 (code B ref 61576); Fri, 17 Feb 2023 17:02:06 +0000 Received: (at 61576) by debbugs.gnu.org; 17 Feb 2023 17:01:49 +0000 Received: from localhost ([127.0.0.1]:41364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT47I-0007zx-CG for submit@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:48 -0500 Received: from mail-qt1-f172.google.com ([209.85.160.172]:36398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT472-0007xZ-Ny for 61576@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:33 -0500 Received: by mail-qt1-f172.google.com with SMTP id c11so265945qth.3 for <61576@debbugs.gnu.org>; Fri, 17 Feb 2023 09:01:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pvBKBTtNPKU9AGyZzD+JogYY467AMm+79GM27Dphv08=; b=O6QDOU8NODvRHZgXFUul+vtkT9GLoF7aa/GtH/pR7z0+Kd0mjtZKzpmb9t6LAbZSAv JqyLMxfoAsPSxTKDVxrGWEu7M84GH0HddlxAke3w32DDJSFidPZakoM8pBQ82yBPrROy YBZTs0UhiiIf+8EjUy0/fWPcvaZ6hULsGbY3CnST0nrRf0TRsIdC5iesV68ez5LYGjml TxhC/YxQzpPjuRdLe2Px6rnnLNfl/uMiEyrCKKjFm9HpQu1YCI4Gs8vYbcFDALZCDoHG CYIKpL2abBEkVfB/BpQi7QHoDje6mYcosm9SS037g3VjI1H5andzMPtgbSjnP31KLPcX NRbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pvBKBTtNPKU9AGyZzD+JogYY467AMm+79GM27Dphv08=; b=cP5PVZV6pwxalvWpZudyKPmUL8aQ9QDgZHaw3U6BHCRBjfsExD90/xkOlOtJ3Ie5eH nL9a23HlpM4XSYk1tah+/wZdAdurkbGoAOYEhm0o42/vVwrAm1AMntqnqvsSPBV3fpCR QAVpq2pJjHF0Tt2SwyhNwS097yqFjcNY5JKSBWby3Sb/8UsULvBGvPZ1pNxrx6nqbEuy Vdxhr9ZTBgduNw7/FBbXqTaDhlkinUbFfXmWJqnguCTKbcDUhBKY/B4L9bMwtMDEduG8 T4YKstqxcY/ST72RFo3PNMfbNI+jIxMjrzF4o1IfLsPZNL0mDekNs4HxR77kSlRS3Vxh FHQw== X-Gm-Message-State: AO0yUKWGp3HQGXoj0/jNAR4RAXfka8HKf73+iIFTXEZqmO9LMevbLuHH P2bVbpiD3H7wdrBNHYMdiXkFcpE9H+MDnuAO X-Google-Smtp-Source: AK7set/XPhslQGFdRcSBoNENG53dTWOC4ssmPltgVn2J8NRC7NnvDwPbqzZqTpNMGtWK6552KlbaOA== X-Received: by 2002:a05:622a:144d:b0:3b9:b6e8:8670 with SMTP id v13-20020a05622a144d00b003b9b6e88670mr2069124qtx.51.1676653286617; Fri, 17 Feb 2023 09:01:26 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id hf22-20020a05622a609600b003b85ed59fa2sm3455166qtb.50.2023.02.17.09.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 09:01:26 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 12:00:52 -0500 Message-Id: <20230217170103.10147-12-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217170103.10147-2-maxim.cournoyer@gmail.com> References: <20230217170103.10147-2-maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/spice.scm (spice-vdagent): Update to 0.22.1. [source]: Delete patch. * gnu/packages/patches/spice-vdagent-glib-2.68.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - .../patches/spice-vdagent-glib-2.68.patch | 112 ------------------ gnu/packages/spice.scm | 6 +- 3 files changed, 2 insertions(+), 117 deletions(-) delete mode 100644 gnu/packages/patches/spice-vdagent-glib-2.68.patch diff --git a/gnu/local.mk b/gnu/local.mk index 19bb32c95e..af34225bf9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1868,7 +1868,6 @@ dist_patch_DATA = \ %D%/packages/patches/spectre-meltdown-checker-externalize-fwdb.patch \ %D%/packages/patches/spectre-meltdown-checker-find-kernel.patch \ %D%/packages/patches/sphinxbase-fix-doxygen.patch \ - %D%/packages/patches/spice-vdagent-glib-2.68.patch \ %D%/packages/patches/sssd-system-directories.patch \ %D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/suitesparse-mongoose-cmake.patch \ diff --git a/gnu/packages/patches/spice-vdagent-glib-2.68.patch b/gnu/packages/patches/spice-vdagent-glib-2.68.patch deleted file mode 100644 index cd5f13a909..0000000000 --- a/gnu/packages/patches/spice-vdagent-glib-2.68.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 8348ef3c6121247e2b8be0641bbf3df3d55d9bff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Tue, 4 May 2021 13:20:47 +0400 -Subject: [PATCH] Fix g_memdup deprecation warning with glib >= 2.68 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Related to: -https://bugzilla.redhat.com/show_bug.cgi?id=1943059 - -Signed-off-by: Marc-André Lureau ---- - configure.ac | 4 ++++ - src/vdagent/vdagent.c | 4 ++-- - src/vdagent/x11-randr.c | 2 +- - src/vdagentd/vdagentd.c | 8 ++++---- - 4 files changed, 11 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7b2a99c..3de9b9b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -124,6 +124,10 @@ PKG_CHECK_MODULES(ALSA, [alsa >= 1.0.22]) - PKG_CHECK_MODULES([DBUS], [dbus-1]) - PKG_CHECK_MODULES([DRM], [libdrm]) - -+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.68], [], [ -+ AC_DEFINE(g_memdup2, g_memdup, [GLib2 < 2.68 compatibility]) -+]) -+ - if test "$with_session_info" = "auto" || test "$with_session_info" = "systemd"; then - PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN], - [libsystemd >= 209], -diff --git a/src/vdagent/vdagent.c b/src/vdagent/vdagent.c -index 0c69907..fd08522 100644 ---- a/src/vdagent/vdagent.c -+++ b/src/vdagent/vdagent.c -@@ -228,7 +228,7 @@ static void daemon_read_complete(UdscsConnection *conn, - break; - case VDAGENTD_AUDIO_VOLUME_SYNC: { - VDAgentAudioVolumeSync *avs = (VDAgentAudioVolumeSync *)data; -- uint16_t *volume = g_memdup(avs->volume, sizeof(uint16_t) * avs->nchannels); -+ uint16_t *volume = g_memdup2(avs->volume, sizeof(uint16_t) * avs->nchannels); - - if (avs->is_playback) { - vdagent_audio_playback_sync(avs->mute, avs->nchannels, volume); -@@ -414,7 +414,7 @@ int main(int argc, char *argv[]) - GOptionContext *context; - GError *error = NULL; - VDAgent *agent; -- char **orig_argv = g_memdup(argv, sizeof(char*) * (argc+1)); -+ char **orig_argv = g_memdup2(argv, sizeof(char*) * (argc+1)); - orig_argv[argc] = NULL; /* To avoid clang analyzer false-positive */ - - context = g_option_context_new(NULL); -diff --git a/src/vdagent/x11-randr.c b/src/vdagent/x11-randr.c -index 27404a1..037aded 100644 ---- a/src/vdagent/x11-randr.c -+++ b/src/vdagent/x11-randr.c -@@ -982,7 +982,7 @@ void vdagent_x11_set_monitor_config(struct vdagent_x11 *x11, - fullscreen it will keep sending the failing config. */ - g_free(x11->randr.failed_conf); - x11->randr.failed_conf = -- g_memdup(mon_config, config_size(mon_config->num_of_monitors)); -+ g_memdup2(mon_config, config_size(mon_config->num_of_monitors)); - return; - } - } -diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c -index 78378aa..3e59331 100644 ---- a/src/vdagentd/vdagentd.c -+++ b/src/vdagentd/vdagentd.c -@@ -216,7 +216,7 @@ static void do_client_monitors(VirtioPort *vport, int port_nr, - vdagentd_write_xorg_conf(new_monitors); - - g_free(mon_config); -- mon_config = g_memdup(new_monitors, size); -+ mon_config = g_memdup2(new_monitors, size); - - /* Send monitor config to currently active agent */ - if (active_session_conn) -@@ -249,7 +249,7 @@ static void do_client_capabilities(VirtioPort *vport, - { - capabilities_size = VD_AGENT_CAPS_SIZE_FROM_MSG_SIZE(message_header->size); - g_free(capabilities); -- capabilities = g_memdup(caps->caps, capabilities_size * sizeof(uint32_t)); -+ capabilities = g_memdup2(caps->caps, capabilities_size * sizeof(uint32_t)); - - if (caps->request) { - /* Report the previous client has disconnected. */ -@@ -647,7 +647,7 @@ static void virtio_port_read_complete( - case VD_AGENT_GRAPHICS_DEVICE_INFO: { - // store device info for re-sending when a session agent reconnects - g_free(device_info); -- device_info = g_memdup(data, message_header->size); -+ device_info = g_memdup2(data, message_header->size); - device_info_size = message_header->size; - forward_data_to_session_agent(VDAGENTD_GRAPHICS_DEVICE_INFO, data, message_header->size); - break; -@@ -1090,7 +1090,7 @@ static void do_agent_xorg_resolution(UdscsConnection *conn, - } - - g_free(agent_data->screen_info); -- agent_data->screen_info = g_memdup(data, header->size); -+ agent_data->screen_info = g_memdup2(data, header->size); - agent_data->width = header->arg1; - agent_data->height = header->arg2; - agent_data->screen_count = n; --- -GitLab - diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 9483a5966d..1654ae141e 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -253,7 +253,7 @@ (define-public spice (define-public spice-vdagent (package (name "spice-vdagent") - (version "0.21.0") + (version "0.22.1") (source (origin (method url-fetch) (uri (string-append @@ -261,9 +261,7 @@ (define-public spice-vdagent "spice-vdagent-" version ".tar.bz2")) (sha256 (base32 - "0n8jlc1pv6mkry161y656b1nk9hhhminjq6nymzmmyjl7k95ymzx")) - (patches - (search-patches "spice-vdagent-glib-2.68.patch")))) + "18472sqr0gibzgzi48dpcbnvm78l05qrl5wv6xywqqj7r9dd3c4k")))) (build-system gnu-build-system) (arguments `(#:configure-flags