pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

chirp: Update to 20230304



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Mar 6 19:18:31 2023 -0500
Changeset:	3cd96eced200a45b637445b7e3b076558c3d8169

Modified Files:
	chirp/Makefile
	chirp/distinfo
	chirp/patches/patch-chirp_platform.py
	glusterfs/DESCR

Log Message:
chirp: Update to 20230304

Drop patch hunk merged upstream

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3cd96eced200a45b637445b7e3b076558c3d8169

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 chirp/Makefile                        |  2 +-
 chirp/distinfo                        |  8 ++++----
 chirp/patches/patch-chirp_platform.py | 24 ++----------------------
 glusterfs/DESCR                       |  2 +-
 4 files changed, 8 insertions(+), 28 deletions(-)

diffs:
diff --git a/chirp/Makefile b/chirp/Makefile
index 717a5acf22..0c5f7e574f 100644
--- a/chirp/Makefile
+++ b/chirp/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.57 2023/01/29 21:16:48 ryoon Exp $
 
-VERSION=	20230218
+VERSION=	20230304
 DISTNAME=	chirp-${VERSION}
 CATEGORIES=	ham
 MASTER_SITES=	https://trac.chirp.danplanet.com/chirp_next/next-${VERSION}/
diff --git a/chirp/distinfo b/chirp/distinfo
index 571145cfae..25d5e1a15f 100644
--- a/chirp/distinfo
+++ b/chirp/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.32 2022/12/17 16:41:50 gdt Exp $
 
-BLAKE2s (chirp-20230218.tar.gz) = 207351917191489916b25f8eac23daf98f3b0be67148503d2246e8d60e1e9f6c
-SHA512 (chirp-20230218.tar.gz) = c939bd7b37763adfbf42affa2bf4fee2d5aa0435742f27beabc91880575dcaacfbf5da402f379527212bda126cb1aba939d5d0fa5ae90547b65a0f27f25c8f73
-Size (chirp-20230218.tar.gz) = 1598626 bytes
-SHA1 (patch-chirp_platform.py) = e86353b6c51d7b0fea314de3c0b4580df79f1f65
+BLAKE2s (chirp-20230304.tar.gz) = d051173e1adb04704f2daeb81323ebe901bec7333a089d66d73e3cae7eff9ca2
+SHA512 (chirp-20230304.tar.gz) = d864711a140be7a5578faf467b4ddd0bd9d55c3352fea5fb81c7e468cc2f4eb1f02855c23890f6b7ead51a38e6f9f55a9a4f11162b71c0273510e2b447c2e23a
+Size (chirp-20230304.tar.gz) = 1604373 bytes
+SHA1 (patch-chirp_platform.py) = ba7e65bb2f797f1ed9a6dc767ab02cde8b6ed61d
diff --git a/chirp/patches/patch-chirp_platform.py b/chirp/patches/patch-chirp_platform.py
index 6a9a446d62..f4c08c6a03 100644
--- a/chirp/patches/patch-chirp_platform.py
+++ b/chirp/patches/patch-chirp_platform.py
@@ -4,12 +4,9 @@ Don't look for share other than in the right place.
 \todo File upstream.
 \todo Make upstream respect a configured share dir.
 
-Excise Darwin hack that works around misconfigured systems.
-\todo Discuss upstream.
-
---- chirp/platform.py.orig	2022-12-15 10:00:29.000000000 +0000
+--- chirp/platform.py.orig	2023-02-23 10:01:01.000000000 +0000
 +++ chirp/platform.py
-@@ -252,10 +252,7 @@ class Platform:
+@@ -117,10 +117,7 @@ class Platform:
          """Searches for files installed to a share/ prefix."""
          execpath = self.executable_path()
          share_candidates = [
@@ -20,20 +17,3 @@ Excise Darwin hack that works around misconfigured systems.
          ]
          pkgshare_candidates = [os.path.join(i, "chirp")
                                 for i in share_candidates]
-@@ -287,16 +284,6 @@ class UnixPlatform(Platform):
- 
-         Platform.__init__(self, str(basepath))
- 
--        # This is a hack that needs to be properly fixed by importing the
--        # latest changes to this module from d-rats.  In the interest of
--        # time, however, I'll throw it here
--        if sys.platform == "darwin":
--            if "DISPLAY" not in os.environ:
--                LOG.info("Forcing DISPLAY for MacOS")
--                os.environ["DISPLAY"] = ":0"
--
--            os.environ["PANGO_RC_FILE"] = "../Resources/etc/pango/pangorc"
--
-     def default_dir(self):
-         return str(Path.home())
- 
diff --git a/glusterfs/DESCR b/glusterfs/DESCR
index 34183e0b14..967405fffd 100644
--- a/glusterfs/DESCR
+++ b/glusterfs/DESCR
@@ -2,7 +2,7 @@ GlusterFS is a flexible, powerful, POSIX-compliant cluster filesystem
 that can scale to several petabytes.
 
 GlusterFS works over either TCP/IP or high-performance Infiniband
-RDMA interconnect.
+RDMA interconnect.  It requires a 64-bit CPU.
 
 GlusterFS provides striping and on-the-fly synchronous replication
 of files. GlusterFS has a fully distributed design, with no single


Home | Main Index | Thread Index | Old Index