head 1.8; access; symbols pkgsrc-2026Q1:1.8.0.12 pkgsrc-2026Q1-base:1.8 pkgsrc-2025Q4:1.8.0.10 pkgsrc-2025Q4-base:1.8 pkgsrc-2025Q3:1.8.0.8 pkgsrc-2025Q3-base:1.8 pkgsrc-2025Q2:1.8.0.6 pkgsrc-2025Q2-base:1.8 pkgsrc-2025Q1:1.8.0.4 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.2 pkgsrc-2024Q4-base:1.8 pkgsrc-2024Q3:1.7.0.8 pkgsrc-2024Q3-base:1.7 pkgsrc-2024Q2:1.7.0.6 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.4 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.2 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.6.0.10 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.8 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.6 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.4 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.2 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.5.0.12 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.10 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.8 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.6 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.4 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.2 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.4.0.2 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.2.0.26 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.22 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.2 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.24 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.20 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.18 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.16 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.14 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.12 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.10 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.8 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.6 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.4 pkgsrc-2017Q3-base:1.2; locks; strict; comment @# @; 1.8 date 2024.12.06.15.32.08; author schmonz; state Exp; branches; next 1.7; commitid ZpWRuKnIIVdegsAF; 1.7 date 2023.11.07.22.32.52; author schmonz; state Exp; branches; next 1.6; commitid UENNThDYJhdLhJLE; 1.6 date 2022.07.11.18.25.18; author schmonz; state Exp; branches; next 1.5; commitid 9iPmlcfRyEootvLD; 1.5 date 2021.01.14.18.18.11; author schmonz; state Exp; branches; next 1.4; commitid WRqMJFrTEy50TIDC; 1.4 date 2020.11.30.14.05.48; author schmonz; state Exp; branches; next 1.3; commitid VWI91RyRlcFbWUxC; 1.3 date 2020.11.05.10.59.44; author schmonz; state Exp; branches; next 1.2; commitid xkFpmyb0xfubIGuC; 1.2 date 2017.08.07.22.24.05; author schmonz; state Exp; branches; next 1.1; commitid 9daNNpQ0xBFhCk2A; 1.1 date 2017.07.14.12.55.45; author joerg; state Exp; branches; next ; commitid 6ucaygzhJvA5fcZz; desc @@ 1.8 log @xapian: update to 1.4.27. Changes: testsuite: * Fix testcase unsupportedcheck1 for --disable-backend-remote. Reported by Matthieu Gautier in #832. * Merge testcases unsupportedcheck1 and stubdb9 which are essentially the same testcase! build system: * Fix build with --disable-backend-chert. Patch from Matthieu Gautier in #832. portability: * Add missing include of to fix build failure on macOS 15. @ text @$NetBSD: patch-configure,v 1.7 2023/11/07 22:32:52 schmonz Exp $ - Remove hackaround for old OpenBSD bugs that break builds with other STL implementations. - Link directly with static-only libtclstub.a (fixes build on NetBSD). - Remove broken cross-compile check (builds a bundle, complains it can't run as executable) to fix lua-xapian on Big Sur. --- configure.orig 2024-12-06 03:14:00.000000000 +0000 +++ configure @@@@ -4715,51 +4715,6 @@@@ FILE *f = fopen ("conftest.out", "w"); return 0; } _ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -printf %s "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -printf "%s\n" "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } @@@@ -19595,7 +19550,7 @@@@ printf "%s\n" "not found" >&6; } for x in "/tcl$tcl_version" "" ; do TCLCONFIG_SH=$tcl_libdir_runtime$x/tclConfig.sh if test -r "$TCLCONFIG_SH" ; then - TCL_LIBS=`. $TCLCONFIG_SH && printf '%s' "$TCL_STUB_LIB_SPEC"` + TCL_LIBS=`. $TCLCONFIG_SH && printf '%s' "$TCL_BUILD_STUB_LIB_PATH"` break fi done @ 1.7 log @xapian: update to 1.4.24. Changes: testsuite: * apitest: Add coverage that docids generated by replace_document() don't wrap to nomoredocids1 testcase. * unittest: Improve block file functions unit test which were (unintentionally) trying to test with a 4TB sparse file, which not all platforms support. A file just over 4GB is enough to test what we want, and if we trying to create one fails with errno EFBIG, indicating the file size is too large, we now skip the rest of the testcase. * unittest: Catch Xapian::Error exceptions and rethrow the std::string returned by get_description() as the utestsuite harness doesn't know about Xapian::Error so was confusingly reporting it as "UNKNOWN EXCEPTION". * The testsuite no longer reports NULL as the address associated with a signal when running on a platform without both sigaction() and SA_SIGINFO. matcher: * Reorder fields in each MSet entry to avoid structure padding on x86-64 probably other 64-bit platforms. This reduces the memory needed to hold an MSet by 8 bytes per entry on such platforms. glass backend: * Eliminate unnecessary memory allocations. When committing changes, we were allocating blocks for all possible levels of the built-in cursor in each writable table, even those levels that weren't in use. The worst case is a really small database with all optional tables existing which would have 54 unused allocations of blocksize + 8 bytes, which with the default 8K block size is ~432KB per WritableDatabase; if you explicitly ask for 64K block size it'll be ~3.4MB. For a more typical WritableDatabase it's probably going to be more like half these numbers. build system: * Add --enable-werror configure option. * configure: Only auto-enable -D_FORTIFY_SOURCE=2 if it works without additional libraries and remove the hard-coded block against using it on mingw. Mingw-w64 v11.0.0 eliminated the requirement to link with -lssp and with this change we now auto-enable -D_FORTIFY_SOURCE=2 for it. portability: * swig-depcomp: Strip CR from generated files which fixes an issue in some cases when building from git on Microsoft Windows. * We now avoid triggering SIGPIPE in library code on most platforms. On Unix-like platforms we want to avoid generating SIGPIPE when writing to a socket when the other end has been closed since signals break the encapsulation of what we're doing inside the library - either user code would need to handle the SIGPIPE, or we set a signal handler for SIGPIPE but that would handle *any* SIGPIPE in the process, not just those we might trigger, and that could break user code which expects to trigger and handle SIGPIPE. We don't need SIGPIPE since we can check errno==EPIPE instead (which is actually simpler to do). It seems all current Unix-like platforms now support SO_NOSIGPIPE or MSG_NOSIGNAL, so currently we just fall back to setting SIGPIPE to SIG_IGN. If there are actually current platforms which have SIGPIPE without SO_NOSIGPIPE or MSG_NOSIGNAL then we can look at other ways to avoid generating the signal. * Avoid MSVC warning C4312 which is a reasonable warning in general, but in this case we checked that the value wasn't truncated when cast to an int. * Use TEST_EQUAL_DOUBLE in netstats1 testcase which fixes testcase failure on FreeBSD. * Address GCC13 -Wredundant-move warnings. In 1.4.10 we added std::move() here to address clang warnings from -Wreturn-std-move (enabled by -Wall). Just removing the std::move() reintroduces those warning with clang 8 and clang 11 (but not clang 13 or later) but changing to apply a static_cast to the returned type seems to make all versions of both compilers happy. * Fix build with UCRT64 variant of mingw-w64 by stopping defining __MSVCRT_VERSION__ by default. It looks like doing so hasn't been needed since 2015. * Add workaround for testsuite failures under Wine where attempting to unlink a stub file sometimes fails with errno == EACCES and _doserrno == ERROR_SHARING_VIOLATION. This is what you'd get if the file was still open, but we've already closed it. Sleeping for a second and retrying makes it work, so we now do that. It'd be better to get to the bottom of what's going on, but I've run out of ideas and this workaround is only in the testharness at least. debug code: * xapian-inspect: + `goto` and `until` now go to the entry *after* the specified key if there's no exact match, which seems more natural. + New `count" command. This is actually just the same as `until` which already reports a count of the number of entries advanced by, except that `count` suppresses printing each entry. Lua: * Use pkg-config for Lua flags instead of some rather ad-hoc configure probes. This improves portability to platforms which require linking to a Lua library, or which install the Lua headers directly without a versioned containing directory. PHP8: * Update configure probe PHP_LIBS on cygwin. Based on patch found in cygwin packaging, authored by Yaakov Selkowitz. Tcl: * Fix to handle the case of tcl_pkgPath not existing, which happens on Microsoft Windows builds of Tcl. * run-tcl-test: Fix not to hardcode smoketest.tcl and instead run the program specified on the command line. * Use TCL_SHLIB_EXT for the installed extension which is what Tcl expects. Previously the installed Tcl extension used the filename extension that libtool thinks is right for modules on the current platform. We're not currently aware of platform where these actually differ, so this may be just a latent bug. * Improve configure probe for stub library to work if the tclConfig.sh we find forwards to a different script, as is the case with /usr/lib/tclConfig.sh on current Debian. On Debian at least our method for finding the tclConfig.sh to use doesn't find such a forwarding script, but it seems better to be robust to this. * Eliminate special cygwin handling which is no longer needed. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.6 2022/07/11 18:25:18 schmonz Exp $ d9 1 a9 1 --- configure.orig 2023-11-06 04:30:33.000000000 +0000 d11 1 a11 1 @@@@ -4713,51 +4713,6 @@@@ FILE *f = fopen ("conftest.out", "w"); d63 1 a63 1 @@@@ -19438,7 +19393,7 @@@@ printf "%s\n" "not found" >&6; } a71 10 @@@@ -21172,9 +21127,6 @@@@ SWIG_CXXFLAGS= if test yes = "$GXX" ; then SWIG_CXXFLAGS="-fno-strict-aliasing" - XAPIAN_LIBS="$XAPIAN_LIBS -lstdc++" - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __INTEL_COMPILER @ 1.6 log @Update to 1.4.20. From the changelog: API: * Throw DatabaseNotFoundError when the database directory doesn't exist or when it doesn't contain a Xapian database. Patch from Germán Méndez Bravo in https://github.com/xapian/xapian/pull/258 * Improve exception message for attempting to remove an empty term (the exception type is still InvalidArgumentError). Reported by David Bremner. testsuite: * Enable queryparser testcase for OR under NEAR, which has been supported since 1.4.3. * Expand some query-related testcases. matcher: * Optimise when a value range is a superset of the slot bounds but the value slot frequency is not equal to the document count by replacing the lower bound with an empty string to make the bounds check very cheap. * Avoid creating a PostList tree for an empty shard. This avoids pointless work in an uncommon case, but also by handling this up front the code in PostList subclasses for query operators can assume the shard isn't empty which simplifies the code in several places. * Remove lingering handling for database backends without slot bounds since all backends have been required to support these since 1.4.11. * Fix collection frequency estimates for positional operators. This affects the weighting of positional operators in subqueries of OP_SYNONYM with weighting schemes which use the collection frequency. glass backend: * xapian-check: Test decompress data in the spelling and synonym tables. We don't have structure checking for these tables, but we can at least fetch each entry and check for decompression problems. * Improve error if a block is detected as overwritten in WritableDatabase. Drop "are there multiple writers?" as it's rarely a useful question to ask since we started using fcntl() locking as it's now very hard to get multiple concurrent writers on a database. Instead suggest running xapian-check, which is probably the best next step for a user who hits this problem. documentation: * Document precedence of NEAR and ADJ. * INSTALL: Note that MSVS 2022 works. tools: * quest: Add --freqs option to show term frequencies. * xapian-delve -v: Show value slot bounds and freq portability: * Fix to build with a C++20 compiler. * configure now probes for a declaration of strerror_r() before using it, since a declaration is required in C++ code. * MSVC: Use intrinsics to implement addition with overflow check. Bindings: * Enable -fvisibility-inlines-hidden option if the compiler supports it. PHP7: * Add missing reference tracking. XapianEnquire now keeps a reference to the current XapianSorter object (if any). XapianQueryParser now keeps a reference to any set XapianFieldProcessor objects. Test coverage for keeping references to set functor objects is now more comprehensive. * smoketest.php: Remove bogus extra null parameters. PHP ignores these extra parameters, but it's more helpful to be testing valid usage. Python3: * The configure probes for Python3 no longer use the deprecated distutils and imp modules (both of which are slated for removal in Python 3.12). We now use sysconfig to get the directory to install the xapian module to, which may result in it being installed in a different place (it should still work, but if you're packaging the bindings you may need to update the list of files to include in the package). @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.5 2021/01/14 18:18:11 schmonz Exp $ d9 1 a9 1 --- configure.orig 2022-07-04 06:00:37.000000000 +0000 d11 1 a11 1 @@@@ -4745,51 +4745,6 @@@@ FILE *f = fopen ("conftest.out", "w"); d63 10 a72 10 @@@@ -19077,7 +19032,7 @@@@ fi for x in "/tcl$tcl_version" "" ; do TCLCONFIG_SH=$tcl_libdir_runtime$x/tclConfig.sh if test -r "$TCLCONFIG_SH" ; then - eval "`sed 's/^TCL_STUB_LIB_SPEC=/TCL_LIBS=/p;d' $TCLCONFIG_SH`" + eval "`sed 's/^TCL_BUILD_STUB_LIB_PATH=/TCL_LIBS=/p;d' $TCLCONFIG_SH`" break fi done @@@@ -20655,9 +20610,6 @@@@ SWIG_CXXFLAGS= @ 1.5 log @Update to 1.4.18. From the changelog: Portability: * Support macOS 11.0 - AC_CANONICAL_HOST identifies this as darwin20, which wasn't caught by our glob pattern. Patch from FX Coudert in https://github.com/xapian/xapian/pull/319 CSharp: * Wrap const std::string* parameters to accept a string or null in C#. See #204. Java: * Wrap const std::string* parameters to accept a String or null in Java. Perl: * Fix minor documentation typo. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.4 2020/11/30 14:05:48 schmonz Exp $ d9 1 a9 1 --- configure.orig 2021-01-14 00:45:37.000000000 +0000 d11 1 a11 1 @@@@ -3971,51 +3971,6 @@@@ FILE *f = fopen ("conftest.out", "w"); d18 2 a19 2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } d27 1 a27 1 -$as_echo "$ac_try_echo"; } >&5 d30 1 a30 1 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 d38 1 a38 1 -$as_echo "$ac_try_echo"; } >&5 d41 1 a41 1 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 d48 3 a50 3 - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. d56 2 a57 2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } d61 3 a63 3 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } @@@@ -18048,7 +18003,7 @@@@ fi d72 1 a72 1 @@@@ -19524,9 +19479,6 @@@@ SWIG_CXXFLAGS= @ 1.4 log @Remove broken cross-compile check (builds a bundle, complains it can't run as executable) to fix lua-xapian on Big Sur. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.3 2020/11/05 10:59:44 schmonz Exp $ a5 1 - Remove workaround for old macOS to fix Big Sur build. d9 1 a9 1 --- configure.orig 2020-08-21 03:38:47.000000000 +0000 d11 1 a11 16 @@@@ -3309,14 +3309,6 @@@@ case $host in *86*-darwin8*|*-darwin[91]*) ;; *-darwin*) - case $MACOSX_DEPLOYMENT_TARGET in - "") - OVERRIDE_MACOSX_DEPLOYMENT_TARGET=10.3 ;; - 10.[012]) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Overriding MACOSX_DEPLOYMENT_TARGET from $MACOSX_DEPLOYMENT_TARGET to 10.3" >&5 -$as_echo "$as_me: WARNING: Overriding MACOSX_DEPLOYMENT_TARGET from $MACOSX_DEPLOYMENT_TARGET to 10.3" >&2;} - OVERRIDE_MACOSX_DEPLOYMENT_TARGET=10.3 ;; - esac ;; esac if test -n "$OVERRIDE_MACOSX_DEPLOYMENT_TARGET"; then @@@@ -3971,51 +3963,6 @@@@ FILE *f = fopen ("conftest.out", "w"); d63 1 a63 1 @@@@ -18048,7 +17995,7 @@@@ fi d72 1 a72 1 @@@@ -19524,9 +19471,6 @@@@ SWIG_CXXFLAGS= @ 1.3 log @Remove MACOSX_DEPLOYMENT_TARGET workaround for old macOS to fix xapian bindings building on Big Sur. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.2 2017/08/07 22:24:05 schmonz Exp $ d7 2 d27 53 a79 1 @@@@ -18048,7 +18040,7 @@@@ fi d88 1 a88 1 @@@@ -19524,9 +19516,6 @@@@ SWIG_CXXFLAGS= @ 1.2 log @Link directly with libtclstub.a (there's no .so). Fixes build on NetBSD, doesn't break build on OS X. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.1 2017/07/14 12:55:45 joerg Exp $ d6 1 d8 1 a8 1 --- configure.orig 2017-04-24 02:19:58.000000000 +0000 d10 16 a25 1 @@@@ -18051,7 +18051,7 @@@@ fi d34 1 a34 1 @@@@ -19581,9 +19581,6 @@@@ SWIG_CXXFLAGS= @ 1.1 log @Collect patches for xapian in a common subdirectory. Put distinfo for modules into a separate file as well. Don't hard-code -lstdc++ for broken ancient OpenBSD versions of GCC. Sync p5-Xapian PLIST with reality. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 2 Remove hackaround for old OpenBSD bugs that break builds with other STL implementations. d7 1 a7 1 --- configure.orig 2017-07-13 11:13:06.550332512 +0000 d9 9 @