From nobody Tue Feb 10 21:19:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652867580; cv=none; d=zohomail.com; s=zohoarc; b=nqKjE2j7BQcYjugiBbRblrU0Hqyu1ikjIAe0uq5m0JRCNXm9XjHxsGWjnLDS9RGaNzkv+ces4yG4zb0hz2SBdN72UGiOOjp+E8srzqX5hdTBK05Tz5uAWYN1fEQ3dXYQn5CLHyLsxCVRTEmfGItjcogt/XxD1+3GVswwZ9+GB1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652867580; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7egFsMYZl2lhjnTL8ga3EcvAj1OWv9GRiFgDc9vslK0=; b=KRPBD7uBAOPFHHMB7s/eNUgYeQo7GlZQubXylsCVbdjB82gXEQe1i9bUW1Iy4VcFeNNwJ6VK98xLW9f9xe6SS1sd8bphH+54qH1PH01ascn9QBJf2Pbq+Oz63HU8MgUr36tex8lG0k7F3XN8Gkl73kLoKAGOUx/0cN2f8yeGPyI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1652867580576570.5688697247485; Wed, 18 May 2022 02:53:00 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-195-pCCR1An7NJeoaie_IKXQTg-1; Wed, 18 May 2022 05:52:54 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C232B3C11742; Wed, 18 May 2022 09:52:51 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AAD11401E89; Wed, 18 May 2022 09:52:51 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D65C719259F3; Wed, 18 May 2022 09:52:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0E0EB1947B84 for ; Wed, 18 May 2022 09:52:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 00C39492C14; Wed, 18 May 2022 09:52:50 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.40.194.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7CE6B401E89 for ; Wed, 18 May 2022 09:52:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652867579; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=7egFsMYZl2lhjnTL8ga3EcvAj1OWv9GRiFgDc9vslK0=; b=crfdfES0XGJtE7HgFehCaLYisy51JtKpWsOOPo/hUORGdOixjniC3Jkug/rlFfAMSi+Qkk ftflzrSwenbUXYYbOaUiOTrD4TGsSjddHcIBMEKP/0Hs29oSScQFNgGLvuEf6rEhRzGvqp Y7G3A1/9r8baiPr9czf47sU0H/XLA30= X-MC-Unique: pCCR1An7NJeoaie_IKXQTg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 2/7] po: Stop using 'glib' preset for i18n.gettext() Date: Wed, 18 May 2022 11:52:40 +0200 Message-Id: <20220518095245.253610-3-abologna@redhat.com> In-Reply-To: <20220518095245.253610-1-abologna@redhat.com> References: <20220518095245.253610-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652867582504100006 Content-Type: text/plain; charset="utf-8" Due to a bug in meson versions earlier than 0.60, the --add-comments that's part of the 'glib' preset and the --add-comments=3DTRANSLATORS: that we add ourselves might be passed to xgettext in the wrong order, resulting in a bunch of comments that we don't care about being added to the potfile. Most of the options included in the 'glib' preset are not applicable to libvirt anyway, so just stop using the preset and pass a few extra options explicitly instead. Signed-off-by: Andrea Bolognani --- po/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/meson.build b/po/meson.build index f4d95f97fe..d13466bc06 100644 --- a/po/meson.build +++ b/po/meson.build @@ -14,6 +14,9 @@ potfiles =3D configure_file( i18n.gettext( meson.project_name(), args: [ + '--from-code=3DUTF-8', + '--keyword=3D_', + '--keyword=3DN_', '--add-comments=3DTRANSLATORS:', '--directory=3D@0@'.format(meson.source_root()), '--directory=3D@0@'.format(meson.build_root()), @@ -22,7 +25,6 @@ i18n.gettext( '--package-version=3D@0@'.format(meson.project_version()), '--sort-output', ], - preset: 'glib', ) =20 potfiles_dep =3D [ --=20 2.35.3