From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id EHxNF9hbV2df8AAAqHPOHw:P1 (envelope-from ) for ; Mon, 09 Dec 2024 21:06:32 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id EHxNF9hbV2df8AAAqHPOHw (envelope-from ) for ; Mon, 09 Dec 2024 22:06:32 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=SnKhEGsX; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="LU/jONrX"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733778392; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=yQt0gmDJ6Rjz8gVq7BHpVXKHOL3RLx66i/arH3SR+tE=; b=JtXeF66tHoDDfgf5FA/Rvi9TvwdKVD+yWGobk2Dng0KH+iabr5ifMcGj7ZuwK7Oa7Tq2tw KxBCne4Dc7Gs/dg9bI+m30t7FHYuha2977apTKRvBeMfaOrBAfqJ8p1vmmUNtrv9y9TL7u E04oG4QpqV3WmTH1z+70vYU5bz+D5RRbXGpIGyWvJO8Tc/4/+3W90Kw+3M1o9O8g0AtHfG F6EMvHWA/kJrGi0L0Ka9PPCvaVyQF6am/ukyOYqTqH63CpWI1ZayNDcb8MLsY1M7w2OT00 PHeiNWTdNw47t7PX6MfMT0c4oz8W14Hyyf2vT7JMU7SGURWc4cUoKgVTZJcLsg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=SnKhEGsX; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="LU/jONrX"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733778392; a=rsa-sha256; cv=none; b=BDVV6p4g7DBKwJgLq9At3ZS/ctqwfnXUS9Ptgi/BKzwUiOodioBDYqPHcLq/zjZjioZq5E 47SOmzj7ztYAi47VgO0v1/3QXj5UYlILqHZoPf4y1neqDSunt0vPquenxbQK4n9sd2AUR1 kjk7DwrJJ614SMU6E8/6JdGKOhlI4ZLZKnmRj65RzYI3f+3M1FYrPm65heOusokHKe/90e RoEXPqGcdDQehRdXgPee6+H1yiAlVtGC6uHVsWBnI37kzvnNKXYHbxhh9qBh/JWrwIQCQR vtCKwStj2SS1Gv8ELJwwqHc2VA1qSJGfpJWRUIkjdX4QFmJhaOSVbnvfLAFOFQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8AA8E7C79F for ; Mon, 09 Dec 2024 22:06:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tKkxB-0002Zw-Kx; Mon, 09 Dec 2024 16:06:05 -0500 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 1tKkx9-0002Zn-KT for guix-patches@gnu.org; Mon, 09 Dec 2024 16:06:03 -0500 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 1tKkx9-00066T-BZ for guix-patches@gnu.org; Mon, 09 Dec 2024 16:06:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:References:In-Reply-To:To:Subject; bh=yQt0gmDJ6Rjz8gVq7BHpVXKHOL3RLx66i/arH3SR+tE=; b=SnKhEGsXOvpbPElFd9CYibebt7xH3U6rSvoZ5S0n8x38V7BNTDvUVgQj7Gyc4hKprmxhxWRXqjWqpbHAH/dKsURRUqdIVDxh0lHwRGvwbiwNZfKWJ10tJRs7VdC0rOYAAC73mYqLY23Cv7D/NkGEfoeZUw8sxtdVVyuQMMekk3VKXQ1At+GgTNFdQDowvWm8M2/GBZ+XLjKjh95mvXerW3fM+hVXxLNkqz0msMbs9tbVWLxBLu8bcXCoqyQR+hPqv2cQi4jPfw1c+dyedK3XC2sqMW57WctrHdtd+wEI7Ce5YgpmPplcQeuduLD1VPWnLQf5tD1h+8UPjVq1n/bvxQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tKkx8-0006wP-T5; Mon, 09 Dec 2024 16:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74756] [PATCH gnome-team 3/3] gnu: gjs: Update to 1.82.1. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Mon, 09 Dec 2024 21:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74756 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74756@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu Received: via spool by 74756-submit@debbugs.gnu.org id=B74756.173377835226635 (code B ref 74756); Mon, 09 Dec 2024 21:06:02 +0000 Received: (at 74756) by debbugs.gnu.org; 9 Dec 2024 21:05:52 +0000 Received: from localhost ([127.0.0.1]:55909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKkwx-0006vT-Ds for submit@debbugs.gnu.org; Mon, 09 Dec 2024 16:05:51 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:48601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKkws-0006um-Oh for 74756@debbugs.gnu.org; Mon, 09 Dec 2024 16:05:47 -0500 Received: by mail-wm1-f67.google.com with SMTP id 5b1f17b1804b1-434e3953b65so18339115e9.1 for <74756@debbugs.gnu.org>; Mon, 09 Dec 2024 13:05:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733778281; x=1734383081; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=yQt0gmDJ6Rjz8gVq7BHpVXKHOL3RLx66i/arH3SR+tE=; b=LU/jONrXIxi0y+ynOMU4LCe3aRpgox84fT54DD4xr/yuU6QMnaWhpvXTtYjayw4UFv YOQZUr7L8b1Uda7vXoUthoq0LIfS3/+tFv4aUYiZKT3FU5BqrIdA9pBNSHS2kqWfnAqe CvixjIDUusbTn0rm8mvypxxaq+/rqyUB++lfnzCOYWKC5Es8mGiKJQaRqsZEhxpYg64v yn80FP8J6YWql7NojXBVpP3nP69hqQ9tfoK2xuTtz+E1cu8jsDT7tQXvyx9If5u7tP6H npsZqW3YOsyvhP7IHamCHgxO2I684aWSr9xbE02Sg15djnF9xwUZmLJ1BsMh0ED/Hzav Dc6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733778281; x=1734383081; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yQt0gmDJ6Rjz8gVq7BHpVXKHOL3RLx66i/arH3SR+tE=; b=K3RF/uIx7CuKKzI6FdBqPgjO7P+vEAdQPcFjk5bNgmSo1yUyEDQqznXtyAt76iqELJ 0zQOv+oJD3WY6SScLSMujGoUaStDWb+1tR7D6G+rpcJwDov12l0/VCFh/GVCFPYUakAB OowqC8v3TSy9gbhq02EjVK6s/9Oq2kvcD6vXHJOzHbnky05H06miMj0s1DGjJFFWG53i l0vDVo71gmY5z/8AxEpEALHigp4qr92Hct4fELHpCSapWYLh9xguGqRpNd0jwzPN3YOe 2IlghqWoCMTK093hpOqLbD+fRjycMyyn/hX0I8PDemAsoG/DQHDrl5+5teFiMrFIqk5y 4hAQ== X-Gm-Message-State: AOJu0YzjxQBxjdviw8WjncMgcHkwfiLrSZE9pMQGjx8K3llhzhCUv7GZ QiNeIiYCp7O62tRiJdzSH5++tHt+9/OtX7gqzUWMScGub7hX1fFSNeLJobO0 X-Gm-Gg: ASbGncstcbwVafPhFVXd5xVxsNTf8SBhhW2UdEFYjL5haPoIr0GEQZ1F5FT6kOr8Mfr pPHfLmytnDKiBDo6wDZn3UnNkvOvIMUxJ31UlgoCUPwD21MiX/HxxMHEjYeZpx2O6v4jJFQPTOI KnT1kHnzPANxTDTvzlPjnNQEvKYQoKj+Igj6ne7TIoiZC66HEPUUu4nVnzxAMW9i/lLNsL/qWRM A9OsGUWvtDoGkFJvlzr6ju2ruLs4Ogokys6pCt3Z0iintKbTMB9x1JmD/lchqgMKRVNu1Fqcv0U 7xz5XoaNq/14bHD5QXKOcKMLvA== X-Google-Smtp-Source: AGHT+IHjM9szCjfvko55sMGLTVTzEOz349g1UKutIxbNsmPu0QeeCGvOBflJ6+TXkVghrwKTirZ0gw== X-Received: by 2002:a05:6000:2a7:b0:385:e43a:4dd8 with SMTP id ffacd0b85a97d-386453d2b3bmr1489889f8f.4.1733778280949; Mon, 09 Dec 2024 13:04:40 -0800 (PST) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38621909754sm14396138f8f.80.2024.12.09.13.04.40 for <74756@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 13:04:40 -0800 (PST) Message-ID: <9ea171e4fecbac68b316c4e53bfa11f4be16a069.1733775119.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Mon, 9 Dec 2024 20:26:20 +0100 MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: 0.73 X-Spam-Score: 0.73 X-Migadu-Queue-Id: 8AA8E7C79F X-TUID: eTaTF1Swq0Of * gnu/packages/gnome.scm (gjs): Update to 1.82.1. * gnu/packages/patches/gjs-fix-closure-annotations.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 6 +- .../patches/gjs-fix-closure-annotations.patch | 99 ------------------- 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/gjs-fix-closure-annotations.patch diff --git a/gnu/local.mk b/gnu/local.mk index 30dca28a3b..34c82523ef 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1406,7 +1406,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/git-filter-repo-generate-doc.patch \ - %D%/packages/patches/gjs-fix-closure-annotations.patch \ %D%/packages/patches/gklib-suitesparse.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-skip-failing-test.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 292e7e87f5..af76610ad4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7867,7 +7867,7 @@ (define-public gnome-session (define-public gjs (package (name "gjs") - (version "1.76.3") + (version "1.82.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7875,9 +7875,7 @@ (define-public gjs name "-" version ".tar.xz")) (sha256 (base32 - "0knkbczic9874r2mnhc8yh9w63bmj574b7528ql0x3lf40nzcjx5")) - ;; TODO: Remove when updating to 1.82.0. - (patches (search-patches "gjs-fix-closure-annotations.patch")) + "0g39nl4x32x71c9gnwlrlv8jnpl2lnhmc7qpl7jy0vap6rbalfgv")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/gjs-fix-closure-annotations.patch b/gnu/packages/patches/gjs-fix-closure-annotations.patch deleted file mode 100644 index 1b440ef9da..0000000000 --- a/gnu/packages/patches/gjs-fix-closure-annotations.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 1df5d72d8df383199dcd88cd1d16209617bf32ca Mon Sep 17 00:00:00 2001 -From: Philip Chimento -Date: Sat, 27 Jul 2024 20:17:39 -0700 -Subject: [PATCH] GjsPrivate: Fix closure annotations - -Apparently the closure annotation can be omitted if the parameter is named -"user_data". If it is needed because the parameter is not named -"user_data" then the annotation should be on the callback argument and -refer to the user data argument. ---- - libgjs-private/gjs-util.c | 10 +++++----- - libgjs-private/gjs-util.h | 16 ++++++++-------- - 2 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/libgjs-private/gjs-util.c b/libgjs-private/gjs-util.c -index b264aec1e..ae65287f5 100644 ---- a/libgjs-private/gjs-util.c -+++ b/libgjs-private/gjs-util.c -@@ -235,7 +235,7 @@ void gjs_gtk_container_child_set_property(GObject* container, GObject* child, - * @store: a #GListStore - * @item: the new item - * @compare_func: (scope call): pairwise comparison function for sorting -- * @user_data: (closure): user data for @compare_func -+ * @user_data: user data for @compare_func - * - * Inserts @item into @store at a position to be determined by the - * @compare_func. -@@ -258,7 +258,7 @@ unsigned int gjs_list_store_insert_sorted(GListStore *store, GObject *item, - * gjs_list_store_sort: - * @store: a #GListStore - * @compare_func: (scope call): pairwise comparison function for sorting -- * @user_data: (closure): user data for @compare_func -+ * @user_data: user data for @compare_func - * - * Sort the items in @store according to @compare_func. - */ -@@ -270,7 +270,7 @@ void gjs_list_store_sort(GListStore *store, GjsCompareDataFunc compare_func, - /** - * gjs_gtk_custom_sorter_new: - * @sort_func: (nullable) (scope call): function to sort items -- * @user_data: (closure): user data for @compare_func -+ * @user_data: user data for @sort_func - * @destroy: destroy notify for @user_data - * - * Creates a new `GtkSorter` that works by calling @sort_func to compare items. -@@ -305,7 +305,7 @@ GObject* gjs_gtk_custom_sorter_new(GjsCompareDataFunc sort_func, - * gjs_gtk_custom_sorter_set_sort_func: - * @sorter: a `GtkCustomSorter` - * @sort_func: (nullable) (scope call): function to sort items -- * @user_data: (closure): user data to pass to @sort_func -+ * @user_data: user data to pass to @sort_func - * @destroy: destroy notify for @user_data - * - * Sets (or unsets) the function used for sorting items. -@@ -423,7 +423,7 @@ void gjs_log_set_writer_default() { - /** - * gjs_log_set_writer_func: - * @func: (scope notified): callback with log data -- * @user_data: (closure): user data for @func -+ * @user_data: user data for @func - * @user_data_free: (destroy user_data_free): destroy for @user_data - * - * Sets a given function as the writer function for structured logging, -diff --git a/libgjs-private/gjs-util.h b/libgjs-private/gjs-util.h -index 7ee83e0d8..11b7c7cbc 100644 ---- a/libgjs-private/gjs-util.h -+++ b/libgjs-private/gjs-util.h -@@ -124,11 +124,11 @@ typedef gboolean (*GjsBindingTransformFunc)(GBinding* binding, - * @target: - * @target_property: - * @flags: -- * @to_callback: (scope notified) (nullable): -- * @to_data: (closure to_callback): -+ * @to_callback: (scope notified) (nullable) (closure to_data): -+ * @to_data: - * @to_notify: (destroy to_data): -- * @from_callback: (scope notified) (nullable): -- * @from_data: (closure from_callback): -+ * @from_callback: (scope notified) (nullable) (closure from_data): -+ * @from_data: - * @from_notify: (destroy from_data): - * - * Returns: (transfer none): -@@ -149,11 +149,11 @@ GBinding* gjs_g_object_bind_property_full( - * @target: - * @target_property: - * @flags: -- * @to_callback: (scope notified) (nullable): -- * @to_data: (closure to_callback): -+ * @to_callback: (scope notified) (nullable) (closure to_data): -+ * @to_data: - * @to_notify: (destroy to_data): -- * @from_callback: (scope notified) (nullable): -- * @from_data: (closure from_callback): -+ * @from_callback: (scope notified) (nullable) (closure from_data): -+ * @from_data: - * @from_notify: (destroy from_data): - */ - GJS_EXPORT \ No newline at end of file -- 2.46.0