CVS commit: pkgsrc/databases

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Jun 24 14:29:27 UTC 2025

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

Log Message:
databases/py-duckdb: Fix previous

I had confused. This should fix packaging of py-duckdb.


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

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.2 pkgsrc/databases/duckdb/Makefile.common:1.3
--- pkgsrc/databases/duckdb/Makefile.common:1.2 Tue Jun 24 00:02:58 2025
+++ pkgsrc/databases/duckdb/Makefile.common     Tue Jun 24 14:29:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2025/06/24 00:02:58 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.3 2025/06/24 14:29:26 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+=      scripts/package_build.py
+SUBST_FILES.ver+=      tools/pythonpkg/setup.py
 SUBST_VARS.ver+=       PKGVERSION_NOREV

Index: pkgsrc/databases/duckdb/PLIST
diff -u pkgsrc/databases/duckdb/PLIST:1.10 pkgsrc/databases/duckdb/PLIST:1.11
--- pkgsrc/databases/duckdb/PLIST:1.10  Sun Jun 15 13:30:19 2025
+++ pkgsrc/databases/duckdb/PLIST       Tue Jun 24 14:29:26 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2025/06/15 13:30:19 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.11 2025/06/24 14:29:26 ryoon Exp $
 bin/duckdb
 include/duckdb.h
 include/duckdb.hpp
@@ -264,6 +264,7 @@ include/duckdb/common/serializer/seriali
 include/duckdb/common/serializer/serializer.hpp
 include/duckdb/common/serializer/write_stream.hpp
 include/duckdb/common/set.hpp
+include/duckdb/common/shadow_forbidden_functions.hpp
 include/duckdb/common/shared_ptr.hpp
 include/duckdb/common/shared_ptr_ipp.hpp
 include/duckdb/common/sort/comparators.hpp
@@ -759,6 +760,9 @@ include/duckdb/optimizer/statistics_prop
 include/duckdb/optimizer/sum_rewriter.hpp
 include/duckdb/optimizer/topn_optimizer.hpp
 include/duckdb/optimizer/unnest_rewriter.hpp
+include/duckdb/original/std/locale.hpp
+include/duckdb/original/std/memory.hpp
+include/duckdb/original/std/sstream.hpp
 include/duckdb/parallel/base_pipeline_event.hpp
 include/duckdb/parallel/concurrentqueue.hpp
 include/duckdb/parallel/event.hpp
@@ -1246,3 +1250,7 @@ lib/libjson_extension.a
 lib/libparquet_extension.a
 lib/libtpcds_extension.a
 lib/libtpch_extension.a
+@pkgdir include/duckdb/storage/serialization
+@pkgdir include/duckdb/main/capi/header_generation/functions
+@pkgdir include/duckdb/main/capi/header_generation/apis/v1/v1.2
+@pkgdir include/duckdb/main/capi/header_generation/apis/v1/unstable

Index: pkgsrc/databases/duckdb/distinfo
diff -u pkgsrc/databases/duckdb/distinfo:1.9 pkgsrc/databases/duckdb/distinfo:1.10
--- pkgsrc/databases/duckdb/distinfo:1.9        Tue Jun 24 00:02:58 2025
+++ pkgsrc/databases/duckdb/distinfo    Tue Jun 24 14:29:26 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2025/06/24 00:02:58 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2025/06/24 14:29:26 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) = ed5716caf810c618046dd0a6dc5aa7a9ecb80770

Index: pkgsrc/databases/py-duckdb/PLIST
diff -u pkgsrc/databases/py-duckdb/PLIST:1.2 pkgsrc/databases/py-duckdb/PLIST:1.3
--- pkgsrc/databases/py-duckdb/PLIST:1.2        Wed Jun 18 08:14:36 2025
+++ pkgsrc/databases/py-duckdb/PLIST    Tue Jun 24 14:29:26 2025
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2025/06/18 08:14:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/06/24 14:29:26 ryoon Exp $
 ${PYSITELIB}/adbc_driver_duckdb/__init__.py
 ${PYSITELIB}/adbc_driver_duckdb/__init__.pyc
 ${PYSITELIB}/adbc_driver_duckdb/__init__.pyo
 ${PYSITELIB}/adbc_driver_duckdb/dbapi.py
 ${PYSITELIB}/adbc_driver_duckdb/dbapi.pyc
 ${PYSITELIB}/adbc_driver_duckdb/dbapi.pyo
-${PYSITELIB}/duckdb-0.0.0.dist-info/METADATA
-${PYSITELIB}/duckdb-0.0.0.dist-info/RECORD
-${PYSITELIB}/duckdb-0.0.0.dist-info/WHEEL
-${PYSITELIB}/duckdb-0.0.0.dist-info/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/duckdb-stubs/__init__.pyi
 ${PYSITELIB}/duckdb-stubs/functional/__init__.pyi
 ${PYSITELIB}/duckdb-stubs/typing/__init__.pyi

Added files:

Index: pkgsrc/databases/duckdb/patches/patch-tools_pythonpkg_setup.py
diff -u /dev/null pkgsrc/databases/duckdb/patches/patch-tools_pythonpkg_setup.py:1.3
--- /dev/null   Tue Jun 24 14:29:27 2025
+++ pkgsrc/databases/duckdb/patches/patch-tools_pythonpkg_setup.py      Tue Jun 24 14:29:26 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-tools_pythonpkg_setup.py,v 1.3 2025/06/24 14:29:26 ryoon Exp $
+
+--- tools/pythonpkg/setup.py.orig      2025-05-21 11:38:48.000000000 +0000
++++ tools/pythonpkg/setup.py
+@@ -420,7 +420,7 @@ def parse(root: str | Path, config: Conf
+     try:
+         return git_parse(root, config, describe_command=git_describe_command)
+     except Exception:
+-        return meta(tag="v0.0.0", distance=0, node="deadbeeff", config=config)
++        return meta(tag="v@PKGVERSION_NOREV@", distance=0, node="deadbeeff", config=config)
+ 
+ 
+ def version_scheme(version):
+@@ -471,7 +471,7 @@ setup(
+         "version_scheme": version_scheme,
+         "root": "../..",
+         "parse": parse,
+-        "fallback_version": "v0.0.0",
++        "fallback_version": "v@PKGVERSION_NOREV@",
+         "local_scheme": "no-local-version",
+     },
+     cmdclass={"build_ext": build_ext},