From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 16 08:03:55 2023 Received: (at submit) by debbugs.gnu.org; 16 Sep 2023 12:03:55 +0000 Received: from localhost ([127.0.0.1]:45616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhU1i-0003j5-Rr for submit@debbugs.gnu.org; Sat, 16 Sep 2023 08:03:55 -0400 Received: from lists.gnu.org ([2001:470:142::17]:59180) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhU1g-0003ih-Qs for submit@debbugs.gnu.org; Sat, 16 Sep 2023 08:03:53 -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 1qhU1U-0007kL-Bu for guix-patches@gnu.org; Sat, 16 Sep 2023 08:03:40 -0400 Received: from mx1.riseup.net ([198.252.153.129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qhU1S-0000w8-9i for guix-patches@gnu.org; Sat, 16 Sep 2023 08:03:40 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4RnqTN2CxWzDqLb; Sat, 16 Sep 2023 12:03:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1694865816; bh=E2wYab3uA+Avf9VFgoqPzB5ZsBifoLOVzFoD2hmgHxs=; h=From:To:Cc:Subject:Date:From; b=kK8xuAgDmdHPR/C0jTDmHXl7UaLrBcX6TvUUCt3RHGxGZAXPRP8KNUxadSBUBz0Lb LURHOAtW6dATJo7bFq9/LLIsh9DziaHcBZV4qAJBaij2VecVthHJQxPnK7TpyIPNvF X6181q45qwT8NyDqrsq1pTTyffmSjhc8/VJ+yLXM= X-Riseup-User-ID: 8ABE5230C5522E03E9937CCF00935AB07787C2221043A3A66DA1B6FF7B754373 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RnqTM0cZpzFsH2; Sat, 16 Sep 2023 12:03:34 +0000 (UTC) From: raingloom To: guix-patches@gnu.org Subject: [PATCH] gnu: Patch gnome-dictionary meson configs, fixes 63687. Date: Sat, 16 Sep 2023 14:03:11 +0200 Message-ID: <1e17e882afc871f9fd1c1ea0a1ddcc997fabcbfb.1694865791.git.raingloom@riseup.net> MIME-Version: 1.0 X-Debbugs-Cc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=198.252.153.129; envelope-from=raingloom@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit Cc: 63687@debbugs.gnu.org, raingloom X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnome.scm (gnome-dictionary): Apply patch. * gnu/packages/patches/gnome-dictionary-meson-i18n.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 4 +- .../patches/gnome-dictionary-meson-i18n.patch | 52 +++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gnome-dictionary-meson-i18n.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4f8637418a..ad7407a3b9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1306,6 +1306,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnome-2048-fix-positional-argument.patch \ %D%/packages/patches/gnome-control-center-libexecdir.patch \ + %D%/packages/patches/gnome-dictionary-meson-i18n.patch \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \ %D%/packages/patches/gnome-settings-daemon-gc.patch \ %D%/packages/patches/gnome-session-support-elogind.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 36fe1a80a1..908b5782b5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10497,7 +10497,9 @@ (define-public gnome-dictionary name "-" version ".tar.xz")) (sha256 (base32 - "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f")))) + "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f")) + (patches + (search-patches "gnome-dictionary-meson-i18n.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/gnome-dictionary-meson-i18n.patch b/gnu/packages/patches/gnome-dictionary-meson-i18n.patch new file mode 100644 index 0000000000..fea45af69a --- /dev/null +++ b/gnu/packages/patches/gnome-dictionary-meson-i18n.patch @@ -0,0 +1,52 @@ +From 71933f6586475b36c70ef325373fe6d50c7a034f Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 24 Jan 2022 11:13:54 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. +data/meson.build:6:5: ERROR: Function does not take positional arguments. +data/meson.build:49:5: ERROR: Function does not take positional arguments. +--- + data/appdata/meson.build | 2 +- + data/meson.build | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/data/appdata/meson.build b/data/appdata/meson.build +index 1dc4ed7..e44a58e 100644 +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,6 +1,6 @@ + appdata_conf = configuration_data() + appdata_conf.set('application_id', application_id) +-i18n.merge_file('appdata', ++appdata_file = i18n.merge_file( + input: configure_file( + input: 'org.gnome.Dictionary.appdata.xml.in.in', + output: 'org.gnome.Dictionary.appdata.xml.in', +diff --git a/data/meson.build b/data/meson.build +index 660e6b8..7ec7251 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -3,7 +3,7 @@ subdir('appdata') + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) + desktop_conf.set('application_id', application_id) +-i18n.merge_file('desktop', ++desktop_file = i18n.merge_file( + input: configure_file( + input: 'org.gnome.Dictionary.desktop.in.in', + output: 'org.gnome.Dictionary.desktop.in', +@@ -45,7 +45,7 @@ sources = [ + ] + + foreach s: sources +- i18n.merge_file('sources', ++ i18n.merge_file( + input: '@0@.in'.format(s), + output: s, + install: true, +-- +2.41.0 + base-commit: 07d43c66d5c11fef61f9846fefb97fa18e4764f1 prerequisite-patch-id: eb16d5ed274dbedb1425d7a092aa75a6424299de -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 16 11:52:13 2023 Received: (at 66031-done) by debbugs.gnu.org; 16 Sep 2023 15:52:13 +0000 Received: from localhost ([127.0.0.1]:48328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhXae-000223-Ub for submit@debbugs.gnu.org; Sat, 16 Sep 2023 11:52:13 -0400 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:59879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhXaa-00021k-MB; Sat, 16 Sep 2023 11:52:11 -0400 Received: by mail-ed1-x542.google.com with SMTP id 4fb4d7f45d1cf-52f9a45b4bdso3712709a12.3; Sat, 16 Sep 2023 08:52:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694879515; x=1695484315; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=GEvXAxdKc9QTW+STUrCYDtBM9e+n0gG0HvdzWzJndJg=; b=V2iPMGcnlhL6+j0AQMsJzWAQNdySlK78eRZPUjafflCPk+acBe3yoHvPOdwZvSGu03 W+85oK2iZpGm7wc4PNdhlIqgfS6KsuwgFLgrisUaxqNLYMARiaH/tgnF5XW0YDampDSq Xik3f/Bzv+p6OmX0jb+7e976CIMn5INs8GAmJvv1BVl2KnViCiWYDz0pmalBd2Pv1elD bGhefGHVJUv1wLWE2cwZJoA3ySm2Et5QPkbL4Ue5yhYyxRMRrq5LBhVydWriw6tAIbPE /a3mTjjBJnV5zae33L1p4JksrmZb9rTNN4ICIYCXeTBtlM39r50cskmBzM7y3QmpvvMl YTMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694879515; x=1695484315; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=GEvXAxdKc9QTW+STUrCYDtBM9e+n0gG0HvdzWzJndJg=; b=VKRRkYZJqikt4QLEDYcWgh80p9UqylNuCNq0MTWNP624ZZ3wu837DkuRc4KB66tKQU ni8mDFMCPR116hoDwXdwWj4EYzX8nApt0+0TC4hyCq2tmz2NRWP9+GmlZilmmbl7rYIu pHbCSTafDmYhc0PEQJvXZlePta5XRf5p+iX8i0ADgdr7zk8JEDyzjVyazXy8ec6x+4/5 GAV4rqwfW2xN5OMOoIxSDsUYd8DPcaptWC2U6MICMr5++fMxZrOmW+2fexD8d2Ul5/ws S9SUEEndzyi68TW435sZuED0TIRtw4ABEUZ8sWNt3s5NXEbxT/5P7HD3/brb8zWvFZXL v9gQ== X-Gm-Message-State: AOJu0YwANp11i+IdDgkubD1d3YZ0kx1vnXxcMcQkZKUcV6u6bgoe+/ov 3EpRGa0MYEOZaLRCh8Ie6l8= X-Google-Smtp-Source: AGHT+IEQUJCS/iGiUb0UoRG4Pzeu8KkKtrNn4suHG57MntdmaFLjVrQVM1n/AxDrxYyiFWRZXijZYw== X-Received: by 2002:a17:907:a04a:b0:9ad:8d45:6887 with SMTP id gz10-20020a170907a04a00b009ad8d456887mr3829115ejc.71.1694879514864; Sat, 16 Sep 2023 08:51:54 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x7-20020a170906134700b00992e94bcfabsm3917171ejb.167.2023.09.16.08.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Sep 2023 08:51:53 -0700 (PDT) Message-ID: <0d4fed40da1b863f1518ff33e3b775813ed6ad01.camel@gmail.com> Subject: Re: [bug#66031] [PATCH] gnu: Patch gnome-dictionary meson configs, fixes 63687. From: Liliana Marie Prikler To: raingloom , 66031-done@debbugs.gnu.org Date: Sat, 16 Sep 2023 17:51:52 +0200 In-Reply-To: <1e17e882afc871f9fd1c1ea0a1ddcc997fabcbfb.1694865791.git.raingloom@riseup.net> References: <1e17e882afc871f9fd1c1ea0a1ddcc997fabcbfb.1694865791.git.raingloom@riseup.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66031-done Cc: Raghav Gururajan , Maxim Cournoyer , 63687-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 16.09.2023 um 14:03 +0200 schrieb raingloom: > * gnu/packages/gnome.scm (gnome-dictionary): Apply patch. > * gnu/packages/patches/gnome-dictionary-meson-i18n.patch: New file. > * gnu/local.mk: Add it. > --- Reworded slightly and applied. Thanks PS: Don't worry about the semantics of the Fixes: line that I added; we aren't parsing them yet. From unknown Fri Jun 20 19:53:40 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 15 Oct 2023 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator