From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id yI1MF9/5QmTZLAEASxT56A (envelope-from ) for ; Fri, 21 Apr 2023 23:02:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id OEZHF9/5QmRwKwEAauVa8A (envelope-from ) for ; Fri, 21 Apr 2023 23:02:23 +0200 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 022BD2DF83 for ; Fri, 21 Apr 2023 23:02:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppxtL-000463-OL; Fri, 21 Apr 2023 17:02:03 -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 1ppxtK-00045c-DM for guix-patches@gnu.org; Fri, 21 Apr 2023 17:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppxtK-0006gh-3m for guix-patches@gnu.org; Fri, 21 Apr 2023 17:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ppxtJ-0005DI-Vf for guix-patches@gnu.org; Fri, 21 Apr 2023 17:02:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63006] [PATCH 1/3] gnu: libical: Find the time zone database in the environment. References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Apr 2023 21:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63006 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 63006@debbugs.gnu.org Received: via spool by 63006-submit@debbugs.gnu.org id=B63006.168211087419968 (code B ref 63006); Fri, 21 Apr 2023 21:02:01 +0000 Received: (at 63006) by debbugs.gnu.org; 21 Apr 2023 21:01:14 +0000 Received: from localhost ([127.0.0.1]:41293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppxsY-0005C0-7d for submit@debbugs.gnu.org; Fri, 21 Apr 2023 17:01:14 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:52935) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppxsW-0005Ba-26 for 63006@debbugs.gnu.org; Fri, 21 Apr 2023 17:01:12 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 06F675C0164; Fri, 21 Apr 2023 17:01:07 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 21 Apr 2023 17:01:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=mesmtp; t=1682110867; x=1682197267; bh=Xm4/29E ovpBlk8ZWeei1ZGyLkj+qW9UPQzS8TMlies0=; b=SMyz9QmGSIOT3277NP5WqbP wjo7SrtVzMJXhJYPz1/JeWLAeOqiBlUiz4enMygxXwR0gyNomzwlB5T8MGVqLGke WUI2RsMvYoV2GphafmPZNgHClgIJ3jcuveupRbj4bDgeM9mb+lFSrLNe9fXbOL3B wngrCzFIY+SCLthTuWGg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1682110867; x=1682197267; bh=Xm4/29EovpBlk8ZWeei1ZGyLkj+q W9UPQzS8TMlies0=; b=MuFhiJ6/9wWhlFKLX60AG1MHNAKzHoTxvL6p9K/VxAfT 0t1CCKQjvVQN/1mJNIb3CdxU4zY75D51S+wKwCMeIZQZ7iw+Pa6wBZPB3X0TWlXg aN6hC0zYol76+HHmoxemhDvltPEdacsPSc0uOOCyfslQQCU6ZVnDE5Cf+mpQwagz HR6YhCKPo2au43iXT9UKl7Y+ayBFRVObTgMPcnX7CR299yfuXmsnRWrLVJytN5jl SOmPgAq+MK2eoH0UsLeH7d32MPJM28DmVEQJ9jrZ+f7wmxDr/lN6iDm3LZqrkZ/k rhpH+dfJNTkNE/IEd8q9YqQLkH/3hXoK8/T7G3Jk+w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfedtgedgudehhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeegveeftdeggfevgefghfefudelgfduie dtkefhgeegveehfeejheeuffefheevieenucffohhmrghinhepghhithhhuhgsrdgtohhm necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvoh esfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <63006@debbugs.gnu.org>; Fri, 21 Apr 2023 17:01:06 -0400 (EDT) From: Leo Famulari Date: Fri, 21 Apr 2023 17:01:00 -0400 Message-Id: <724078bec9b692f2d0e3fae4a03a23ef96d94ee5.1682110862.git.leo@famulari.name> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1682110943; a=rsa-sha256; cv=none; b=Lls06MTk6mZ+ZlJR1K+EBSdI2Db24POgne9KFFJGyY1xQR6CEujYBW8yaWunpPoR7LnIrD 3prxp/yrJfbj+4Y0RVJWKUntW4jefcJ9hcdQQp8YExKK2JUTgUmaoXl0iLTd8r3mQ2HQG5 jmFkeN1EzOMwmiw2hhioiCcaFlcAz/hoIB4zfvlyUMqCIQCFrqPagfpe472wxvR2JnnDj2 sm1hILRGd4kn73kPzdFxjIvA8XP0tYnsdibAX0SmWz2gLQvWFZiZd4+Lab1OwBFo8+4teh oCKln8oYXNFXDsQRxmSfDwRkZ8KSV/xcVaXdWE3REgwP7WIa2Jzk22YKAUm7rQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=SMyz9QmG; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b="MuFhiJ6/"; dmarc=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1682110943; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=Xm4/29EovpBlk8ZWeei1ZGyLkj+qW9UPQzS8TMlies0=; b=R4bcT/8K5rikBOpdYVnItFpUd/9/K+QQRk6xP5BQy5TaSXO/phIjCkJuKj4sUdx1Zr4xVg HVKxPs41Apl6rkKhyDIUirmOa7CpRKiqPwK1/UP+VIw4kvWlpL6t1YfCHKIqI3HAEL36Z4 TNiEhqvHwoGsl3kJAA0hfDVyNq73KYQEiMyLahO1NXWemwwnoej7ebeiTcs7FljfM9tJXV pKX9LdT4Jkh0rPyzhPg45P4s1swivg8S9JndTq/jfXB4CqLX5XS1ib58A7rXszrTitT9CU xAJmQSFW71p0Eg9Ugt1lHGI7HkOA7tQJd45NiYoiezpgfjtg4lh5UG/Q/fztJg== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=SMyz9QmG; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b="MuFhiJ6/"; dmarc=none; 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" X-Migadu-Spam-Score: 2.19 X-Spam-Score: 2.19 X-Migadu-Queue-Id: 022BD2DF83 X-TUID: 12qOyFSmo7YR * gnu/packages/patches/libical-respect-tzdir.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/calendar.scm (libical)[source]: Use it. [inputs]: Remove tzdata. --- gnu/local.mk | 1 + gnu/packages/calendar.scm | 3 +- .../patches/libical-respect-tzdir.patch | 38 +++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libical-respect-tzdir.patch diff --git a/gnu/local.mk b/gnu/local.mk index b631fa6d5a..f301c33cfa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1393,6 +1393,7 @@ dist_patch_DATA = \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \ + %D%/packages/patches/libical-respect-tzdir.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/librime-fix-build-with-gcc10.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index cf4286100d..030f9c52e7 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -127,6 +127,7 @@ (define-public libical (uri (string-append "https://github.com/libical/libical/releases/download/v" version "/libical-" version ".tar.gz")) + (patches (search-patches "libical-respect-tzdir.patch")) (sha256 (base32 "0cqc1wpalxmxjx8dmcaga9w8kd5l7944hqmidz43hifaf7fhaixl")))) @@ -166,7 +167,7 @@ (define-public libical pkg-config vala)) (inputs - (list glib libxml2 tzdata)) + (list glib libxml2)) (propagated-inputs ;; In Requires.private of libical.pc. (list icu4c)) diff --git a/gnu/packages/patches/libical-respect-tzdir.patch b/gnu/packages/patches/libical-respect-tzdir.patch new file mode 100644 index 0000000000..f749addf44 --- /dev/null +++ b/gnu/packages/patches/libical-respect-tzdir.patch @@ -0,0 +1,38 @@ +Copied from Nix: + +https://github.com/NixOS/nixpkgs/blob/0336bd874374a9e33947ace8a289e5c785e44a19/pkgs/development/libraries/libical/respect-env-tzdir.patch + +This functionality will be available in libical 3.1.0, whenever that is +released: + +https://github.com/libical/libical/issues/350 + +--- a/src/libical/icaltz-util.c ++++ b/src/libical/icaltz-util.c +@@ -94,9 +94,9 @@ + static const char *zdir = NULL; + + static const char *search_paths[] = { ++ "/etc/zoneinfo", + "/usr/share/zoneinfo", + "/usr/lib/zoneinfo", +- "/etc/zoneinfo", + "/usr/share/lib/zoneinfo" + }; + +@@ -178,6 +178,15 @@ + const char *fname = ZONES_TAB_SYSTEM_FILENAME; + size_t i, num_search_paths; + ++ const char *env_tzdir = getenv ("TZDIR"); ++ if (env_tzdir) { ++ sprintf (file_path, "%s/%s", env_tzdir, fname); ++ if (!access (file_path, F_OK|R_OK)) { ++ zdir = env_tzdir; ++ return; ++ } ++ } ++ + num_search_paths = sizeof(search_paths) / sizeof(search_paths[0]); + for (i = 0; i < num_search_paths; i++) { + snprintf(file_path, MAXPATHLEN, "%s/%s", search_paths[i], fname); -- 2.39.2