CVS commit: pkgsrc/devel/Guitar

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/Guitar
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sun, 27 Jul 2025 08:34:05 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul 27 08:34:05 UTC 2025

Added Files:
        pkgsrc/devel/Guitar: DESCR Makefile PLIST distinfo
        pkgsrc/devel/Guitar/patches: patch-filetype_file_src_gmtime__r.c
            patch-src_common_jstream.h patch-src_common_rwfile.h
            patch-src_platform.cpp patch-src_webclient.cpp
            patch-src_zip_ziparchive.cpp

Log Message:
devel/Guitar: import Guitar-1.3.0

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


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/Guitar/DESCR pkgsrc/devel/Guitar/Makefile \
    pkgsrc/devel/Guitar/PLIST pkgsrc/devel/Guitar/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/Guitar/patches/patch-filetype_file_src_gmtime__r.c \
    pkgsrc/devel/Guitar/patches/patch-src_common_jstream.h \
    pkgsrc/devel/Guitar/patches/patch-src_common_rwfile.h \
    pkgsrc/devel/Guitar/patches/patch-src_platform.cpp \
    pkgsrc/devel/Guitar/patches/patch-src_webclient.cpp \
    pkgsrc/devel/Guitar/patches/patch-src_zip_ziparchive.cpp

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

Added files:

Index: pkgsrc/devel/Guitar/DESCR
diff -u /dev/null pkgsrc/devel/Guitar/DESCR:1.1
--- /dev/null   Sun Jul 27 08:34:05 2025
+++ pkgsrc/devel/Guitar/DESCR   Sun Jul 27 08:34:05 2025
@@ -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
Index: pkgsrc/devel/Guitar/Makefile
diff -u /dev/null pkgsrc/devel/Guitar/Makefile:1.1
--- /dev/null   Sun Jul 27 08:34:05 2025
+++ pkgsrc/devel/Guitar/Makefile        Sun Jul 27 08:34:05 2025
@@ -0,0 +1,42 @@
+# $NetBSD: Makefile,v 1.1 2025/07/27 08:34:05 wiz Exp $
+
+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"
Index: pkgsrc/devel/Guitar/PLIST
diff -u /dev/null pkgsrc/devel/Guitar/PLIST:1.1
--- /dev/null   Sun Jul 27 08:34:05 2025
+++ pkgsrc/devel/Guitar/PLIST   Sun Jul 27 08:34:05 2025
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2025/07/27 08:34:05 wiz Exp $
+bin/Guitar
Index: pkgsrc/devel/Guitar/distinfo
diff -u /dev/null pkgsrc/devel/Guitar/distinfo:1.1
--- /dev/null   Sun Jul 27 08:34:05 2025
+++ pkgsrc/devel/Guitar/distinfo        Sun Jul 27 08:34:05 2025
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1 2025/07/27 08:34:05 wiz Exp $
+
+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-filetype_file_src_gmtime__r.c) = ab52c180e4165fa1c541e6268481ddeb5f3e6329
+SHA1 (patch-src_common_jstream.h) = 0a6108072d5bb61b388f2b55fdf92899b30c4bc6
+SHA1 (patch-src_common_rwfile.h) = d693c7b9534d20c33e935527a6c182726a0a4f0a
+SHA1 (patch-src_platform.cpp) = 4e21e50e30bfef60f823daa5278c25cd828e1410
+SHA1 (patch-src_webclient.cpp) = 2c4a38cf3e298aa1dc6b31727a983f4d15bb2d31
+SHA1 (patch-src_zip_ziparchive.cpp) = 54cb11ab0e3995f5a32fcf1ef0cfa102a102f520

Index: pkgsrc/devel/Guitar/patches/patch-filetype_file_src_gmtime__r.c
diff -u /dev/null pkgsrc/devel/Guitar/patches/patch-filetype_file_src_gmtime__r.c:1.1
--- /dev/null   Sun Jul 27 08:34:05 2025
+++ pkgsrc/devel/Guitar/patches/patch-filetype_file_src_gmtime__r.c     Sun Jul 27 08:34:05 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-filetype_file_src_gmtime__r.c,v 1.1 2025/07/27 08:34:05 wiz Exp $
+
+NetBSD provides gmtime_r().
+https://github.com/soramimi/Guitar/pull/165
+
+--- filetype/file/src/gmtime_r.c.orig  2025-07-27 08:17:07.378630293 +0000
++++ filetype/file/src/gmtime_r.c
+@@ -1,5 +1,6 @@
+ /*    $File: gmtime_r.c,v 1.4 2022/09/24 20:30:13 christos Exp $      */
+ 
++#ifndef __NetBSD__
+ #include "file.h"
+ #ifndef       lint
+ FILE_RCSID("@(#)$File: gmtime_r.c,v 1.4 2022/09/24 20:30:13 christos Exp $")
+@@ -17,3 +18,4 @@ gmtime_r(const time_t *t, struct tm *tm)
+       memcpy(tm, tmp, sizeof(*tm));
+       return tmp;
+ }
++#endif
Index: pkgsrc/devel/Guitar/patches/patch-src_common_jstream.h
diff -u /dev/null pkgsrc/devel/Guitar/patches/patch-src_common_jstream.h:1.1
--- /dev/null   Sun Jul 27 08:34:05 2025
+++ pkgsrc/devel/Guitar/patches/patch-src_common_jstream.h      Sun Jul 27 08:34:05 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_common_jstream.h,v 1.1 2025/07/27 08:34:05 wiz Exp $
+
+https://github.com/soramimi/Guitar/commit/ad88334a0ba555585ea653924fb749c5805d9aa1
+
+--- 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<null_t>(v);
+ }
+ static inline bool is_boolean(Variant const &v)
+ {
Index: pkgsrc/devel/Guitar/patches/patch-src_common_rwfile.h
diff -u /dev/null pkgsrc/devel/Guitar/patches/patch-src_common_rwfile.h:1.1
--- /dev/null   Sun Jul 27 08:34:05 2025
+++ pkgsrc/devel/Guitar/patches/patch-src_common_rwfile.h       Sun Jul 27 08:34:05 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_common_rwfile.h,v 1.1 2025/07/27 08:34:05 wiz Exp $
+
+For size_t.
+https://github.com/soramimi/Guitar/pull/165
+
+--- 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);
Index: pkgsrc/devel/Guitar/patches/patch-src_platform.cpp
diff -u /dev/null pkgsrc/devel/Guitar/patches/patch-src_platform.cpp:1.1
--- /dev/null   Sun Jul 27 08:34:05 2025
+++ pkgsrc/devel/Guitar/patches/patch-src_platform.cpp  Sun Jul 27 08:34:05 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_platform.cpp,v 1.1 2025/07/27 08:34:05 wiz Exp $
+
+For environ.
+https://github.com/soramimi/Guitar/pull/165
+
+--- 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()
Index: pkgsrc/devel/Guitar/patches/patch-src_webclient.cpp
diff -u /dev/null pkgsrc/devel/Guitar/patches/patch-src_webclient.cpp:1.1
--- /dev/null   Sun Jul 27 08:34:05 2025
+++ pkgsrc/devel/Guitar/patches/patch-src_webclient.cpp Sun Jul 27 08:34:05 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_webclient.cpp,v 1.1 2025/07/27 08:34:05 wiz Exp $
+
+NetBSD does not provide gethostbyname_r.
+https://github.com/soramimi/Guitar/pull/165
+
+--- 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;
Index: pkgsrc/devel/Guitar/patches/patch-src_zip_ziparchive.cpp
diff -u /dev/null pkgsrc/devel/Guitar/patches/patch-src_zip_ziparchive.cpp:1.1
--- /dev/null   Sun Jul 27 08:34:05 2025
+++ pkgsrc/devel/Guitar/patches/patch-src_zip_ziparchive.cpp    Sun Jul 27 08:34:05 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_zip_ziparchive.cpp,v 1.1 2025/07/27 08:34:05 wiz Exp $
+
+For read() etc.
+https://github.com/soramimi/Guitar/pull/165
+
+--- 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"

Prev by Date: CVS commit: pkgsrc/audio/py-discid
Next by Date: CVS commit: pkgsrc/devel
Previous by Thread: CVS commit: pkgsrc/audio/py-discid
Next by Thread: CVS commit: pkgsrc/devel
Indexes:

Home | Main Index | Thread Index | Old Index