From patchwork Fri Jun 28 17:11:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Karl Hallsby X-Patchwork-Id: 65741 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 32F7427BBE9; Fri, 28 Jun 2024 18:16:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 188D527BBE2 for ; Fri, 28 Jun 2024 18:16:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sNFCh-0000dq-Vx; Fri, 28 Jun 2024 13:16:08 -0400 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 1sNFCc-0000dG-Op for guix-patches@gnu.org; Fri, 28 Jun 2024 13:16:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sNFCc-0001Iu-CH for guix-patches@gnu.org; Fri, 28 Jun 2024 13:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sNFCc-0004Bd-BN for guix-patches@gnu.org; Fri, 28 Jun 2024 13:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71825] [PATCH] gnu: Fix virt-manager for systems with no GTK cursor. Resent-From: Karl Hallsby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Jun 2024 17:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71825 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71825@debbugs.gnu.org Cc: Karl Hallsby X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171959493416036 (code B ref -1); Fri, 28 Jun 2024 17:16:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jun 2024 17:15:34 +0000 Received: from localhost ([127.0.0.1]:46282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sNFC9-0004AY-FZ for submit@debbugs.gnu.org; Fri, 28 Jun 2024 13:15:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:41948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sNFC7-0004AR-W7 for submit@debbugs.gnu.org; Fri, 28 Jun 2024 13:15:32 -0400 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 1sNFC7-0000ZG-Dn for guix-patches@gnu.org; Fri, 28 Jun 2024 13:15:31 -0400 Received: from mail-io1-xd29.google.com ([2607:f8b0:4864:20::d29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sNFC5-0001EH-FW for guix-patches@gnu.org; Fri, 28 Jun 2024 13:15:31 -0400 Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-7f3cd64e71cso24312339f.3 for ; Fri, 28 Jun 2024 10:15:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hallsby.com; s=google; t=1719594927; x=1720199727; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+g51LbAeUXJACA5+aETfakMLFS6/5OYMBzUwBoomrwk=; b=E9728msF5KT63dPYlEs4O7Bupz4HZ7/PQ+vikqoBTrs2k69V+wJCLVqmWWhrzl4Lg1 ooM2CpvmR1kj6q8OZRl6cLiLMRv+Amec6yAec/MUpjkOPcf0MTkzjfJlbyvFUj0kSIxF MXLvcBnfjM2oGS3Hjv5VThkSUWmhhy36wwkQ5iC8ML5ywsix+GkGijAfbCr1lP1NO7qf 0VhK3BBOmzm5xV6Y38SJgq1mnVIt48CqwHYA9sAZYEUWJe8JOK2MQIMxyD2LAlnm+I3s 6ZDrh4FH5fXUFOEEkyEglfZC3g2CPN3Bz3C+9iQkL7YSzWasuYFHGZVq/23rCSm65qP7 xvPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719594927; x=1720199727; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+g51LbAeUXJACA5+aETfakMLFS6/5OYMBzUwBoomrwk=; b=oSZ8wKO5Af9T/IHVnMWUC4bMbi0fEChuB041Vca9RStjgWZjCuJTh+33Yk6loprfUt Qbv3bGt1/RV9VK28l7HB6tS8hjHkW6Pu1zAW7btFQxbnfkvuFHNnYJj+0TMTGs3rKWW2 Hes7e2p7vevuWnl0rZ529DHrJANX1necnzQUHiBzZmDecywTXKLlyAChSXDkH/WnBXiP ZdwAXYQbRTKh97sdj4o1nOaCuJIcx4GFRtPuFAFWgXUatiCNEANwI3EHYafaTHtoDwvz d+QXCKU66gw98PfCaWWkLBhzE7RdFdjUf6m4JOM58OG4QWVNfJsDzXsxzsFA/jS57Kqq 16Tw== X-Gm-Message-State: AOJu0YzPUeTp0Q9c+BFL98d/1/AwC+fZGucj5bqmRGKavs9V1gug0VDb MCBHMEBxfmUjhgurXzzm2UJYPHo7snxgWIcb6yb1dnoypy8fxR2+s/WSi1QfTLhr6DHi370eiYM = X-Google-Smtp-Source: AGHT+IF4QuLwLd7nGzyJt2omKjet54SpCGKIGngKvNr3IVtnEQN8EyutWZITFFZx+jtFzslUlVrpcA== X-Received: by 2002:a05:6602:3f87:b0:7f3:a7d9:5922 with SMTP id ca18e2360f4ac-7f3a7d95ce7mr2114003739f.8.1719594927192; Fri, 28 Jun 2024 10:15:27 -0700 (PDT) Received: from avocato.wireless.northwestern.private (wireless-165-124-85-63.nuwlan.northwestern.edu. [165.124.85.63]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4bb73e08ec1sm628802173.79.2024.06.28.10.15.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jun 2024 10:15:26 -0700 (PDT) Date: Fri, 28 Jun 2024 12:11:37 -0500 Message-ID: <0a50bb4e0f82808a4edd2884871d45fdc1540870.1719594662.git.karl@hallsby.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d29; envelope-from=karl@hallsby.com; helo=mail-io1-xd29.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Karl Hallsby X-ACL-Warn: , Karl Hallsby via Guix-patches X-Patchwork-Original-From: Karl Hallsby via Guix-patches via From: Karl Hallsby 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/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch: New file. * gnu/local.mk (dist_patch_DATA): Register file. * gnu/packages/virtualization.scm (virt-manager)[source]: Add patch. Change-Id: I4db2015a5d4ac3eca3cfa5d3eec20b357c2d3ff9 --- This patch fixes an issue in virt-manager 4.1.0 where it errors and returns a stack trace. Namely, Gdk.Cursor.new_from_name yields a "constructor returned NULL" error, which causes a "'NoneType' object has no attribute 'conn'" error later. gnu/local.mk | 1 + ...anager-fix-gtk-cursor-theme-backtace.patch | 27 +++++++++++++++++++ gnu/packages/virtualization.scm | 4 ++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch base-commit: ae55410e0752000268b31c71dddea58e6106522a diff --git a/gnu/local.mk b/gnu/local.mk index e20ed2be7e..7c626cabf1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2214,6 +2214,7 @@ dist_patch_DATA = \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch \ + %D%/packages/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ diff --git a/gnu/packages/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch b/gnu/packages/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch new file mode 100644 index 0000000000..f0b34bc4e4 --- /dev/null +++ b/gnu/packages/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch @@ -0,0 +1,27 @@ +From cc4a39ea94f42bc92765eb3bb56e2b7f9198be67 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Thu, 19 Jan 2023 11:13:56 -0500 +Subject: [PATCH] asyncjob: Fix backtrace when no cursor theme installed + +Fixes: https://github.com/virt-manager/virt-manager/issues/479 + +Signed-off-by: Cole Robinson +--- + virtManager/asyncjob.py | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/virtManager/asyncjob.py b/virtManager/asyncjob.py +index 32d9c0a16..46692acea 100644 +--- a/virtManager/asyncjob.py ++++ b/virtManager/asyncjob.py +@@ -265,9 +265,7 @@ def run(self): + self.topwin.present() + + if not self.cancel_cb and self.show_progress: +- gdk_window = self.topwin.get_window() +- gdk_window.set_cursor( +- Gdk.Cursor.new_from_name(gdk_window.get_display(), "progress")) ++ self._set_cursor("progress") + self._bg_thread.start() + + diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 16c2b75510..3136db33b5 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023, 2024 Hartmut Goebel ;;; Copyright © 2024 Janneke Nieuwenhuizen +;;; Copyright © 2024 Raven Hallsby ;;; ;;; This file is part of GNU Guix. ;;; @@ -1663,7 +1664,8 @@ (define-public virt-manager version ".tar.gz")) (sha256 (base32 - "18lhlnd3gmyzhbnjc16gdyzhjcd33prlxnca4xlidiidngbq21lm")))) + "18lhlnd3gmyzhbnjc16gdyzhjcd33prlxnca4xlidiidngbq21lm")) + (patches (search-patches "virt-manager-fix-gtk-cursor-theme-backtace.patch")))) (build-system python-build-system) (arguments (list #:use-setuptools? #f ; uses custom distutils 'install' command