From patchwork Thu Jul 11 07:57:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 66143 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BE65027BBE2; Thu, 11 Jul 2024 09:02:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7B8D827BBE9 for ; Thu, 11 Jul 2024 09:02:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sRoit-0005Pk-Bq; Thu, 11 Jul 2024 04:00:15 -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 1sRoij-0005Hl-8i for guix-patches@gnu.org; Thu, 11 Jul 2024 04:00:05 -0400 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 1sRoii-0006cV-UL for guix-patches@gnu.org; Thu, 11 Jul 2024 04:00:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sRoii-000413-Bn for guix-patches@gnu.org; Thu, 11 Jul 2024 04:00:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71781] [PATCH v4 03/29] gnu: libmateweather: Update to 1.28.0. Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2024 08:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71781 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71781@debbugs.gnu.org Cc: Andy Tai Received: via spool by 71781-submit@debbugs.gnu.org id=B71781.172068475614989 (code B ref 71781); Thu, 11 Jul 2024 08:00:04 +0000 Received: (at 71781) by debbugs.gnu.org; 11 Jul 2024 07:59:16 +0000 Received: from localhost ([127.0.0.1]:50821 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRohw-0003tb-8s for submit@debbugs.gnu.org; Thu, 11 Jul 2024 03:59:16 -0400 Received: from mail-oa1-f46.google.com ([209.85.160.46]:60559) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRoht-0003sn-Qf for 71781@debbugs.gnu.org; Thu, 11 Jul 2024 03:59:15 -0400 Received: by mail-oa1-f46.google.com with SMTP id 586e51a60fabf-25e3d388580so308966fac.0 for <71781@debbugs.gnu.org>; Thu, 11 Jul 2024 00:59:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720684688; x=1721289488; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=1fK9dJMCjezFU0sgsF914voanu0jWKhCEyUJqbzdXnc=; b=nPBVmoe7wbbAEh9S+LpwaKlZORiA3JlCt7bRUK6jV6+ORuQBQjrCBzGwA3IyxN6pLB IIHEdgJjxkbJzvuNIcVTKlvh2+WVGKJR6DjXRs7ts1X1ruZAYPzv3gpGfqBkQGFjhnU/ BkqlYBieJsZwN1bdLZKE2G+sPHI6p/5pv+erpS1Ygo1ckJJr9fXZxi/nKF14G+5cgNq2 Xqkdw07ViVfMjgfXqyU3vqAwO6FCoFc7dR2/4iE5S5Z0LRq2Djwal18pJCvXulh/8THD +oGAYKNwNkIzBxd/BXvWCGUjA6ey9W+Pil5HgEeKuQLhN8hHBhHeGHhfOj3zGQzH9lly q9mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720684688; x=1721289488; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1fK9dJMCjezFU0sgsF914voanu0jWKhCEyUJqbzdXnc=; b=dWFGCPp6Bquq/p2b44sCZB2c0sMC3LxyHSGwdY10Lj3Vja/ZufmPkE5JHql6mgG2ZD 82sQzno9eW3mALntmWQp/l5z35AnDcTg/L7IlJoVzG63Um+K35Jf8RYG6CN8bFAR+oyB MUbiDm8KzJpZkxVOJdgMHGlLAqH7RKxgjVfbvMbl/BSjcuT6T2829FqyxB5Qbd1Kwc0L Mc/7PArNzWPnzDUV3JHq37lzgwwhsWt5BLyewC5HQN2rvLqwA5yRRMlg1ZsQFkHfVfXr PpCRqxd1tM17FnV9R1Ds9CGhKN6SlhOOrUrLUZz24/xx7v68miz/zu/QJ+UWWlOMetNI bgIw== X-Gm-Message-State: AOJu0YzLTjIJT9CaCLuRd3MdRCuTW9AS/joTRzP7v5CQ1mboe4sZlvRv mENpu96ZSmV2bbY1bsCS8a6Xgwi6tUlUAH2urt2fa9mAiz6zLCpL1yRC2Q== X-Google-Smtp-Source: AGHT+IFgVMBk1HfUCK7QSzlT6Ls/Tez7Y6ZcvP4yMhH2V2jDZ0KZpUI+quPwRZcDIseGfNDqpTgG6w== X-Received: by 2002:a05:6871:331d:b0:25e:2923:a37b with SMTP id 586e51a60fabf-25eaec38e1bmr6159515fac.55.1720684688343; Thu, 11 Jul 2024 00:58:08 -0700 (PDT) Received: from DEskMiniX300.. (c-98-37-226-154.hsd1.ca.comcast.net. [98.37.226.154]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b4397f3c6sm5031532b3a.157.2024.07.11.00.58.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 00:58:07 -0700 (PDT) From: Andy Tai Date: Thu, 11 Jul 2024 00:57:34 -0700 Message-Id: <6843410d7bc3ced3709bc91db694c4b213776418.1720684465.git.atai@atai.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mate.scm (libmateweather): Update to 1.28.0 * gnu/packages/patches/libmateweather-use-TZDIR.patch: Removed. * gnu/local.mk: Update accordingly. Change-Id: I7432dd65bcf00e9f44d610fad337b629714fb3d2 --- gnu/local.mk | 1 - gnu/packages/mate.scm | 6 +-- .../patches/libmateweather-use-TZDIR.patch | 42 ------------------- 3 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 gnu/packages/patches/libmateweather-use-TZDIR.patch diff --git a/gnu/local.mk b/gnu/local.mk index 282cf30f7f..ce55e5a3c7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1636,7 +1636,6 @@ dist_patch_DATA = \ %D%/packages/patches/libmad-length-check.patch \ %D%/packages/patches/libmad-md_size.patch \ %D%/packages/patches/libmad-mips-newgcc.patch \ - %D%/packages/patches/libmateweather-use-TZDIR.patch \ %D%/packages/patches/libmp4v2-c++11.patch \ %D%/packages/patches/libmpeg2-arm-private-symbols.patch \ %D%/packages/patches/libmpeg2-global-symbol-test.patch \ diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 397b8158c7..49d592226f 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -253,16 +253,14 @@ (define-public mate-desktop (define-public libmateweather (package (name "libmateweather") - (version "1.26.1") + (version "1.28.0") (source (origin (method url-fetch) (uri (string-append "mirror://mate/" (version-major+minor version) "/" "libmateweather-" version ".tar.xz")) (sha256 - (base32 "0fpgc2l46024j2sqqsvclg9c6x33hyjk2zbg5h74v7cf9c7rj062")) - (patches - (list (search-patch "libmateweather-use-TZDIR.patch"))))) + (base32 "1dfj68q3x9camd7h94pcwv8a5969cv5d4p979gcbk4xknpg76hsm")))) (build-system gnu-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/patches/libmateweather-use-TZDIR.patch b/gnu/packages/patches/libmateweather-use-TZDIR.patch deleted file mode 100644 index 5f72043986..0000000000 --- a/gnu/packages/patches/libmateweather-use-TZDIR.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 109fef8208188ddf4be76d6899f7d8fde5b8b3be Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= -Date: Sat, 22 Jul 2023 14:40:31 +0800 -Subject: [PATCH] Use TZDIR for ZONEINFO_DIR if the variable is set. - ---- - libmateweather/mateweather-timezone.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/libmateweather/mateweather-timezone.c b/libmateweather/mateweather-timezone.c -index 2754728..6c858c4 100644 ---- a/libmateweather/mateweather-timezone.c -+++ b/libmateweather/mateweather-timezone.c -@@ -61,7 +61,7 @@ static gboolean - parse_tzdata (const char *tzname, time_t start, time_t end, - int *offset, gboolean *has_dst, int *dst_offset) - { -- char *filename, *contents; -+ char *tzdir, *filename, *contents; - gsize length; - int timecnt, transitions_size, ttinfo_map_size; - int initial_transition = -1, second_transition = -1; -@@ -71,7 +71,10 @@ parse_tzdata (const char *tzname, time_t start, time_t end, - char initial_isdst, second_isdst; - int i; - -- filename = g_build_filename (ZONEINFO_DIR, tzname, NULL); -+ tzdir = g_getenv("TZDIR"); -+ if (tzdir == NULL) -+ tzdir = ZONEINFO_DIR; -+ filename = g_build_filename (tzdir, tzname, NULL); - if (!g_file_get_contents (filename, &contents, &length, NULL)) { - g_free (filename); - return FALSE; -@@ -403,4 +406,3 @@ mateweather_timezone_get_dst_offset (MateWeatherTimezone *zone) - g_return_val_if_fail (zone->has_dst, 0); - return zone->dst_offset; - } -- --- -2.41.0 -