[rpms/xapian-bindings] rawhide: Backport upstream fix to support swig 4.5

[rpms/xapian-bindings] rawhide: Backport upstream fix to support swig 4.5

[Mamoru TASAKA]

A new commit has been pushed.

Repo   : rpms/xapian-bindings
Branch : rawhide
Commit : a35e64718f3b89001672037ed574d6d225c2bcd6
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date   : 2026-09-26T12:53:57+09:00
Stats  : +55/-2 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/xapian-bindings/c/a35e64718f3b89001672037ed574d6d225c2bcd6?branch=rawhide

Log:
Backport upstream fix to support swig 4.5

---
diff --git a/xapian-bindings.spec b/xapian-bindings.spec
index a6fd5f2..9452328 100644
--- a/xapian-bindings.spec
+++ b/xapian-bindings.spec
@@ -3,13 +3,16 @@
 
 Name:          xapian-bindings
 Version:       1.4.31
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Bindings for the Xapian Probabilistic Information Retrieval Library
 
 # Automatically converted from old format: GPLv2+ - review is highly recommended.
 License:       GPL-2.0-or-later
 URL:           https://www.xapian.org/
 Source0:       https://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz
+# https://github.com/xapian/xapian/commit/64c7de24cb5cfae61017e05bd9f4094d88e27c2d
+# Support python 3.15 / swig 4.5
+Patch0:        xapian-git64c7de24-support-swig-4_5.patch
 
 BuildRequires: gcc-c++
 BuildRequires: libuuid-devel
@@ -19,7 +22,8 @@ BuildRequires: python3-devel python3-setuptools python3-sphinx
 BuildRequires: ruby ruby-devel rubygems rubygem-rdoc rubygem-json
 # swig 4.4.0+ contains a fix for PyThread_release_lock/PyThread_free_lock in Mutex destructor
 # needed for successful build with Python 3.15
-BuildRequires: swig >= 4.4.0
+# Patch0 is needed for swig 4.5.0, but with swig 4.4.0 build fails
+BuildRequires: swig >= 4.5.0
 BuildRequires: tcl-devel
 BuildRequires: xapian-core-devel
 BuildRequires: zlib-devel
@@ -117,6 +121,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %{tcl_sitearch}/xapian%{version}/
 
 %changelog
+* Sat Sep 26 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.4.31-5
+- Backport upstream fix to support swig 4.5
+
 * Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 1.4.31-4
 - Rebuilt for Python 3.15.0b4 ABI change
 

diff --git a/xapian-git64c7de24-support-swig-4_5.patch b/xapian-git64c7de24-support-swig-4_5.patch
new file mode 100644
index 0000000..6c648ff
--- /dev/null
+++ b/xapian-git64c7de24-support-swig-4_5.patch
@@ -0,0 +1,46 @@
+From 64c7de24cb5cfae61017e05bd9f4094d88e27c2d Mon Sep 17 00:00:00 2001
+From: Olly Betts <olly@survex.com>
+Date: Tue, 25 Aug 2026 14:34:08 +1200
+Subject: [PATCH] Support Python 3.15
+
+This requires upgrading the SWIG version we bootstrap with - we're
+now using SWIG 4.5.0.
+---
+ bootstrap                                      | 6 ++----
+ xapian-bindings/python3/fixup-swig-py3-wrapper | 8 ++++----
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/xapian-bindings/python3/fixup-swig-py3-wrapper b/xapian-bindings/python3/fixup-swig-py3-wrapper
+index 82e5f2ed2f0..a5b2441b0dd 100644
+--- a/python3/fixup-swig-py3-wrapper
++++ b/python3/fixup-swig-py3-wrapper
+@@ -1,5 +1,5 @@
+ #!/usr/bin/perl
+-# Copyright (c) 2016,2019 Olly Betts
++# Copyright (c) 2016,2019,2026 Olly Betts
+ #
+ # Permission is hereby granted, free of charge, to any person obtaining a copy
+ # of this software and associated documentation files (the "Software"), to
+@@ -27,7 +27,7 @@ $_ = <>;
+ 
+ my ($pos, $find, $replace);
+ 
+-s/^try:\n    import builtins as __builtin__.*?\n    import __builtin__\n//sm or
++s/^import builtins as __builtin__\n+//sm or
+     die "Failed to fix up import code";
+ 
+ $replace = << '__END__';
+@@ -36,11 +36,11 @@ def _swig_repr(self):
+     if hasattr(self.this, '__repr__'):
+         strthis = "proxy of " + self.this.__repr__()
+ __END__
+-s/^(?:def _swig_setattr_nondynamic\(self.*?\n)?def _swig_repr\(self\):.*?(\n    return)/$replace$1/sm or
++s/^def _swig_repr\(self\):.*?(\n    return)/$replace$1/sm or
+     die "Failed to fix up _swig_repr";
+ 
+ s/^def _swig_setattr_nondynamic.*?\nclass _SwigNonDynamicMeta\(type\):.*?\n\n//sm or
+-    die "Failed to fix up _swig_setattr_nondynamic";
++    die "Failed to fix up _swig_setattr_nondynamic*";
+ 
+ /\b__builtin__\b/ and
+     die "Failed to fully fix up __builtin__";