pkgsrc-WIP-changes archive

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

Guitar: switch to upstream version of patch



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Jul 27 10:30:25 2025 +0200
Changeset:	6f9b168c2953212dca7ca279b6ec58ea8481b68f

Modified Files:
	Guitar/distinfo
	Guitar/patches/patch-src_common_jstream.h

Log Message:
Guitar: switch to upstream version of patch

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

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

diffstat:
 Guitar/distinfo                           | 2 +-
 Guitar/patches/patch-src_common_jstream.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs:
diff --git a/Guitar/distinfo b/Guitar/distinfo
index 08b12de59f..ee5e566e70 100644
--- a/Guitar/distinfo
+++ b/Guitar/distinfo
@@ -4,7 +4,7 @@ BLAKE2s (Guitar-1.3.0.tar.gz) = c5be125f311985924b14b0397ff2d1c88ec0f88e889fd70b
 SHA512 (Guitar-1.3.0.tar.gz) = bb5484c9a618b0b5ef08846b28ac79c05728ceffa2fdb668dc092461c13010b979484b9680695ae0e00f0748b661e92ef66aaf332954f34f65c0d47e0f8bac87
 Size (Guitar-1.3.0.tar.gz) = 29348519 bytes
 SHA1 (patch-filetype_file_src_gmtime__r.c) = 1bd8654b1a1db51443cac26b104de58536c9745c
-SHA1 (patch-src_common_jstream.h) = 02fea376301d1e215afe624026e6aed1889d6628
+SHA1 (patch-src_common_jstream.h) = ed5dab0522b36747c1a0f3e282b9f45b8f9d214d
 SHA1 (patch-src_common_rwfile.h) = b068466022d5e7d24bddae39aa1d148fe3dc96af
 SHA1 (patch-src_platform.cpp) = 67f1abb657d499ce1e6b9272c0450219e6333dd5
 SHA1 (patch-src_webclient.cpp) = 8d20eb5b498daa9b065bbc7a99606bab1a2ee78d
diff --git a/Guitar/patches/patch-src_common_jstream.h b/Guitar/patches/patch-src_common_jstream.h
index d61c915ed7..ff31a6a3af 100644
--- a/Guitar/patches/patch-src_common_jstream.h
+++ b/Guitar/patches/patch-src_common_jstream.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
-src/common/jstream.h:1564:39: error: 'nullptr_t' was not declared in this scope; did you mean 'std::nullptr_t'?
+https://github.com/0-wiz-0/Guitar/commit/ad88334a0ba555585ea653924fb749c5805d9aa1
 
 --- src/common/jstream.h.orig	2025-07-21 19:46:10.990061174 +0000
 +++ src/common/jstream.h
@@ -9,7 +9,7 @@ src/common/jstream.h:1564:39: error: 'nullptr_t' was not declared in this scope;
  static inline bool is_null(Variant const &v)
  {
 -	return std::holds_alternative<nullptr_t>(v);
-+	return std::holds_alternative<std::nullptr_t>(v);
++	return std::holds_alternative<null_t>(v);
  }
  static inline bool is_boolean(Variant const &v)
  {


Home | Main Index | Thread Index | Old Index