From 47573ba941500409214eb78218d8c94c17b596d9 Mon Sep 17 00:00:00 2001 From: "yacp-dev[bot]" <336985824+yacp-dev[bot]@users.noreply.github.com> Date: Sun, 15 Nov 2026 22:37:34 +0000 Subject: [PATCH] idzebra-2.2.11 --- idzebra/README | 89 ++++++++-------- idzebra/idzebra-2.2.0-1bl1.cygport | 41 ------- idzebra/idzebra-2.2.11-1bl1.cygport | 100 ++++++++++++++++++ ...rc.patch => idzebra-2.2.11-1bl1.src.patch} | 40 +++++-- 4 files changed, 179 insertions(+), 91 deletions(-) delete mode 100644 idzebra/idzebra-2.2.0-1bl1.cygport create mode 100644 idzebra/idzebra-2.2.11-1bl1.cygport rename idzebra/{idzebra-2.2.0-1bl1.src.patch => idzebra-2.2.11-1bl1.src.patch} (57%) diff --git a/idzebra/README b/idzebra/README index c4888db7a3..e20749f9f4 100644 --- a/idzebra/README +++ b/idzebra/README @@ -6,62 +6,64 @@ retrieval engine. It reads structured records in a variety of input formats expressions and relevance-ranked free-text queries. Runtime requirements: - bash-4.4.12-3 - cygwin-3.1.7-1 - cygwin-devel-3.1.7-1 - libbz2_1-1.0.8-1 - libcrypt2-4.4.4-1 - libexpat-devel-2.2.6-1 - libexpat1-2.2.6-1 - libgcrypt-devel-1.8.2-1 - libgpg-error-devel-1.37-1 - libiconv-devel-1.16-2 - libiconv2-1.16-2 - libicu-devel-67.1-2 - libidzebra2.0-devel-2.2.0-1bl1 - libidzebra2.0_0-2.2.0-1bl1 - liblzma-devel-5.2.4-1 - libxml2-2.9.10-2 - libxml2-devel-2.9.10-2 - libxslt-1.1.29-1 - libxslt-devel-1.1.29-1 + bash-5.2.21-1 + cygwin-3.6.12-1 + libbz2_1-1.0.8-2 + libexpat1-2.10.0-1 + libiconv2-1.19-2 + libidzebra2.0-devel-2.2.11-1bl1 + libidzebra2.0_0-2.2.11-1bl1 + libxml2_2-2.13.9-3 + libxslt-1.1.43-1 libyaz-devel-5.23.1-2 libyaz5-5.23.1-2 - perl_base-5.30.3-1 - pkg-config-1.6.3-1 - zlib-devel-1.2.11-1 - zlib0-1.2.11-1 + perl_base-5.44.0-1 + pkg-config-3.0.10-1 + zlib0-1.4-1 Build requirements: (besides corresponding -devel packages) - autoconf-13-1 - automake-11-1 - binutils-2.34+1git.de9c1b7cfe-1 - cygport-0.34.0-1 - gcc-core-10.2.0-1 - libtool-2.4.6-7 - make-4.3-1 + autoconf-20260320-3 + automake-20261107-1 + binutils-2.47-1 + cygport-0.37.12-1 + docbook-xml44-4.4-2 + docbook-xsl-1.77.1-1 + gcc-core-14.4.0-1 + libbz2-devel-1.0.8-2 + libexpat-devel-2.10.0-1 + libgcrypt-devel-1.12.4-1 + libgpg-error-devel-1.61-1 + libiconv-devel-1.19-2 + libicu-devel-76.1-2 + libtool-2.6.2-1 + libxml2-devel-2.13.9-3 + libxslt-devel-1.1.43-1 + libyaz-devel-5.23.1-2 + make-4.4.1-2 + rsvg-2.40.20-1 + zlib-devel-1.4-1 Canonical website: - https://www.indexdata.com/resources/software/zebra/ + https://github.com/indexdata/idzebra Canonical download: - http://ftp.indexdata.dk/pub/zebra/idzebra-2.2.0.tar.gz + https://github.com/indexdata/idzebra/archive/refs/tags/v2.2.11.tar.gz ------------------------------------------- Build instructions: - 1. unpack idzebra-2.2.0-X-src.tar.xz + 1. unpack idzebra-2.2.11-X-src.tar.xz 2. if you use setup to install this src package, it will be unpacked under /usr/src automatically % cd /usr/src - % cygport ./idzebra-2.2.0-X.cygport all + % cygport ./idzebra-2.2.11-X.cygport all This will create: - /usr/src/idzebra-2.2.0-X-src.tar.xz - /usr/src/idzebra-2.2.0-X.tar.xz - /usr/src/libidzebra2.0_0-2.2.0-X.tar.xz - /usr/src/libidzebra2.0-devel-2.2.0-X.tar.xz + /usr/src/idzebra-2.2.11-X-src.tar.xz + /usr/src/idzebra-2.2.11-X.tar.xz + /usr/src/libidzebra2.0_0-2.2.11-X.tar.xz + /usr/src/libidzebra2.0-devel-2.2.11-X.tar.xz ------------------------------------------- @@ -70,11 +72,11 @@ Files included in the binary package: (idzebra) /usr/bin/idzebra-abs2dom /usr/bin/zebraidx - /usr/bin/zebraidx.exe-2.0 + /usr/bin/zebraidx-2.0.exe /usr/bin/zebrasrv - /usr/bin/zebrasrv.exe-2.0 + /usr/bin/zebrasrv-2.0.exe /usr/share/doc/Cygwin/idzebra.README - /usr/share/doc/idzebra/ChangeLog + /usr/share/doc/idzebra/LICENSE.zebra /usr/share/doc/idzebra/NEWS /usr/share/doc/idzebra/README.md /usr/share/doc/idzebra/TODO @@ -131,7 +133,7 @@ Files included in the binary package: /usr/share/idzebra-2.0-examples/marc21/zebra.cfg /usr/share/idzebra-2.0-examples/marcxml/MARC21slim2INDEX.xsl /usr/share/idzebra-2.0-examples/marcxml/MARC21slim2MADS.xsl - /usr/share/idzebra-2.0-examples/marcxml/MARC21slim2MODS3-1.xsl + /usr/share/idzebra-2.0-examples/marcxml/MARC21slim2MODS3-7.xsl /usr/share/idzebra-2.0-examples/marcxml/MARC21slim2SRWDC.xsl /usr/share/idzebra-2.0-examples/marcxml/MARC21slimUtils.xsl /usr/share/idzebra-2.0-examples/marcxml/README @@ -317,6 +319,9 @@ Files included in the binary package: Port Notes: +----- version 2.2.11-1bl1 ----- +Version bump. + ----- version 2.2.0-1bl1 ----- Version bump. diff --git a/idzebra/idzebra-2.2.0-1bl1.cygport b/idzebra/idzebra-2.2.0-1bl1.cygport deleted file mode 100644 index 02f8fd76d4..0000000000 --- a/idzebra/idzebra-2.2.0-1bl1.cygport +++ /dev/null @@ -1,41 +0,0 @@ -HOMEPAGE="https://www.indexdata.com/resources/software/zebra/" -SRC_URI="http://ftp.indexdata.dk/pub/zebra/${P}.tar.gz" - -CATEGORY="Net" -SUMMARY="High-performance, structured text indexing and retrival engine" -DESCRIPTION="Zebra is a high-performance, general-purpose structured text indexing and -retrieval engine. It reads structured records in a variety of input formats -(eg. email, XML, MARC) and allows access to them through exact boolean search -expressions and relevance-ranked free-text queries." - -PKG_NAMES=" - idzebra - libidzebra2.0_0 - libidzebra2.0-devel -" -idzebra_CONTENTS=" - usr/bin/${PN}-abs2dom - usr/bin/zebra* - usr/share/doc/Cygwin - usr/share/doc/${PN} - usr/share/${PN}-2.0* - usr/share/man/man1/${PN}-abs2dom* -" -libidzebra2_0_0_CONTENTS=" - usr/bin/*.dll - usr/lib/${PN}-2.0/modules/*.dll -" -libidzebra2_0_devel_CONTENTS=" - usr/bin/*-config* - usr/include - usr/lib/lib*.dll.a - usr/lib/pkgconfig - usr/share/aclocal - usr/share/doc/${PN}-2.0 - usr/share/man/man1/${PN}-config* - usr/share/man/man1/zebra* - usr/share/man/man8/zebra* -" -idzebra_SUMMARY="${SUMMARY} (utilities)" -libidzebra2_0_0_SUMMARY="${SUMMARY} (runtime)" -libidzebra2_0_devel_SUMMARY="${SUMMARY} (development)" diff --git a/idzebra/idzebra-2.2.11-1bl1.cygport b/idzebra/idzebra-2.2.11-1bl1.cygport new file mode 100644 index 0000000000..a8e02bbe9a --- /dev/null +++ b/idzebra/idzebra-2.2.11-1bl1.cygport @@ -0,0 +1,100 @@ +HOMEPAGE="https://github.com/indexdata/idzebra" +# m4 and doc/common are git submodules, not in the tag tarball +ID_M4_REV="7d0de47b22739b4c13272604c60d3152b9cb55a2" +ID_DOCBOOK_COMMON_REV="34b6301de5e648bf5444d0f27bbaeaa254bded71" +SRC_URI="https://github.com/indexdata/${PN}/archive/refs/tags/v${PV}.tar.gz + https://github.com/indexdata/m4/archive/${ID_M4_REV}.tar.gz#/id-m4-${ID_M4_REV}.tar.gz + https://github.com/indexdata/id-docbook-common/archive/${ID_DOCBOOK_COMMON_REV}.tar.gz#/id-docbook-common-${ID_DOCBOOK_COMMON_REV}.tar.gz" + +CATEGORY="Net" +SUMMARY="High-performance, structured text indexing and retrival engine" +DESCRIPTION="Zebra is a high-performance, general-purpose structured text indexing and +retrieval engine. It reads structured records in a variety of input formats +(eg. email, XML, MARC) and allows access to them through exact boolean search +expressions and relevance-ranked free-text queries." + +LICENSE="GPL-2.0-or-later" +LICENSE_SPDX="SPDX-License-Identifier: GPL-2.0-or-later" +LICENSE_URI="LICENSE.zebra" + +BUILD_REQUIRES=" + docbook-xml44 + docbook-xsl + libbz2-devel + libexpat-devel + libgcrypt-devel + libgpg-error-devel + libicu-devel + libiconv-devel + libxml2-devel + libxslt-devel + libyaz-devel + rsvg + zlib-devel +" + +DOCS=" + LICENSE.zebra + README.md +" + +CYGPORT_USE_UNSTABLE_API=1 +src_unpack_hook() +{ + cd ${origsrcdir}/${SRC_DIR} + verbose rmdir m4 doc/common + verbose mv ${origsrcdir}/m4-${ID_M4_REV} m4 + verbose mv ${origsrcdir}/id-docbook-common-${ID_DOCBOOK_COMMON_REV} doc/common +} + +# Cygwin's libyaz-devel has yaz.pc only, no yaz-icu.pc or yaz-server.pc; +# zebra.pc's Libs.private already names their libraries +src_install() +{ + cd ${B} + cyginstall + verbose sed -i 's/^Requires: yaz-icu yaz-server$/Requires: yaz/' \ + ${D}/usr/lib/pkgconfig/zebra.pc + + # index/Makefile.am's install-exec-hook renames zebraidx.exe to + # zebraidx.exe-2.0 (cygport then adds another .exe to that name) + # and links zebraidx.exe to it + cd ${D}/usr/bin + for p in zebraidx zebrasrv + do + verbose mv -f ${p}.exe-2.0 ${p}-2.0.exe + verbose ln -sf ${p}-2.0.exe ${p}.exe + done +} + +PKG_NAMES=" + idzebra + libidzebra2.0_0 + libidzebra2.0-devel +" +idzebra_CONTENTS=" + usr/bin/${PN}-abs2dom + usr/bin/zebra* + usr/share/doc/Cygwin + usr/share/doc/${PN} + usr/share/${PN}-2.0* + usr/share/man/man1/${PN}-abs2dom* +" +libidzebra2_0_0_CONTENTS=" + usr/bin/cygidzebra-2.0-0.dll + usr/lib/${PN}-2.0/modules/*.dll +" +libidzebra2_0_devel_CONTENTS=" + usr/bin/*-config* + usr/include + usr/lib/lib*.dll.a + usr/lib/pkgconfig + usr/share/aclocal + usr/share/doc/${PN}-2.0 + usr/share/man/man1/${PN}-config* + usr/share/man/man1/zebra* + usr/share/man/man8/zebra* +" +idzebra_SUMMARY="${SUMMARY} (utilities)" +libidzebra2_0_0_SUMMARY="${SUMMARY} (runtime)" +libidzebra2_0_devel_SUMMARY="${SUMMARY} (development)" diff --git a/idzebra/idzebra-2.2.0-1bl1.src.patch b/idzebra/idzebra-2.2.11-1bl1.src.patch similarity index 57% rename from idzebra/idzebra-2.2.0-1bl1.src.patch rename to idzebra/idzebra-2.2.11-1bl1.src.patch index 871b991fb3..32b64ca43d 100644 --- a/idzebra/idzebra-2.2.0-1bl1.src.patch +++ b/idzebra/idzebra-2.2.11-1bl1.src.patch @@ -1,18 +1,32 @@ ---- origsrc/idzebra-2.2.0/index/Makefile.am 2020-04-07 20:57:13.000000000 +0900 -+++ src/idzebra-2.2.0/index/Makefile.am 2020-09-25 09:12:43.501556300 +0900 +--- origsrc/idzebra-2.2.11/examples/oai-pmh/Makefile.am 2026-05-20 15:40:21.000000000 +0000 ++++ src/idzebra-2.2.11/examples/oai-pmh/Makefile.am 2026-11-15 22:30:52.403943200 +0000 +@@ -24,7 +24,8 @@ oaidatadata_DATA = data/debug-record.xml + EXTRA_DIST = $(oaidata_DATA) $(oaiconfdata_DATA) $(oaidatadata_DATA) + + conf/cql2pqf.txt: conf/explain2cqlpqftxt.xsl conf/explain.xml +- xsltproc conf/explain2cqlpqftxt.xsl conf/explain.xml > conf/cql2pqf.txt ++ $(MKDIR_P) conf ++ xsltproc $(srcdir)/conf/explain2cqlpqftxt.xsl $(srcdir)/conf/explain.xml > conf/cql2pqf.txt + + clean: + rm -f tmp/*.mf tmp/*..LCK zebrasrv.pid +--- origsrc/idzebra-2.2.11/index/Makefile.am 2026-05-20 15:40:21.000000000 +0000 ++++ src/idzebra-2.2.11/index/Makefile.am 2026-11-15 22:30:52.405955700 +0000 @@ -21,37 +21,37 @@ tabdatadir = $(datadir)/$(PACKAGE)$(PACK # The shared modules mod_grs_regx_la_SOURCES = mod_grs_regx.c -mod_grs_regx_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version +-mod_grs_regx_la_LADD = $(TCL_LIBS) +mod_grs_regx_la_LDFLAGS = -no-undefined -rpath $(modlibdir) -module -avoid-version - mod_grs_regx_la_LADD = $(TCL_LIBS) ++mod_grs_regx_la_LADD = $(YAZLALIB) $(TCL_LIBS) mod_grs_regx_la_LIBADD = $(zebralib) $(mod_grs_regx_la_LADD) mod_grs_xml_la_SOURCES = mod_grs_xml.c -mod_grs_xml_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version +-mod_grs_xml_la_LADD = $(EXPAT_LIBS) +mod_grs_xml_la_LDFLAGS = -no-undefined -rpath $(modlibdir) -module -avoid-version - mod_grs_xml_la_LADD = $(EXPAT_LIBS) ++mod_grs_xml_la_LADD = $(YAZLALIB) $(EXPAT_LIBS) mod_grs_xml_la_LIBADD = $(zebralib) $(mod_grs_xml_la_LADD) mod_grs_marc_la_SOURCES = mod_grs_marc.c marcomp.c marcomp.h inline.c inline.h @@ -45,14 +59,24 @@ mod_text_la_LADD = $(YAZLALIB) mod_text_la_LIBADD = $(zebralib) $(mod_text_la_LADD) -@@ -77,8 +77,8 @@ EXTRA_libidzebra_2_0_la_SOURCES = \ - lib_LTLIBRARIES = $(zebralib) +@@ -78,7 +78,7 @@ lib_LTLIBRARIES = $(zebralib) libidzebra_2_0_la_DEPENDENCIES = $(STATIC_MODULE_OBJ) $(aux_libs) --libidzebra_2_0_la_LIBADD = $(STATIC_MODULE_OBJ) $(aux_libs) $(STATIC_MODULE_LADD) + libidzebra_2_0_la_LIBADD = $(STATIC_MODULE_OBJ) $(aux_libs) $(STATIC_MODULE_LADD) $(YAZLALIB) -libidzebra_2_0_la_LDFLAGS=-export-dynamic -version-info $(ZEBRALIBS_VERSION_INFO) -+libidzebra_2_0_la_LIBADD = $(STATIC_MODULE_OBJ) $(aux_libs) $(STATIC_MODULE_LADD) $(YAZLIB) +libidzebra_2_0_la_LDFLAGS = -no-undefined -export-dynamic -version-info $(ZEBRALIBS_VERSION_INFO) libidzebra_2_0_la_SOURCES = \ recctrl.c \ recgrs.c \ +--- origsrc/idzebra-2.2.11/index/recctrl.c 2026-05-20 15:40:21.000000000 +0000 ++++ src/idzebra-2.2.11/index/recctrl.c 2026-11-15 22:30:52.405955700 +0000 +@@ -141,7 +141,8 @@ static void load_from_dir(RecTypeClass * + size_t dlen = strlen(de->d_name); + if (dlen >= 5 && + !memcmp(de->d_name, "mod-", 4) && +- !strcmp(de->d_name + dlen - 3, ".so")) ++ (!strcmp(de->d_name + dlen - 3, ".so") || ++ !strcmp(de->d_name + dlen - 4, ".dll"))) + { + void *mod_p, *fl; + char fname[FILENAME_MAX*2+1];