From patchwork Wed Jun 26 08:09:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 65614 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 359C027BBE9; Wed, 26 Jun 2024 09:10:31 +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 B6EF927BBE2 for ; Wed, 26 Jun 2024 09:10:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMNj8-0007tV-P1; Wed, 26 Jun 2024 04:10:02 -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 1sMNj6-0007sV-Re for guix-patches@gnu.org; Wed, 26 Jun 2024 04:10:00 -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 1sMNj6-0003CS-IO for guix-patches@gnu.org; Wed, 26 Jun 2024 04:10:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sMNj8-0005YR-KA for guix-patches@gnu.org; Wed, 26 Jun 2024 04:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71781] [PATCH 03/28] gnu: libmateweather: Update to 1.28.0. Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2024 08:10:02 +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 X-Debbugs-Original-To: 71781@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171938939521252 (code B ref -1); Wed, 26 Jun 2024 08:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jun 2024 08:09:55 +0000 Received: from localhost ([127.0.0.1]:38087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMNj1-0005Wd-65 for submit@debbugs.gnu.org; Wed, 26 Jun 2024 04:09:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:49660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMNiz-0005WU-W6 for submit@debbugs.gnu.org; Wed, 26 Jun 2024 04:09:54 -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 1sMNix-0007pk-IH for guix-patches@gnu.org; Wed, 26 Jun 2024 04:09:51 -0400 Received: from mail-oi1-x230.google.com ([2607:f8b0:4864:20::230]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sMNiv-00039W-Tt for guix-patches@gnu.org; Wed, 26 Jun 2024 04:09:51 -0400 Received: by mail-oi1-x230.google.com with SMTP id 5614622812f47-3d55ec570a7so563811b6e.1 for ; Wed, 26 Jun 2024 01:09:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719389388; x=1719994188; darn=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=L72EnalP1Et77WygaYD5qMlxfbH9yV4Uyv9JUZMCe18+5xXIfgPwx2ckej0k9GfXrG +MFDNQOSdUbEspoPB9SOg+bCbbyzDf+f+yo3riNv3uQMLm9xSm3cw+k3lr34+2lrk5O1 flz+jJfptJrHCeKsQIwCDdsYXloAHr5E+6O1unfT3rQoI5ielkFXT3ld8hS1KFdEF2Y0 bLU/fVbTNy4ogK6n+wfAZTBISXB6KwlNWUQb7QajTYb9KxmI2bHZy4t+Fs4HiJqU+Kp0 vMEhGk6i++J0LsbVpllbXCMkT8OqVteMFzbeh6r4Nvruru0S3qvQqjh5TuG1e7ANrUMR W5Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719389388; x=1719994188; 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=P5kQ059qBTxO0Dw+26oUKcRw7lZC0w3X954vlOw3M4zdQF5tydNKpBfv0tT1rdFTPy VT32KCd+wImyQw+/zL1zuVthEVjFArUQ1oqAIVmfzFQ8Sa9PlyBpvw0k9UOh3633ul0I FKZEdvkGaSUk6VT73UbjdVJCSzhT9AFJaSiawRffvL0WSzMZCdo+RwhjuAItpZ6n90f0 2BA/E0yYzQbS2EYtdlfZ5IN8dSiphZCDzmAowkdjKjxrKYNVYT1NLwyc+jN2F57DW/kt GhFWzuxTRmGVexvUfATiYmKcsS68GntbfiNPcOa9//CjRhnbAK8CLisN3LKAtvmxhlrR O2GA== X-Forwarded-Encrypted: i=1; AJvYcCXRM4EBMCYTKxS5XAEZEh42xU/2VAs2/xOY3y5yDhTBs27PTKFEM9LstIniZlcduYaejIANiHy7SF/qG8p78hPrdI4LXw== X-Gm-Message-State: AOJu0YxJAjsWmN2bHYHdiwLVzgUCIheDPlw+qBPHo7UoRKmyJoqq28sU l6GuFQy4bkc2NkC6c7cdEqHz0htN41SQ0sYtzG3O3mMxiUvJ/lysTVX+RA== X-Google-Smtp-Source: AGHT+IHI9SeZlbcjMD3amxYSp4UdreLDXBi7SllTy6KMsBbqAB+dQsJ1pNRr+EREAy+Da1YN2Xc/tw== X-Received: by 2002:a05:6808:f87:b0:3d2:2519:a08f with SMTP id 5614622812f47-3d543b67d3cmr12443959b6e.45.1719389387583; Wed, 26 Jun 2024 01:09:47 -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 41be03b00d2f7-718cc5e7666sm5989990a12.0.2024.06.26.01.09.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jun 2024 01:09:46 -0700 (PDT) From: Andy Tai Date: Wed, 26 Jun 2024 01:09:16 -0700 Message-Id: <6843410d7bc3ced3709bc91db694c4b213776418.1719388863.git.atai@atai.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::230; envelope-from=lichengtai@gmail.com; helo=mail-oi1-x230.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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 -