Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package perl-Search-Xapian for openSUSE:Factory checked in at 2022-03-01 17:03:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Search-Xapian (Old) and /work/SRC/openSUSE:Factory/.perl-Search-Xapian.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Search-Xapian" Tue Mar 1 17:03:58 2022 rev:2 rq:958271 version:1.2.25.5 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Search-Xapian/perl-Search-Xapian.changes 2021-11-20 02:40:31.644505505 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Search-Xapian.new.1958/perl-Search-Xapian.changes 2022-03-01 17:04:47.640352948 +0100 @@ -1,0 +2,13 @@ +Mon Feb 28 03:08:04 UTC 2022 - Tina M??ller <[email protected]> + +- updated to 1.2.25.5 + see /usr/share/doc/packages/perl-Search-Xapian/Changes + + 1.2.25.5 Sun Feb 27 23:46:46 UTC 2022 + [Changes contributed by Olly Betts] + - The exception fix in 1.2.25.3 unintentionally broke the build with + xapian-core < 1.4.10. To fix this we now generate the exception + handling code at build time, and enable the new exceptions based on + the version of xapian-core we're building against. + +------------------------------------------------------------------- Old: ---- Search-Xapian-1.2.25.4.tar.gz New: ---- Search-Xapian-1.2.25.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Search-Xapian.spec ++++++ --- /var/tmp/diff_new_pack.PRAa2D/_old 2022-03-01 17:04:48.172353089 +0100 +++ /var/tmp/diff_new_pack.PRAa2D/_new 2022-03-01 17:04:48.176353090 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Search-Xapian # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,15 @@ # +%define cpan_name Search-Xapian Name: perl-Search-Xapian -Version: 1.2.25.4 +Version: 1.2.25.5 Release: 0 -%define cpan_name Search-Xapian -Summary: Perl XS frontend to the Xapian C++ search library License: Artistic-1.0 OR GPL-1.0-or-later -Group: Development/Libraries/Perl +Summary: Perl XS frontend to the Xapian C++ search library URL: https://metacpan.org/release/%{cpan_name} Source0: https://cpan.metacpan.org/authors/id/O/OL/OLLY/%{cpan_name}-%{version}.tar.gz Source1: cpanspec.yml -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Devel::Leak) @@ -56,12 +54,12 @@ at https://xapian.org/lists). %prep -%setup -q -n %{cpan_name}-%{version} +%autosetup -n %{cpan_name}-%{version} find . -type f ! -path "*/t/*" ! -name "*.pl" ! -path "*/bin/*" ! -path "*/script/*" ! -name "configure" -print0 | xargs -0 chmod 644 %build perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" -make %{?_smp_mflags} +%make_build %check make test @@ -72,7 +70,6 @@ %perl_gen_filelist %files -f %{name}.files -%defattr(-,root,root,755) %doc Changes examples README %changelog ++++++ Search-Xapian-1.2.25.4.tar.gz -> Search-Xapian-1.2.25.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/Changes new/Search-Xapian-1.2.25.5/Changes --- old/Search-Xapian-1.2.25.4/Changes 2020-11-20 00:38:02.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/Changes 2022-02-28 00:47:43.000000000 +0100 @@ -1,5 +1,12 @@ Revision history for Perl extension Search::Xapian. +1.2.25.5 Sun Feb 27 23:46:46 UTC 2022 + [Changes contributed by Olly Betts] + - The exception fix in 1.2.25.3 unintentionally broke the build with + xapian-core < 1.4.10. To fix this we now generate the exception + handling code at build time, and enable the new exceptions based on + the version of xapian-core we're building against. + 1.2.25.4 Thu Nov 19 23:37:21 UTC 2020 [Changes contributed by Olly Betts] - Add exception-related files which were new in 1.2.25.3 to MANIFEST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/MANIFEST new/Search-Xapian-1.2.25.5/MANIFEST --- old/Search-Xapian-1.2.25.4/MANIFEST 2020-11-20 00:39:26.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/MANIFEST 2022-02-28 00:49:42.000000000 +0100 @@ -74,7 +74,6 @@ exception_data.pm generate-perl-exceptions -handle_exception.cc Xapian/AssertionError.pm Xapian/DatabaseClosedError.pm Xapian/DatabaseCorruptError.pm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/MANIFEST.SKIP new/Search-Xapian-1.2.25.5/MANIFEST.SKIP --- old/Search-Xapian-1.2.25.4/MANIFEST.SKIP 2018-07-09 05:27:52.000000000 +0200 +++ new/Search-Xapian-1.2.25.5/MANIFEST.SKIP 2020-11-23 05:26:08.000000000 +0100 @@ -21,6 +21,7 @@ Xapian\.c Xapian\.bs Xapian\.lo +handle_exception.cc handle_exception\.lo Search-Xapian-[0-9.]+\.tar\.gz Search-Xapian-[0-9.]+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/META.json new/Search-Xapian-1.2.25.5/META.json --- old/Search-Xapian-1.2.25.4/META.json 2020-11-20 00:39:26.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/META.json 2022-02-28 00:49:42.000000000 +0100 @@ -47,6 +47,6 @@ "web" : "https://git.xapian.org/?p=xapian;a=tree;f=search-xapian;hb=refs/heads/svn/1.2"; } }, - "version" : "v1.2.25.4", - "x_serialization_backend" : "JSON::PP version 4.02" + "version" : "v1.2.25.5", + "x_serialization_backend" : "JSON::PP version 4.06" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/META.yml new/Search-Xapian-1.2.25.5/META.yml --- old/Search-Xapian-1.2.25.4/META.yml 2020-11-20 00:39:26.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/META.yml 2022-02-28 00:49:42.000000000 +0100 @@ -23,5 +23,5 @@ bugtracker: https://trac.xapian.org/ homepage: https://xapian.org/ repository: https://git.xapian.org/?p=xapian;a=tree;f=search-xapian;hb=refs/heads/svn/1.2 -version: v1.2.25.4 +version: v1.2.25.5 x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/Makefile.PL new/Search-Xapian-1.2.25.5/Makefile.PL --- old/Search-Xapian-1.2.25.4/Makefile.PL 2020-11-20 00:19:06.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/Makefile.PL 2020-11-22 07:53:13.000000000 +0100 @@ -130,6 +130,9 @@ ); } +system($^X, "generate-perl-exceptions", ".", $xver) == 0 + or die "Running generate-perl-exceptions failed: $?"; + # Filter out some gcc options which g++ doesn't support. my $CCFLAGS = $Config{'ccflags'}; # Perl is built with -Wdeclaration-after-statement on RHEL5 - this isn't diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/README new/Search-Xapian-1.2.25.5/README --- old/Search-Xapian-1.2.25.4/README 2020-11-20 00:38:12.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/README 2020-11-23 05:26:48.000000000 +0100 @@ -1,4 +1,4 @@ -Search::Xapian version 1.2.25.4 +Search::Xapian version 1.2.25.5 =============================== This is Search::Xapian, a Perl XS interface to the Xapian C++ search library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/XS/DatabaseError.xs new/Search-Xapian-1.2.25.5/XS/DatabaseError.xs --- old/Search-Xapian-1.2.25.4/XS/DatabaseError.xs 2020-11-17 00:42:18.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/XS/DatabaseError.xs 2022-02-28 00:34:07.000000000 +0100 @@ -22,4 +22,3 @@ INCLUDE: XS/DatabaseLockError.xs INCLUDE: XS/DatabaseModifiedError.xs INCLUDE: XS/DatabaseOpeningError.xs -INCLUDE: XS/DatabaseClosedError.xs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/XS/DatabaseOpeningError.xs new/Search-Xapian-1.2.25.5/XS/DatabaseOpeningError.xs --- old/Search-Xapian-1.2.25.4/XS/DatabaseOpeningError.xs 2020-11-17 00:42:18.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/XS/DatabaseOpeningError.xs 2022-02-28 00:34:07.000000000 +0100 @@ -18,4 +18,3 @@ DatabaseOpeningError::DESTROY() INCLUDE: XS/DatabaseVersionError.xs -INCLUDE: XS/DatabaseNotFoundError.xs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/Xapian/DatabaseError.pm new/Search-Xapian-1.2.25.5/Xapian/DatabaseError.pm --- old/Search-Xapian-1.2.25.4/Xapian/DatabaseError.pm 2020-11-17 00:42:18.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/Xapian/DatabaseError.pm 2022-02-28 00:34:07.000000000 +0100 @@ -25,7 +25,6 @@ use Search::Xapian::DatabaseLockError; use Search::Xapian::DatabaseModifiedError; use Search::Xapian::DatabaseOpeningError; -use Search::Xapian::DatabaseClosedError; our @ISA = qw(DynaLoader Search::Xapian::RuntimeError); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/Xapian/DatabaseOpeningError.pm new/Search-Xapian-1.2.25.5/Xapian/DatabaseOpeningError.pm --- old/Search-Xapian-1.2.25.4/Xapian/DatabaseOpeningError.pm 2020-11-17 00:42:18.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/Xapian/DatabaseOpeningError.pm 2022-02-28 00:34:07.000000000 +0100 @@ -21,7 +21,6 @@ use overload '""' => sub { "Exception: ".$_[0]->get_msg }; use Search::Xapian::DatabaseVersionError; -use Search::Xapian::DatabaseNotFoundError; our @ISA = qw(DynaLoader Search::Xapian::DatabaseError); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/Xapian.pm new/Search-Xapian-1.2.25.5/Xapian.pm --- old/Search-Xapian-1.2.25.4/Xapian.pm 2020-11-20 00:38:32.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/Xapian.pm 2020-11-23 05:28:08.000000000 +0100 @@ -4,7 +4,7 @@ use strict; use warnings; -our $VERSION = '1.2.25.4'; +our $VERSION = '1.2.25.5'; use Exporter 'import'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/exception_data.pm new/Search-Xapian-1.2.25.5/exception_data.pm --- old/Search-Xapian-1.2.25.4/exception_data.pm 2020-11-17 01:17:05.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/exception_data.pm 2020-11-22 07:53:00.000000000 +0100 @@ -183,17 +183,17 @@ */ DOC -errorclass('WildcardError', 'RuntimeError', <<'DOC'); +$::version >= 1003003 and errorclass('WildcardError', 'RuntimeError', <<'DOC'); /** WildcardError indicates an error expanding a wildcarded query. */ DOC -errorclass('DatabaseNotFoundError', 'DatabaseOpeningError', <<'DOC'); +$::version >= 1004010 and errorclass('DatabaseNotFoundError', 'DatabaseOpeningError', <<'DOC'); /** Indicates an attempt to access a database not present. */ DOC -errorclass('DatabaseClosedError', 'DatabaseError', <<'DOC'); +$::version >= 1004010 and errorclass('DatabaseClosedError', 'DatabaseError', <<'DOC'); /** Indicates an attempt to access a closed database. */ DOC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/generate-perl-exceptions new/Search-Xapian-1.2.25.5/generate-perl-exceptions --- old/Search-Xapian-1.2.25.4/generate-perl-exceptions 2020-11-17 01:17:05.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/generate-perl-exceptions 2020-11-22 07:52:33.000000000 +0100 @@ -7,12 +7,20 @@ BEGIN { my $dir = shift || '.'; if ($dir eq '--help') { - print "Syntax: $0 [<path to srcdir>]\n\n"; + print "Syntax: $0 [<path to srcdir> [<xapian version>]\n\n"; print "This script needs to know the source directory to find\n"; print "exception_data.pm - by default it looks in '.'.\n"; exit 0; } push(@INC, $dir); + + $::version = shift || ''; + if ($::version =~ /^(\d+)\.(\d+)\,(\d+)/) { + $::version = $1 * 1000000 + $2 * 1000 + $3; + } else { + # Assume 1.4.x if not specified. + $::version = 1004000; + } } # We load the exception data from xapian-core. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/handle_exception.cc new/Search-Xapian-1.2.25.5/handle_exception.cc --- old/Search-Xapian-1.2.25.4/handle_exception.cc 2020-11-17 00:42:18.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/handle_exception.cc 1970-01-01 01:00:00.000000000 +0100 @@ -1,110 +0,0 @@ -#include <xapian.h> - -extern "C" { -#include "EXTERN.h" -#include "perl.h" -#include "XSUB.h" -} - -/* handle_exception function - * - * called in catch blocks to croak or rethrow in perl land - */ - -void handle_exception(void) { - try { - throw; - } catch (const Xapian::DatabaseClosedError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::DatabaseClosedError", (void *) new Xapian::DatabaseClosedError(error)); - croak(Nullch); - } catch (const Xapian::DatabaseNotFoundError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::DatabaseNotFoundError", (void *) new Xapian::DatabaseNotFoundError(error)); - croak(Nullch); - } catch (const Xapian::WildcardError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::WildcardError", (void *) new Xapian::WildcardError(error)); - croak(Nullch); - } catch (const Xapian::RangeError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::RangeError", (void *) new Xapian::RangeError(error)); - croak(Nullch); - } catch (const Xapian::SerialisationError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::SerialisationError", (void *) new Xapian::SerialisationError(error)); - croak(Nullch); - } catch (const Xapian::QueryParserError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::QueryParserError", (void *) new Xapian::QueryParserError(error)); - croak(Nullch); - } catch (const Xapian::NetworkTimeoutError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::NetworkTimeoutError", (void *) new Xapian::NetworkTimeoutError(error)); - croak(Nullch); - } catch (const Xapian::NetworkError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::NetworkError", (void *) new Xapian::NetworkError(error)); - croak(Nullch); - } catch (const Xapian::InternalError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::InternalError", (void *) new Xapian::InternalError(error)); - croak(Nullch); - } catch (const Xapian::FeatureUnavailableError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::FeatureUnavailableError", (void *) new Xapian::FeatureUnavailableError(error)); - croak(Nullch); - } catch (const Xapian::DocNotFoundError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::DocNotFoundError", (void *) new Xapian::DocNotFoundError(error)); - croak(Nullch); - } catch (const Xapian::DatabaseVersionError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::DatabaseVersionError", (void *) new Xapian::DatabaseVersionError(error)); - croak(Nullch); - } catch (const Xapian::DatabaseOpeningError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::DatabaseOpeningError", (void *) new Xapian::DatabaseOpeningError(error)); - croak(Nullch); - } catch (const Xapian::DatabaseModifiedError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::DatabaseModifiedError", (void *) new Xapian::DatabaseModifiedError(error)); - croak(Nullch); - } catch (const Xapian::DatabaseLockError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::DatabaseLockError", (void *) new Xapian::DatabaseLockError(error)); - croak(Nullch); - } catch (const Xapian::DatabaseCreateError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::DatabaseCreateError", (void *) new Xapian::DatabaseCreateError(error)); - croak(Nullch); - } catch (const Xapian::DatabaseCorruptError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::DatabaseCorruptError", (void *) new Xapian::DatabaseCorruptError(error)); - croak(Nullch); - } catch (const Xapian::DatabaseError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::DatabaseError", (void *) new Xapian::DatabaseError(error)); - croak(Nullch); - } catch (const Xapian::UnimplementedError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::UnimplementedError", (void *) new Xapian::UnimplementedError(error)); - croak(Nullch); - } catch (const Xapian::InvalidOperationError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::InvalidOperationError", (void *) new Xapian::InvalidOperationError(error)); - croak(Nullch); - } catch (const Xapian::InvalidArgumentError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::InvalidArgumentError", (void *) new Xapian::InvalidArgumentError(error)); - croak(Nullch); - } catch (const Xapian::AssertionError & error) { - SV * errsv = get_sv("@", TRUE); - sv_setref_pv(errsv, "Search::Xapian::AssertionError", (void *) new Xapian::AssertionError(error)); - croak(Nullch); - } catch (const std::exception & error) { - croak( "std::exception: %s", error.what()); - } catch (...) { - croak("something terrible happened"); - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Search-Xapian-1.2.25.4/typemap-errorclasses new/Search-Xapian-1.2.25.5/typemap-errorclasses --- old/Search-Xapian-1.2.25.4/typemap-errorclasses 2020-11-17 00:42:18.000000000 +0100 +++ new/Search-Xapian-1.2.25.5/typemap-errorclasses 2022-02-28 00:34:07.000000000 +0100 @@ -42,7 +42,3 @@ RangeError * O_OBJECT WildcardError O_OBJECT WildcardError * O_OBJECT -DatabaseNotFoundError O_OBJECT -DatabaseNotFoundError * O_OBJECT -DatabaseClosedError O_OBJECT -DatabaseClosedError * O_OBJECT
