From nobody Fri Nov 7 20:02:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548762351675948.1272439648734; Tue, 29 Jan 2019 03:45:51 -0800 (PST) Received: from localhost ([127.0.0.1]:47886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRpp-0006Ns-N0 for importer@patchew.org; Tue, 29 Jan 2019 06:45:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRk6-0001zO-GR for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goRk4-0001jK-Fl for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47850) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goRk4-0001cP-7C for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:48 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 534018AE56; Tue, 29 Jan 2019 11:39:38 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-66.ams2.redhat.com [10.36.112.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FD531759E; Tue, 29 Jan 2019 11:39:36 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 29 Jan 2019 11:39:20 +0000 Message-Id: <20190129113921.21599-5-berrange@redhat.com> In-Reply-To: <20190129113921.21599-1-berrange@redhat.com> References: <20190129113921.21599-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 29 Jan 2019 11:39:38 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/5] nsis: fix location of icons to be bundled in the installer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Baxter , Stefan Weil , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The bmp icon files no longer exist in the root of the installation tree. Instead we must reference the new icons subdirectory location introduced in commit a8260d3876389eb52ca5c62ed4d80cdb7e025c85 Author: Daniel P. Berrang=C3=A9 Date: Thu Jan 10 12:00:45 2019 +0000 ui: install logo icons to $prefix/share/icons Reported-by: Adam Baxter Signed-off-by: Daniel P. Berrang=C3=A9 --- qemu.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu.nsi b/qemu.nsi index 75f1608b9e..53fd974877 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -119,12 +119,12 @@ Section "${PRODUCT} (required)" File "${SRCDIR}\README" File "${SRCDIR}\VERSION" =20 - File "${BINDIR}\*.bmp" File "${BINDIR}\*.bin" File "${BINDIR}\*.dtb" File "${BINDIR}\*.rom" File "${BINDIR}\openbios-*" =20 + File /r "${BINDIR}\icons" File /r "${BINDIR}\keymaps" !ifdef CONFIG_GTK File /r "${BINDIR}\share" @@ -206,7 +206,6 @@ Section "Uninstall" Delete "$INSTDIR\COPYING.LIB" Delete "$INSTDIR\README" Delete "$INSTDIR\VERSION" - Delete "$INSTDIR\*.bmp" Delete "$INSTDIR\*.bin" Delete "$INSTDIR\*.dll" Delete "$INSTDIR\*.dtb" @@ -217,6 +216,7 @@ Section "Uninstall" Delete "$INSTDIR\qemu.exe" Delete "$INSTDIR\qemu-system-*.exe" Delete "$INSTDIR\qemu-doc.html" + RMDir /r "$INSTDIR\icons" RMDir /r "$INSTDIR\keymaps" RMDir /r "$INSTDIR\share" ; Remove generated files --=20 2.20.1