Guitar: add new package

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Guitar: add new package
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Mon, 21 Jul 2025 21:11:39 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Jul 21 23:11:23 2025 +0200
Changeset:	92bb74958f48dc150a3378b91f1aa598fd61035a

Modified Files:
	Makefile
Added Files:
	Guitar/DESCR
	Guitar/Makefile
	Guitar/PLIST
	Guitar/TODO
	Guitar/distinfo
	Guitar/patches/patch-src_common_jstream.h
	Guitar/patches/patch-src_common_rwfile.h
	Guitar/patches/patch-src_platform.cpp
	Guitar/patches/patch-src_webclient.cpp
	Guitar/patches/patch-src_zip_ziparchive.cpp

Log Message:
Guitar: add new package

fails at runtime with

ctype(3) isupper: invalid input: -61

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

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

diffstat:
 Guitar/DESCR                                |  7 +++++
 Guitar/Makefile                             | 42 +++++++++++++++++++++++++++++
 Guitar/PLIST                                |  2 ++
 Guitar/TODO                                 |  2 ++
 Guitar/distinfo                             | 10 +++++++
 Guitar/patches/patch-src_common_jstream.h   | 15 +++++++++++
 Guitar/patches/patch-src_common_rwfile.h    | 14 ++++++++++
 Guitar/patches/patch-src_platform.cpp       | 17 ++++++++++++
 Guitar/patches/patch-src_webclient.cpp      | 15 +++++++++++
 Guitar/patches/patch-src_zip_ziparchive.cpp | 14 ++++++++++
 Makefile                                    |  1 +
 11 files changed, 139 insertions(+)

diffs:
diff --git a/Guitar/DESCR b/Guitar/DESCR
new file mode 100644
index 0000000000..09e12f6d6e
--- /dev/null
+++ b/Guitar/DESCR
@@ -0,0 +1,7 @@
+Git GUI Client
+
+* Open Source, Free Software (GPL v2)
+* Of course, commercial purposes is also free.
+* Run on Windows, macOS and Linux
+* Written in C++
+* Powered by Qt 6
diff --git a/Guitar/Makefile b/Guitar/Makefile
new file mode 100644
index 0000000000..41c2c40872
--- /dev/null
+++ b/Guitar/Makefile
@@ -0,0 +1,42 @@
+# $NetBSD$
+
+DISTNAME=	Guitar-1.3.0
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=soramimi/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://github.com/soramimi/Guitar/
+COMMENT=	Git GUI Client
+LICENSE=	gnu-gpl-v2
+
+TOOL_DEPENDS+=	ruby34-[0-9]*:../../lang/ruby34
+
+USE_TOOLS+=	pkg-config
+USE_LANGUAGES=	c c++
+
+PKGCONFIG_OVERRIDE+=	filetype/file/libmagic.pc.in
+PKGCONFIG_OVERRIDE+=	filetype/pcre2/libpcre2-16.pc.in
+PKGCONFIG_OVERRIDE+=	filetype/pcre2/libpcre2-32.pc.in
+PKGCONFIG_OVERRIDE+=	filetype/pcre2/libpcre2-8.pc.in
+PKGCONFIG_OVERRIDE+=	filetype/pcre2/libpcre2-posix.pc.in
+
+# fix qt warning
+MAKE_ENV+=	LANG=C.UTF-8
+
+BUILD_DIRS=		filetype .
+INSTALLATION_DIRS+=	bin
+
+do-configure:
+	# avoid using pcre2, wants to build its own
+	${RM} ${BUILDLINK_DIR}/include/pcre2.h
+	cd ${WRKSRC}/filetype && ${QTDIR}/bin/qmake libfiletype.pro
+	cd ${WRKSRC} && ${QTDIR}/bin/qmake Guitar.pro
+	${LN} -s ${PREFIX}/bin/ruby34 ${BUILDLINK_DIR}/bin/ruby
+
+post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/_bin/Guitar ${DESTDIR}${PREFIX}/bin
+
+.include "../../graphics/qt6-qtsvg/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/Guitar/PLIST b/Guitar/PLIST
new file mode 100644
index 0000000000..cd00ec91ce
--- /dev/null
+++ b/Guitar/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+bin/Guitar
diff --git a/Guitar/TODO b/Guitar/TODO
new file mode 100644
index 0000000000..81ceb35836
--- /dev/null
+++ b/Guitar/TODO
@@ -0,0 +1,2 @@
+Fails at runtime with
+ctype(3) isupper: invalid input: -61
diff --git a/Guitar/distinfo b/Guitar/distinfo
new file mode 100644
index 0000000000..41a49d9762
--- /dev/null
+++ b/Guitar/distinfo
@@ -0,0 +1,10 @@
+$NetBSD$
+
+BLAKE2s (Guitar-1.3.0.tar.gz) = c5be125f311985924b14b0397ff2d1c88ec0f88e889fd70bd0c9119c30ad03de
+SHA512 (Guitar-1.3.0.tar.gz) = bb5484c9a618b0b5ef08846b28ac79c05728ceffa2fdb668dc092461c13010b979484b9680695ae0e00f0748b661e92ef66aaf332954f34f65c0d47e0f8bac87
+Size (Guitar-1.3.0.tar.gz) = 29348519 bytes
+SHA1 (patch-src_common_jstream.h) = 02fea376301d1e215afe624026e6aed1889d6628
+SHA1 (patch-src_common_rwfile.h) = b068466022d5e7d24bddae39aa1d148fe3dc96af
+SHA1 (patch-src_platform.cpp) = 67f1abb657d499ce1e6b9272c0450219e6333dd5
+SHA1 (patch-src_webclient.cpp) = 8d20eb5b498daa9b065bbc7a99606bab1a2ee78d
+SHA1 (patch-src_zip_ziparchive.cpp) = 1a5c6be12bc7126aa16319dbd645e238a0a9bcca
diff --git a/Guitar/patches/patch-src_common_jstream.h b/Guitar/patches/patch-src_common_jstream.h
new file mode 100644
index 0000000000..d61c915ed7
--- /dev/null
+++ b/Guitar/patches/patch-src_common_jstream.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+src/common/jstream.h:1564:39: error: 'nullptr_t' was not declared in this scope; did you mean 'std::nullptr_t'?
+
+--- src/common/jstream.h.orig	2025-07-21 19:46:10.990061174 +0000
++++ src/common/jstream.h
+@@ -1560,7 +1560,7 @@ struct Object {
+ 
+ static inline bool is_null(Variant const &v)
+ {
+-	return std::holds_alternative<nullptr_t>(v);
++	return std::holds_alternative<std::nullptr_t>(v);
+ }
+ static inline bool is_boolean(Variant const &v)
+ {
diff --git a/Guitar/patches/patch-src_common_rwfile.h b/Guitar/patches/patch-src_common_rwfile.h
new file mode 100644
index 0000000000..4ec99f5e4f
--- /dev/null
+++ b/Guitar/patches/patch-src_common_rwfile.h
@@ -0,0 +1,14 @@
+$NetBSD$
+
+For size_t.
+
+--- src/common/rwfile.h.orig	2025-07-21 19:38:54.440889238 +0000
++++ src/common/rwfile.h
+@@ -1,6 +1,7 @@
+ #ifndef RWFILE_H
+ #define RWFILE_H
+ 
++#include <cstddef>
+ #include <vector>
+ 
+ bool readfile(char const *path, std::vector<char> *out, int maxsize);
diff --git a/Guitar/patches/patch-src_platform.cpp b/Guitar/patches/patch-src_platform.cpp
new file mode 100644
index 0000000000..e96ecda022
--- /dev/null
+++ b/Guitar/patches/patch-src_platform.cpp
@@ -0,0 +1,17 @@
+$NetBSD$
+
+For environ.
+
+--- src/platform.cpp.orig	2025-07-21 19:39:15.714158714 +0000
++++ src/platform.cpp
+@@ -1,6 +1,10 @@
+ #include "platform.h"
+ #include "ApplicationGlobal.h"
+ 
++#ifndef Q_OS_WIN
++extern char** environ;
++#endif
++
+ namespace platform {
+ 
+ void initNetworking()
diff --git a/Guitar/patches/patch-src_webclient.cpp b/Guitar/patches/patch-src_webclient.cpp
new file mode 100644
index 0000000000..54dbe69ec2
--- /dev/null
+++ b/Guitar/patches/patch-src_webclient.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+NetBSD does not provide gethostbyname_r.
+
+--- src/webclient.cpp.orig	2025-07-21 19:55:26.509062241 +0000
++++ src/webclient.cpp
+@@ -102,7 +102,7 @@ bool HostNameResolver::resolve(const cha
+ 	if (!name || !out) return false;
+ 
+ 	struct hostent *he = nullptr;
+-#if defined(_WIN32) || defined(__APPLE__)
++#if defined(_WIN32) || defined(__APPLE__) || defined(__NetBSD__)
+ 	he = ::gethostbyname(name);
+ #else
+ 	int err = 0;
diff --git a/Guitar/patches/patch-src_zip_ziparchive.cpp b/Guitar/patches/patch-src_zip_ziparchive.cpp
new file mode 100644
index 0000000000..2e60a5281e
--- /dev/null
+++ b/Guitar/patches/patch-src_zip_ziparchive.cpp
@@ -0,0 +1,14 @@
+$NetBSD$
+
+For read() etc.
+
+--- src/zip/ziparchive.cpp.orig	2025-07-21 19:41:18.048472674 +0000
++++ src/zip/ziparchive.cpp
+@@ -2,6 +2,7 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <time.h>
++#include <unistd.h>
+ 
+ #include "zipinternal.h"
+ #include "zlib.h"
diff --git a/Makefile b/Makefile
index 70761911cc..7c303e18f0 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ SUBDIR+=	GSAlign
 SUBDIR+=	GSCommander
 SUBDIR+=	GenericRepeatFinder
 SUBDIR+=	Geomyidae-git
+SUBDIR+=	Guitar
 SUBDIR+=	HP-1973
 SUBDIR+=	HiGHS
 SUBDIR+=	I2util
Prev by Date: py-git-cola: add package
Next by Date: py-et_xmlfile: initial revision
Previous by Thread: py-git-cola: add package
Next by Thread: py-et_xmlfile: initial revision
Indexes:
Home | Main Index | Thread Index | Old Index