CVS commit: pkgsrc/databases/duckdb

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Jun 24 00:02:58 UTC 2025

Modified Files:
        pkgsrc/databases/duckdb: Makefile.common distinfo
Added Files:
        pkgsrc/databases/duckdb/patches: patch-scripts_package__build.py
Removed Files:
        pkgsrc/databases/duckdb/patches: patch-tools_pythonpkg_setup.py

Log Message:
databases/py-duckdb: Fix packaging error

* Without git command, version number in egg info is 0.0.0.
  Hardcode it as PKGVERSION_NOREV.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/duckdb/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/duckdb/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/duckdb/patches/patch-scripts_package__build.py
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/duckdb/patches/patch-tools_pythonpkg_setup.py

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

Modified files:

Index: pkgsrc/databases/duckdb/Makefile.common
diff -u pkgsrc/databases/duckdb/Makefile.common:1.1 pkgsrc/databases/duckdb/Makefile.common:1.2
--- pkgsrc/databases/duckdb/Makefile.common:1.1 Sun Jun 15 13:30:19 2025
+++ pkgsrc/databases/duckdb/Makefile.common     Tue Jun 24 00:02:58 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2025/06/15 13:30:19 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.2 2025/06/24 00:02:58 ryoon Exp $
 #
 # used by databases/duckdb/Makefile
 # used by databases/py-duckdb/Makefile
@@ -15,5 +15,5 @@ PATCHDIR=     ${.CURDIR}/../../databases/duc
 SUBST_CLASSES+=                ver
 SUBST_STAGE.ver=       pre-configure
 SUBST_MESSAGE.ver=     Setting version number string
-SUBST_FILES.ver+=      tools/pythonpkg/setup.py
+SUBST_FILES.ver+=      scripts/package_build.py
 SUBST_VARS.ver+=       PKGVERSION_NOREV

Index: pkgsrc/databases/duckdb/distinfo
diff -u pkgsrc/databases/duckdb/distinfo:1.8 pkgsrc/databases/duckdb/distinfo:1.9
--- pkgsrc/databases/duckdb/distinfo:1.8        Sun Jun 15 13:30:19 2025
+++ pkgsrc/databases/duckdb/distinfo    Tue Jun 24 00:02:58 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2025/06/15 13:30:19 ryoon Exp $
+$NetBSD: distinfo,v 1.9 2025/06/24 00:02:58 ryoon Exp $
 
 BLAKE2s (duckdb-1.3.0.tar.gz) = 8d615ed8e670fa47579d605e287668d21b3d9add13b22fe2adb9073013899168
 SHA512 (duckdb-1.3.0.tar.gz) = e598c20c865995240d463fc0297c5f1ee4bc0fc53a4a09a5324ac07a5c632c5d8d2118d168f5889b73afcd6e9ac536f1208e1fa7bfe6b878623524501e0584fc
 Size (duckdb-1.3.0.tar.gz) = 93438925 bytes
+SHA1 (patch-scripts_package__build.py) = 3bbe140b65fe43ec34b7f17c9e166371b44719cd
 SHA1 (patch-src_include_duckdb_common_platform.hpp) = 08c4f744494f360609140c6102065e91353551ea
-SHA1 (patch-tools_pythonpkg_setup.py) = 855d7147fb1864e2dbcfc2ce7b7db3a7ac2889f0

Added files:

Index: pkgsrc/databases/duckdb/patches/patch-scripts_package__build.py
diff -u /dev/null pkgsrc/databases/duckdb/patches/patch-scripts_package__build.py:1.1
--- /dev/null   Tue Jun 24 00:02:58 2025
+++ pkgsrc/databases/duckdb/patches/patch-scripts_package__build.py     Tue Jun 24 00:02:58 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-scripts_package__build.py,v 1.1 2025/06/24 00:02:58 ryoon Exp $
+
+--- scripts/package_build.py.orig      2025-06-23 10:23:12.773672554 +0000
++++ scripts/package_build.py
+@@ -206,7 +206,7 @@ def git_dev_version():
+         dev_version = long_version.split('-')[1]
+         if int(dev_version) == 0:
+             # directly on a tag: emit the regular version
+-            return "v" + '.'.join(version_splits)
++            return "v@PKGVERSION_NOREV@"
+         else:
+             # not on a tag: increment the version by one and add a -devX suffix
+             # this needs to keep in sync with changes to CMakeLists.txt