<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c7d8046ef3bce44b48792875556f71a679ab99a6">https://github.com/macports/macports-ports/commit/c7d8046ef3bce44b48792875556f71a679ab99a6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c7d8046ef3b xapian-core: Update to 1.4.25
</span>c7d8046ef3b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c7d8046ef3bce44b48792875556f71a679ab99a6
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Mon Apr 1 01:16:25 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> xapian-core: Update to 1.4.25
</span>---
devel/xapian-core/Portfile | 27 ++++++++++------------
devel/xapian-core/files/dynamic_lookup-11.patch | 6 ++---
...er.h-use-AI_NUMERICSERV-only-when-defined.patch | 23 ------------------
3 files changed, 15 insertions(+), 41 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xapian-core/Portfile b/devel/xapian-core/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3b20b55e513..08b7e7355fa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/xapian-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/xapian-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name xapian-core
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4.25
</span> categories devel
maintainers {ryandesign @ryandesign} openmaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,12 +31,9 @@ if {${subport} eq ${name}} {
</span> # version.h does not get generated properly when there are multiple -arch flags
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 75d7e7510c0728cba8533c9bc0547d7ecbb399c2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 eda5ae6dcf6b0553a8676af64b1fd304e998cd20f779031ccaaf7ab9a373531a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3194164
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/xapian/xapian/pull/332
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append resolver.h-use-AI_NUMERICSERV-only-when-defined.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 6f2d892a283b36971177df5942ed7b4040eba3ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0c99dfdd817571cb5689bc412a7e021407938313f38ea3a70fa3bf86410608ee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3205904
</span>
# TODO: Fix xapian-config to not require the .la file
# /opt/local/bin/xapian-config --ltlibs --cxxflags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,9 +60,9 @@ if {${subport} eq ${name}} {
</span>
subport xapian-omega {
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 1b85060d7d83bbbacae78f434def14585813145a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d08756e4f33b18916cc8a2493d311f1cbeb8ed4357bd40fa5c1744adc080ebff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 580736
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ff5ddeddd1afc6cea75e8f8b10b61aaa17096109 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2fc0b505e606d5e1dcde1f22362b6f0237d9e847fc9b6af538f99bc9abd1fccb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 578904
</span>
description web application using the Xapian library
long_description Xapian Omega is an application built on the \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,9 +83,9 @@ subport xapian-omega {
</span> }
if {${subport} ni [list ${name} xapian-omega]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 f9ce3e8a99cac628015f8563d06aa7a226b1bf3e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 513d578488279198ace13ad497510d2b22204d5d794b64143d05b7be974eb6cf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1112744
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9ee69d849888b7b5576231f910a76e120bbda1b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 068314fca3f54524701492df432fa54c485fd4e39613ca2cd275e136964e81a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1076644
</span>
homepage ${homepage}/docs/bindings/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,7 +151,7 @@ foreach v {5.28 5.30 5.32 5.34 5.36} {
</span> }
# PHP
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach v {8.0 8.1 8.2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v {8.0 8.1 8.2 8.3} {
</span> set v_no_dot [string map {. {}} ${v}]
set php php${v_no_dot}
subport ${php}-xapian "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,7 +179,7 @@ foreach v {8.0 8.1 8.2} {
</span> }
# Python
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach v {3.8 3.9 3.10 3.11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v {3.8 3.9 3.10 3.11 3.12} {
</span> set v_no_dot [string map {. {}} ${v}]
if {[vercmp ${v} 3] >= 0} {
set suffix 3
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xapian-core/files/dynamic_lookup-11.patch b/devel/xapian-core/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index ae38a241534..68481ccb80a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/xapian-core/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/xapian-core/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> Recognize macOS 11 and later, remove inaccurate comment, and simplify.
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44605
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2023-02-01 19:01:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-02-05 04:33:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9213,16 +9213,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2024-03-07 16:58:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-04-01 00:04:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9217,16 +9217,11 @@
</span> _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xapian-core/files/resolver.h-use-AI_NUMERICSERV-only-when-defined.patch b/devel/xapian-core/files/resolver.h-use-AI_NUMERICSERV-only-when-defined.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8c4122aa3db..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/xapian-core/files/resolver.h-use-AI_NUMERICSERV-only-when-defined.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 90ed0e3153cdd145fe0831c73c1a0c7d74cb7e9c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 28 Feb 2024 17:36:13 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] resolver.h: use AI_NUMERICSERV only when defined
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xapian-core/net/resolver.h | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git xapian-core/net/resolver.h xapian-core/net/resolver.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 401cf308d..3436227ee 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- net/resolver.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ net/resolver.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -143,7 +143,9 @@ class Resolver {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (host != "::1" && host != "127.0.0.1" && host != "localhost") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags |= AI_ADDRCONFIG;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef AI_NUMERICSERV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags |= AI_NUMERICSERV;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct addrinfo hints;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::memset(&hints, 0, sizeof(struct addrinfo));
</span></pre><pre style='margin:0'>
</pre>