[packages/sphinx] Rel 3

arekm arekm at pld-linux.org
Sat Mar 14 12:45:44 CET 2026


commit 5664197a554ede15c5f42f6da0a137cacdc5058c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Mar 14 12:45:37 2026 +0100

    Rel 3

 bug-468.patch | 17 ++++-------------
 gcc14.patch   | 22 ++++++++++++++++++++++
 sphinx.spec   |  8 +++++---
 3 files changed, 31 insertions(+), 16 deletions(-)
---
diff --git a/sphinx.spec b/sphinx.spec
index 216e94d..275f168 100644
--- a/sphinx.spec
+++ b/sphinx.spec
@@ -15,10 +15,10 @@ Summary:	Free open-source SQL full-text search engine
 Summary(pl.UTF-8):	Silnik przeszukiwania pełnotekstowego SQL open-source
 Name:		sphinx
 Version:	2.2.11
-Release:	2
+Release:	3
 License:	GPL v2, LGPL (API libraries)
 Group:		Applications/Databases
-Source0:	http://www.sphinxsearch.com/files/%{name}-%{version}-release.tar.gz
+Source0:	https://sphinxsearch.com/files/%{name}-%{version}-release.tar.gz
 # Source0-md5:	5cac34f3d78a9d612ca4301abfcbd666
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
@@ -27,7 +27,8 @@ Source4:	%{name}.tmpfiles
 Patch0:		bug-468.patch
 Patch1:		libstemmer.patch
 Patch2:		x32.patch
-URL:		http://www.sphinxsearch.com/
+Patch3:		gcc14.patch
+URL:		https://sphinxsearch.com/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1:1.12
 BuildRequires:	expat-devel
@@ -159,6 +160,7 @@ API Pythona dla Sphinksa.
 %patch -P0 -p1
 #patch1 -p1
 %patch -P2 -p1
+%patch -P3 -p1
 
 sed -i -e '
 	s#/var/run/#/var/run/sphinx/#
diff --git a/bug-468.patch b/bug-468.patch
index 247982f..eb12095 100644
--- a/bug-468.patch
+++ b/bug-468.patch
@@ -1,23 +1,14 @@
 http://www.sphinxsearch.com/bugs/view.php?id=468
 http://code.google.com/p/sphinxsearch/source/detail?r=2225
 
---- sphinx-0.9.9/api/libsphinxclient/sphinxclient.c~	2009-11-14 01:23:06.000000000 +0200
-+++ sphinx-0.9.9/api/libsphinxclient/sphinxclient.c	2010-03-31 00:51:23.815645056 +0300
-@@ -277,7 +277,7 @@
+--- sphinx-2.2.11-release/api/libsphinxclient/sphinxclient.c~	2016-06-21 22:58:00.000000000 +0200
++++ sphinx-2.2.11-release/api/libsphinxclient/sphinxclient.c	2026-03-14 12:00:00.000000000 +0100
+@@ -311,7 +311,7 @@
  }
  
  
 -void sock_close ( int sock );
 +static void sock_close ( int sock );
  
- void sphinx_destroy ( sphinx_client * client )
- {
-@@ -1253,7 +1253,7 @@
- }
- 
  
--void sock_close ( int sock )
-+static void sock_close ( int sock )
- {
- 	if ( sock<0 )
- 		return;
+ #define safe_free(_ptr) \
diff --git a/gcc14.patch b/gcc14.patch
new file mode 100644
index 0000000..1ad9707
--- /dev/null
+++ b/gcc14.patch
@@ -0,0 +1,22 @@
+Fix build with modern GCC: add missing string.h include and fix
+incompatible pointer type in sphinx_build_excerpts call.
+
+--- sphinx-2.2.11-release/api/libsphinxclient/test.c~	2026-03-14 12:31:38.416581288 +0100
++++ sphinx-2.2.11-release/api/libsphinxclient/test.c	2026-03-14 12:31:43.445929185 +0100
+@@ -16,6 +16,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #if _WIN32
+ #include <winsock2.h>
+@@ -268,7 +269,7 @@ void test_persist_work ( sphinx_client *
+ 		}
+ 
+ 		printf ( "n=%d,\t", i );
+-		res = sphinx_build_excerpts ( client, 1, docs, index, words, &opts );
++		res = sphinx_build_excerpts ( client, 1, (const char **)docs, index, words, &opts );
+ 
+ 		if ( !res )
+ 		{
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sphinx.git/commitdiff/5664197a554ede15c5f42f6da0a137cacdc5058c



More information about the pld-cvs-commit mailing list