[packages/hyperestraier] - rel 13 - fix patch fuzz - add ruby fix from fedora

[baggins]

commit 7a1be5924f513dbd76bfbb25457f9d15c4eec412
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Apr 20 15:42:37 2026 +0200

    - rel 13
    - fix patch fuzz
    - add ruby fix from fedora

 hyperestraier-am_ac.patch |  6 +++---
 hyperestraier.spec        |  4 +++-
 rubyext-functype.patch    | 20 ++++++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
---
diff --git a/hyperestraier.spec b/hyperestraier.spec
index a7789e8..7c5ecf1 100644
--- a/hyperestraier.spec
+++ b/hyperestraier.spec
@@ -13,7 +13,7 @@ Summary:	Full-text search system
 Summary(pl.UTF-8):	Pełnotekstowy system wyszukiwawczy
 Name:		hyperestraier
 Version:	1.4.13
-Release:	12
+Release:	13
 License:	LGPL v2.1+
 Group:		Applications/Text
 Source0:	http://downloads.sourceforge.net/hyperestraier/%{name}-%{version}.tar.gz
@@ -22,6 +22,7 @@ Source1:	%{name}.sh
 Patch0:		%{name}-am_ac.patch
 Patch1:		%{name}-ruby1.9.patch
 Patch2:		ruby-vendor.patch
+Patch3:		rubyext-functype.patch
 URL:		http://hyperestraier.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -168,6 +169,7 @@ Wiązania języka Ruby do hyperestraiera w czystym Rubym.
 %patch -P0 -p1
 %patch -P1 -p1
 %patch -P2 -p1
+%patch -P3 -p1
 
 %build
 %{__libtoolize}
diff --git a/hyperestraier-am_ac.patch b/hyperestraier-am_ac.patch
index 5809679..a3f3637 100644
--- a/hyperestraier-am_ac.patch
+++ b/hyperestraier-am_ac.patch
@@ -231,7 +231,7 @@ diff -Nur b.hyperestraier-1.2.3/configure.in n.hyperestraier-1.2.3/configure.in
  # Enable MeCab morphological analyzer
  AC_ARG_ENABLE(mecab,
 @@ -127,6 +69,20 @@
-   enables="$enables (bzip)"
+   enables="$enables (vista)"
  fi
  
 +# build estseek.fcgi binary
@@ -289,7 +289,7 @@ diff -Nur b.hyperestraier-1.2.3/configure.in n.hyperestraier-1.2.3/configure.in
  AC_SUBST(PROTVER)
  AC_SUBST(MYCFLAGS)
  AC_SUBST(MYCPPOPTS)
-@@ -217,7 +161,7 @@
+@@ -217,8 +161,8 @@
  AC_SUBST(MYAPPLIBS)
  AC_SUBST(MYRUNPATH)
  AC_SUBST(MYPOSTCMD)
@@ -464,8 +464,8 @@ diff -Nur b.hyperestraier-1.2.3/rubynative/Makefile.in n.hyperestraier-1.2.3/rub
 --- b.hyperestraier-1.2.3/rubynative/Makefile.in	2005-11-24 18:36:57.000000000 +0100
 +++ n.hyperestraier-1.2.3/rubynative/Makefile.in	2006-04-29 14:59:31.000000000 +0200
 @@ -22,13 +22,13 @@
- prefix = @prefix@
  exec_prefix = @exec_prefix@
+ MYLIBDIR = @libdir@
  MYRBLIBDIR = @MYRBLIBDIR@
 +MYRBARCHDIR = @MYRBARCHDIR@
  MYRBBINDIR = @bindir@
diff --git a/rubyext-functype.patch b/rubyext-functype.patch
new file mode 100644
index 0000000..ce3e029
--- /dev/null
+++ b/rubyext-functype.patch
@@ -0,0 +1,20 @@
+--- hyperestraier-1.4.13/rubynative/src/estraier.c.ruby_functype	2024-01-19 14:54:29.622147689 +0900
++++ hyperestraier-1.4.13/rubynative/src/estraier.c	2024-01-19 15:27:48.272564661 +0900
+@@ -127,7 +127,7 @@ static VALUE cbmaptoobj(CBMAP *map);
+ static CBMAP *objtocbmap(VALUE obj);
+ static void db_informer(const char *message, void *opaque);
+ static VALUE db_informer_process(VALUE arg);
+-static VALUE db_informer_resque(VALUE arg);
++static VALUE db_informer_resque(VALUE arg, VALUE err);
+ 
+ 
+ 
+@@ -1261,7 +1261,7 @@ static VALUE db_informer_process(VALUE a
+ }
+ 
+ 
+-static VALUE db_informer_resque(VALUE arg){
++static VALUE db_informer_resque(VALUE arg, VALUE){
+   return Qnil;
+ }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hyperestraier.git/commitdiff/7a1be5924f513dbd76bfbb25457f9d15c4eec412