CVS commit: pkgsrc/devel/Guitar

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Nov 13 22:28:18 UTC 2025

Modified Files:
        pkgsrc/devel/Guitar: Makefile distinfo
Added Files:
        pkgsrc/devel/Guitar/patches: patch-filetype_file-gcc_config.h
            patch-filetype_liboniguruma.pro
            patch-filetype_oniguruma_src_regenc.h
            patch-filetype_oniguruma_src_regposerr.c
Removed Files:
        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:
Guitar: update to 1.3.1.

Improved performance through enhanced parallel processing.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/Guitar/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/Guitar/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/Guitar/patches/patch-filetype_file-gcc_config.h \
    pkgsrc/devel/Guitar/patches/patch-filetype_liboniguruma.pro \
    pkgsrc/devel/Guitar/patches/patch-filetype_oniguruma_src_regenc.h \
    pkgsrc/devel/Guitar/patches/patch-filetype_oniguruma_src_regposerr.c
cvs rdiff -u -r1.1 -r0 \
    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.

Modified files:

Index: pkgsrc/devel/Guitar/Makefile
diff -u pkgsrc/devel/Guitar/Makefile:1.2 pkgsrc/devel/Guitar/Makefile:1.3
--- pkgsrc/devel/Guitar/Makefile:1.2    Thu Oct 23 20:36:13 2025
+++ pkgsrc/devel/Guitar/Makefile        Thu Nov 13 22:28:17 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2025/10/23 20:36:13 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2025/11/13 22:28:17 wiz Exp $
 
-DISTNAME=      Guitar-1.3.0
-PKGREVISION=   1
+DISTNAME=      Guitar-1.3.1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=soramimi/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -17,10 +16,6 @@ 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
@@ -29,9 +24,12 @@ 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 libfile.pro
+       cd ${WRKSRC}/filetype && ${SETENV} ${MAKE_ENV} ${MAKE}
        cd ${WRKSRC}/filetype && ${QTDIR}/bin/qmake libfiletype.pro
+       cd ${WRKSRC}/filetype && ${SETENV} ${MAKE_ENV} ${MAKE}
+       cd ${WRKSRC}/filetype && ${QTDIR}/bin/qmake liboniguruma.pro
+       cd ${WRKSRC}/filetype && ${SETENV} ${MAKE_ENV} ${MAKE}
        cd ${WRKSRC} && ${QTDIR}/bin/qmake Guitar.pro
        ${LN} -s ${PREFIX}/bin/ruby34 ${BUILDLINK_DIR}/bin/ruby
 

Index: pkgsrc/devel/Guitar/distinfo
diff -u pkgsrc/devel/Guitar/distinfo:1.1 pkgsrc/devel/Guitar/distinfo:1.2
--- pkgsrc/devel/Guitar/distinfo:1.1    Sun Jul 27 08:34:05 2025
+++ pkgsrc/devel/Guitar/distinfo        Thu Nov 13 22:28:17 2025
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.1 2025/07/27 08:34:05 wiz Exp $
+$NetBSD: distinfo,v 1.2 2025/11/13 22:28:17 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
+BLAKE2s (Guitar-1.3.1.tar.gz) = 8830abdab06e283173074e95ed3f0398bc2e5659bcb70fd3b5eb73e050ee530f
+SHA512 (Guitar-1.3.1.tar.gz) = 03300837cd27c7ffcdd18ae8d9584ebf8b8722e7907b0b50745667fb4214f86a865b3aa59f5d7c137732eddbbd47116b8404161201020fb4ebb4f98cec4b45d4
+Size (Guitar-1.3.1.tar.gz) = 32134282 bytes
+SHA1 (patch-filetype_file-gcc_config.h) = efa307b2cc3790e972c38491ae7671747313134a
+SHA1 (patch-filetype_liboniguruma.pro) = 6ddff916135329666349754a40834414f36b3214
+SHA1 (patch-filetype_oniguruma_src_regenc.h) = 706b7c3c71ebaa57e41b498a4a83097cc709d443
+SHA1 (patch-filetype_oniguruma_src_regposerr.c) = cce43da354ca5b5a16d62ce54e94ed5321930abb

Added files:

Index: pkgsrc/devel/Guitar/patches/patch-filetype_file-gcc_config.h
diff -u /dev/null pkgsrc/devel/Guitar/patches/patch-filetype_file-gcc_config.h:1.1
--- /dev/null   Thu Nov 13 22:28:18 2025
+++ pkgsrc/devel/Guitar/patches/patch-filetype_file-gcc_config.h        Thu Nov 13 22:28:17 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-filetype_file-gcc_config.h,v 1.1 2025/11/13 22:28:17 wiz Exp $
+
+NetBSD does not have uselocale().
+
+--- filetype/file-gcc/config.h.orig    2025-11-13 22:15:18.574915697 +0000
++++ filetype/file-gcc/config.h
+@@ -247,7 +247,7 @@
+ #define HAVE_UNISTD_H 1
+ 
+ /* Define to 1 if you have the `uselocale' function. */
+-#define HAVE_USELOCALE 1
++/*#define HAVE_USELOCALE 1 */
+ 
+ /* Define to 1 if you have the `utime' function. */
+ #define HAVE_UTIME 1
Index: pkgsrc/devel/Guitar/patches/patch-filetype_liboniguruma.pro
diff -u /dev/null pkgsrc/devel/Guitar/patches/patch-filetype_liboniguruma.pro:1.1
--- /dev/null   Thu Nov 13 22:28:18 2025
+++ pkgsrc/devel/Guitar/patches/patch-filetype_liboniguruma.pro Thu Nov 13 22:28:18 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-filetype_liboniguruma.pro,v 1.1 2025/11/13 22:28:18 wiz Exp $
+
+config.h does not exist.
+
+--- filetype/liboniguruma.pro.orig     2025-10-31 14:38:04.000000000 +0000
++++ filetype/liboniguruma.pro
+@@ -10,7 +10,6 @@ CONFIG -= app_bundle
+ CONFIG -= qt
+ 
+ DEFINES += ONIG_STATIC=1 USE_POSIX_API=1
+-DEFINES += HAVE_CONFIG_H=1
+ msvc:INCLUDEPATH += oniguruma-msvc
+ 
+ HEADERS += \
Index: pkgsrc/devel/Guitar/patches/patch-filetype_oniguruma_src_regenc.h
diff -u /dev/null pkgsrc/devel/Guitar/patches/patch-filetype_oniguruma_src_regenc.h:1.1
--- /dev/null   Thu Nov 13 22:28:18 2025
+++ pkgsrc/devel/Guitar/patches/patch-filetype_oniguruma_src_regenc.h   Thu Nov 13 22:28:18 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-filetype_oniguruma_src_regenc.h,v 1.1 2025/11/13 22:28:18 wiz Exp $
+
+Check for config.h before including it.
+
+--- filetype/oniguruma/src/regenc.h.orig       2025-11-13 22:03:27.734779409 +0000
++++ filetype/oniguruma/src/regenc.h
+@@ -33,7 +33,9 @@
+ #define ONIGURUMA_EXPORT
+ #endif
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ 
+ #ifndef ONIG_NO_STANDARD_C_HEADERS
+ #include <stddef.h>
Index: pkgsrc/devel/Guitar/patches/patch-filetype_oniguruma_src_regposerr.c
diff -u /dev/null pkgsrc/devel/Guitar/patches/patch-filetype_oniguruma_src_regposerr.c:1.1
--- /dev/null   Thu Nov 13 22:28:18 2025
+++ pkgsrc/devel/Guitar/patches/patch-filetype_oniguruma_src_regposerr.c        Thu Nov 13 22:28:18 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-filetype_oniguruma_src_regposerr.c,v 1.1 2025/11/13 22:28:18 wiz Exp $
+
+Check for config.h before including it.
+
+--- filetype/oniguruma/src/regposerr.c.orig    2025-11-13 22:03:53.758831992 +0000
++++ filetype/oniguruma/src/regposerr.c
+@@ -34,7 +34,9 @@
+ #define ONIGURUMA_EXPORT
+ #endif
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ #include "onigposix.h"
+ 
+ #undef regex_t