From nobody Tue Apr 30 05:20:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1641410209; cv=none; d=zohomail.com; s=zohoarc; b=MJNGsOyY+P4JqncsnjxA5lIz8o7khpF9BPRJpJIYdRsExML/PTHKG2BhXbVhEI/RrvUMLHHvpmYa7oKmqxntfo6178OcmRMKMMkl3DzCrRSdpC6DNqUvORiYUN+X25WKqKIia/qTh6P/8RPo+S+mugrPIBU3o12IZjaPrkwfR5s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641410209; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=m+nqggG0rL8HhYsj/YcdpvJS1y85maipQse/a3UKvmk=; b=A9/lsTJlTAGjDZBtzYHV1BiQRIBu0xM8F/s0r3RHZtBFEC07jDRS7Bo3Eb6fHl6Jr9dLa+pUMAFzcAek4KqOc8MXCyNtmj1jeXkA9CUNAHTnOzn2X4iQMYDFKgPPDBO8y0sNPvtrW7CMwHkCchQaEfeZnseC8x95CSb7RNfCPYY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1641410209273935.5685081298974; Wed, 5 Jan 2022 11:16:49 -0800 (PST) Received: from localhost ([::1]:53270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5BmB-00036W-5c for importer@patchew.org; Wed, 05 Jan 2022 14:16:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5Bdz-00056P-1h for qemu-devel@nongnu.org; Wed, 05 Jan 2022 14:08:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:46723) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5Bdw-0001hZ-G4 for qemu-devel@nongnu.org; Wed, 05 Jan 2022 14:08:17 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-21-LzLJ0rJQP8yuEgJf6AW8Kw-1; Wed, 05 Jan 2022 14:08:10 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C90911006AA3; Wed, 5 Jan 2022 19:08:08 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C46A10013C1; Wed, 5 Jan 2022 19:08:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641409694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m+nqggG0rL8HhYsj/YcdpvJS1y85maipQse/a3UKvmk=; b=DX09fYn8lAcUt6BGjbgcv6EGrwkBOpXEkiUEqjOWn6a3EfRPpEjnuPvQMgybgRo3Vw2f94 rt+T1fZnq7MwNkN9URAJPyUcC3GKzjKB7TD3CKgNQP0qsEAdeBVl31kqQTCnPZIhTT/i+i 1rLZeS0TshXaKOvjFHhXi4+U5ueV9JA= X-MC-Unique: LzLJ0rJQP8yuEgJf6AW8Kw-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PATCH] meson.build: Print gtk version in the summary info Date: Wed, 5 Jan 2022 20:08:04 +0100 Message-Id: <20220105190804.649316-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.372, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1641410210541100001 Content-Type: text/plain; charset="utf-8" The "gtk" variable is re-declared as "dependencies: [gtk, gtkx11]", so there is just a "YES" in the summary info if gtk has been found. Let's use the info from the library detection instead so that the library version is printed in the summary instead. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 82769749db..798811dfbb 100644 --- a/meson.build +++ b/meson.build @@ -1058,11 +1058,11 @@ gtk =3D not_found gtkx11 =3D not_found vte =3D not_found if not get_option('gtk').auto() or (have_system and not cocoa.found()) - gtk =3D dependency('gtk+-3.0', version: '>=3D3.22.0', - method: 'pkg-config', - required: get_option('gtk'), - kwargs: static_kwargs) - if gtk.found() + libgtk =3D dependency('gtk+-3.0', version: '>=3D3.22.0', + method: 'pkg-config', + required: get_option('gtk'), + kwargs: static_kwargs) + if libgtk.found() gtkx11 =3D dependency('gtk+-x11-3.0', version: '>=3D3.22.0', method: 'pkg-config', required: false, @@ -3410,7 +3410,7 @@ if targetos =3D=3D 'darwin' endif summary_info +=3D {'SDL support': sdl} summary_info +=3D {'SDL image support': sdl_image} -summary_info +=3D {'GTK support': gtk} +summary_info +=3D {'GTK support': libgtk} summary_info +=3D {'pixman': pixman} summary_info +=3D {'VTE support': vte} summary_info +=3D {'slirp support': slirp_opt =3D=3D 'internal' ? slir= p_opt : slirp} --=20 2.27.0