- openSUSE Commits

commit perl-Prima for openSUSE:Factory
by Source-Sync 28 Apr '21

28 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package perl-Prima for openSUSE:Factory checked in at 2021-04-29 01:37:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Prima (Old) and /work/SRC/openSUSE:Factory/.perl-Prima.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Prima" Thu Apr 29 01:37:41 2021 rev:42 rq:888194 version:1.61 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Prima/perl-Prima.changes 2020-11-03 15:17:28.216092274 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Prima.new.12324/perl-Prima.changes 2021-04-29 01:38:32.454590388 +0200 @@ -1,0 +2,15 @@ +Sat Apr 24 03:09:35 UTC 2021 - Tina M��ller <timueller+perl(a)suse.de> + +- updated to 1.61 + see /usr/share/doc/packages/perl-Prima/Changes + + 1.61 2021-04-21 + - DWM API Removed (not useful on Windows 10) + - Support regions and paths for the PS backend + - Prima::XXXDialog classes finally moved to Prima::XXX::Dialog + - Support unicode-aware filesystem functions + -- Prima::Utils extended and Prima::sys::FS added + -- Do not use libX11.XReadBitmapFileData as it is not unicode-aware + - Add Application.stop to break from a running event loop + +------------------------------------------------------------------- Old: ---- Prima-1.60.tar.gz New: ---- Prima-1.61.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Prima.spec ++++++ --- /var/tmp/diff_new_pack.cqJNmj/_old 2021-04-29 01:38:32.854590955 +0200 +++ /var/tmp/diff_new_pack.cqJNmj/_new 2021-04-29 01:38:32.858590960 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Prima # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +16,16 @@ # +%define cpan_name Prima Name: perl-Prima -Version: 1.60 +Version: 1.61 Release: 0 #Upstream: SUSE-Public-Domain -%define cpan_name Prima Summary: Perl graphic toolkit License: BSD-2-Clause AND AGPL-3.0-only -Group: Development/Libraries/Perl URL: https://metacpan.org/release/%{cpan_name} Source0: https://cpan.metacpan.org/authors/id/K/KA/KARASIK/%{cpan_name}-%{version}.t… Source1: cpanspec.yml -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros %{perl_requires} @@ -52,11 +50,11 @@ perl and communicating with the system using Prima library calls. %prep -%setup -q -n %{cpan_name}-%{version} +%autosetup -n %{cpan_name}-%{version} %build perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" -make %{?_smp_mflags} +%make_build %check make test @@ -74,7 +72,6 @@ %perl_gen_filelist %files -f %{name}.files -%defattr(-,root,root,755) %doc AGPLv3 Changes examples README.md %license Copying LICENSE ++++++ Prima-1.60.tar.gz -> Prima-1.61.tar.gz ++++++ ++++ 444191 lines of diff (skipped)

1 0

commit perl-File-ReadBackwards for openSUSE:Factory
by Source-Sync 28 Apr '21

28 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package perl-File-ReadBackwards for openSUSE:Factory checked in at 2021-04-29 01:37:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-File-ReadBackwards (Old) and /work/SRC/openSUSE:Factory/.perl-File-ReadBackwards.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-File-ReadBackwards" Thu Apr 29 01:37:40 2021 rev:6 rq:888192 version:1.06 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-File-ReadBackwards/perl-File-ReadBackwards.changes 2011-12-25 17:38:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-File-ReadBackwards.new.12324/perl-File-ReadBackwards.changes 2021-04-29 01:38:31.314588772 +0200 @@ -1,0 +2,14 @@ +Sat Apr 24 03:06:48 UTC 2021 - Tina M��ller <timueller+perl(a)suse.de> + +- updated to 1.06 + see /usr/share/doc/packages/perl-File-ReadBackwards/Changes + + 1.06 + - Drop support for Perls prior to 5.6 + - Fix bug in tests that fail could fail with parallel build + (rt#92313, HAARG++) + - Fixed typo in documentation (rt#90009, dsteinbrunner++) + - Incidentally fixed compatability with Perls that do not have `.` in @INC + (rt#121002) + +------------------------------------------------------------------- Old: ---- File-ReadBackwards-1.05.tar.gz New: ---- File-ReadBackwards-1.06.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-File-ReadBackwards.spec ++++++ --- /var/tmp/diff_new_pack.VhBN6T/_old 2021-04-29 01:38:31.774589424 +0200 +++ /var/tmp/diff_new_pack.VhBN6T/_new 2021-04-29 01:38:31.774589424 +0200 @@ -1,8 +1,7 @@ -# vim: set sw=4 ts=4 et nu: # # spec file for package perl-File-ReadBackwards # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,57 +12,51 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + + +%define cpan_name File-ReadBackwards Name: perl-File-ReadBackwards -Version: 1.05 +Version: 1.06 Release: 0 Summary: Read a file backwards by lines -License: Artistic-1.0 or GPL-1.0+ -Group: Development/Libraries/Perl -Source: http://search.cpan.org/CPAN/authors/id/U/UR/URI/File-ReadBackwards-%{versio… -Url: http://search.cpan.org/dist/File-ReadBackwards -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} -BuildRequires: make +License: Artistic-1.0 OR GPL-1.0-or-later +URL: https://metacpan.org/release/%{cpan_name} +Source0: https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/%{cpan_name}-%{version}.… +Source1: cpanspec.yml +BuildArch: noarch BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(ExtUtils::MakeMaker) +%{perl_requires} %description -This module reads a file backwards line by line. It is simple to use, memory -efficient and fast. It supports both an object and a tied handle interface. - -It is intended for processing log and other similar text files which typically -have their newest entries appended to them. By default files are assumed to be -plain text and have a line ending appropriate to the OS. But you can set the -input record separator string on a per file basis. +This module reads a file backwards line by line. It is simple to use, +memory efficient and fast. It supports both an object and a tied handle +interface. + +It is intended for processing log and other similar text files which +typically have their newest entries appended to them. By default files are +assumed to be plain text and have a line ending appropriate to the OS. But +you can set the input record separator string on a per file basis. %prep -%setup -q -n "File-ReadBackwards-%{version}" -%__sed -i '/^auto_install/d' Makefile.PL +%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 PREFIX="%{_prefix}" -%__make %{?jobs:-j%{jobs}} +perl Makefile.PL INSTALLDIRS=vendor +%make_build + +%check +make test %install %perl_make_install %perl_process_packlist +%perl_gen_filelist -%check -%__make test - -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} - -%files -%defattr(-,root,root) +%files -f %{name}.files %doc Changes README -%dir %{perl_vendorlib}/File -%{perl_vendorlib}/File/ReadBackwards.pm -%dir %{perl_vendorarch}/auto/File -%{perl_vendorarch}/auto/File/ReadBackwards -%doc %{perl_man3dir}/File::ReadBackwards.%{perl_man3ext}%{ext_man} %changelog ++++++ File-ReadBackwards-1.05.tar.gz -> File-ReadBackwards-1.06.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-ReadBackwards-1.05/Changes new/File-ReadBackwards-1.06/Changes --- old/File-ReadBackwards-1.05/Changes 2011-06-04 08:26:21.000000000 +0200 +++ new/File-ReadBackwards-1.06/Changes 2021-04-23 04:57:24.000000000 +0200 @@ -1,5 +1,13 @@ Revision history for Perl extension File::ReadBackwards. +1.06 + - Drop support for Perls prior to 5.6 + - Fix bug in tests that fail could fail with parallel build + (rt#92313, HAARG++) + - Fixed typo in documentation (rt#90009, dsteinbrunner++) + - Incidentally fixed compatability with Perls that do not have `.` in @INC + (rt#121002) + 1.05 Sat Jun 4 02:24:35 EDT 2011 reordered Changes to be recent at the top rewritten t/large_file.t to skip non-sparse file systems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-ReadBackwards-1.05/MANIFEST new/File-ReadBackwards-1.06/MANIFEST --- old/File-ReadBackwards-1.05/MANIFEST 2005-05-06 00:54:08.000000000 +0200 +++ new/File-ReadBackwards-1.06/MANIFEST 2021-04-23 04:57:52.000000000 +0200 @@ -6,3 +6,4 @@ t/bw.t t/large_file.t META.yml Module meta-data (added by MakeMaker) +META.json Module JSON meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-ReadBackwards-1.05/META.json new/File-ReadBackwards-1.06/META.json --- old/File-ReadBackwards-1.05/META.json 1970-01-01 01:00:00.000000000 +0100 +++ new/File-ReadBackwards-1.06/META.json 2021-04-23 04:57:52.000000000 +0200 @@ -0,0 +1,48 @@ +{ + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 1, + "generated_by" : "ExtUtils::MakeMaker version 7.62, CPAN::Meta::Converter version 2.150010", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : 2 + }, + "name" : "File-ReadBackwards", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + } + }, + "release_status" : "stable", + "resources" : { + "bugtracker" : { + "web" : "https://github.com/uperl/File-ReadBackwards/issues" + }, + "homepage" : "https://metacpan.org/pod/File::ReadBackwards", + "repository" : { + "type" : "git", + "url" : "https://github.com/uperl/File-ReadBackwards.git", + "web" : "https://github.com/uperl/File-ReadBackwards" + } + }, + "version" : "1.06", + "x_serialization_backend" : "JSON::PP version 4.06" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-ReadBackwards-1.05/META.yml new/File-ReadBackwards-1.06/META.yml --- old/File-ReadBackwards-1.05/META.yml 2011-06-07 10:07:13.000000000 +0200 +++ new/File-ReadBackwards-1.06/META.yml 2021-04-23 04:57:52.000000000 +0200 @@ -1,12 +1,25 @@ ---- #YAML:1.0 -name: File-ReadBackwards -version: 1.05 -abstract: ~ -license: ~ -author: ~ -generated_by: ExtUtils::MakeMaker version 6.42 -distribution_type: module -requires: +--- +abstract: unknown +author: + - unknown +build_requires: + ExtUtils::MakeMaker: '0' +configure_requires: + ExtUtils::MakeMaker: '0' +dynamic_config: 1 +generated_by: 'ExtUtils::MakeMaker version 7.62, CPAN::Meta::Converter version 2.150010' +license: unknown meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.3.html - version: 1.3 + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: '1.4' +name: File-ReadBackwards +no_index: + directory: + - t + - inc +resources: + bugtracker: https://github.com/uperl/File-ReadBackwards/issues + homepage: https://metacpan.org/pod/File::ReadBackwards + repository: https://github.com/uperl/File-ReadBackwards.git +version: '1.06' +x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-ReadBackwards-1.05/Makefile.PL new/File-ReadBackwards-1.06/Makefile.PL --- old/File-ReadBackwards-1.05/Makefile.PL 2003-08-18 07:36:25.000000000 +0200 +++ new/File-ReadBackwards-1.06/Makefile.PL 2021-04-23 04:50:55.000000000 +0200 @@ -4,4 +4,21 @@ WriteMakefile( 'NAME' => 'File::ReadBackwards', 'VERSION_FROM' => 'ReadBackwards.pm', # finds $VERSION + + META_MERGE => { + 'meta-spec' => { version => 2 }, + resources => { + bugtracker => { + web => 'https://github.com/uperl/File-ReadBackwards/issues', + }, + homepage => 'https://metacpan.org/pod/File::ReadBackwards', + repository => { + type => 'git', + url => 'https://github.com/uperl/File-ReadBackwards.git', + web => 'https://github.com/uperl/File-ReadBackwards', + }, + }, + }, + + clean => { FILES => 'File-ReadBackwards-*' }, ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-ReadBackwards-1.05/README new/File-ReadBackwards-1.06/README --- old/File-ReadBackwards-1.05/README 2003-08-18 07:43:51.000000000 +0200 +++ new/File-ReadBackwards-1.06/README 2021-04-23 04:42:44.000000000 +0200 @@ -13,7 +13,7 @@ PREREQUISITES -There are no prerequisite modules. +Perl 5.005 or better. There are no prerequisite modules. INSTALLATION @@ -31,25 +31,23 @@ the normal documentation directories on your system. An HTML version of the documentation is at: - http://www.sysarch.com/perl/modules/File-ReadBackwards.html + https://metacpan.org/pod/File::ReadBackwards SUPPORT -If you have any questions, bug reports or feedback, email it to +If you have any questions, bug reports or feedback, please open a ticket +on the project GitHub: - uri(a)sysarch.com + https://github.com/uperl/File-ReadBackwards/issues AVAILABILITY The latest version of File::ReadBackwards.pm will always be available in -this directory: - - http://www.sysarch.com/perl/modules - +on CPAN. COPYRIGHT -(C) 2000 Uri Guttman. All rights reserved. +(C) 2000-2021 Uri Guttman. All rights reserved. This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-ReadBackwards-1.05/ReadBackwards.pm new/File-ReadBackwards-1.06/ReadBackwards.pm --- old/File-ReadBackwards-1.05/ReadBackwards.pm 2011-06-04 08:22:08.000000000 +0200 +++ new/File-ReadBackwards-1.06/ReadBackwards.pm 2021-04-23 04:51:42.000000000 +0200 @@ -1,20 +1,17 @@ # File::ReadBackwards.pm -# Copyright (C) 2003 by Uri Guttman. All rights reserved. +# Copyright (C) 2000-2021 by Uri Guttman. All rights reserved. # mail bugs, comments and feedback to uri(a)stemsystems.com package File::ReadBackwards ; use strict ; - -use vars qw( $VERSION ) ; - -$VERSION = '1.05' ; - use Symbol ; use Fcntl qw( :seek O_RDONLY ) ; use Carp ; +our $VERSION = '1.06' ; + my $max_read_size = 1 << 13 ; my $default_rec_sep ; @@ -227,7 +224,6 @@ =head1 NAME File::ReadBackwards.pm -- Read a file backwards by lines. - =head1 SYNOPSIS @@ -258,7 +254,6 @@ } =head1 DESCRIPTION - This module reads a file backwards line by line. It is simple to use, memory efficient and fast. It supports both an object and a tied handle @@ -270,11 +265,9 @@ OS. But you can set the input record separator string on a per file basis. - =head1 OBJECT INTERFACE - -These are the methods in C<File::ReadBackwards>' object interface: +These are the methods in C<File::ReadBackwards>' object interface: =head2 new( $file, [$rec_sep], [$sep_is_regex] ) @@ -292,7 +285,7 @@ =head2 getline C<getline> is an alias for the readline method. It is here for -compatibilty with the IO::* classes which has a getline method. +compatibility with the IO::* classes which has a getline method. =head2 eof @@ -323,7 +316,6 @@ =head1 TIED HANDLE INTERFACE =head2 tie( *HANDLE, 'File::ReadBackwards', $file, [$rec_sep], [$sep_is_regex] ) - The TIEHANDLE, READLINE, EOF, CLOSE and TELL methods are aliased to the new, readline, eof, close and tell methods respectively so refer @@ -335,7 +327,6 @@ unsupported operations on the tied handle. =head1 LINE AND RECORD ENDINGS - Since this module needs to use low level I/O for efficiency, it can't portably seek and do block I/O without managing line ending conversions. @@ -367,9 +358,7 @@ line (no newline) it will be the first line returned and lines larger than the read buffer size are handled properly. - =head1 NOTES - There is no support for list context in either the object or tied interfaces. If you want to slurp all of the lines into an array in @@ -381,14 +370,14 @@ a file to the beginning. =head1 AUTHOR - -Uri Guttman, uri(a)stemsystems.com +Original author: Uri Guttman, C<< uri(a)stemsystems.com >> + +Current maintainer: Graham Ollis C<< plicease(a)cpan.org >> =head1 COPYRIGHT - -Copyright (C) 2003 by Uri Guttman. All rights reserved. This program is +Copyright (C) 2000-2021 by Uri Guttman. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-ReadBackwards-1.05/t/bw.t new/File-ReadBackwards-1.06/t/bw.t --- old/File-ReadBackwards-1.05/t/bw.t 2005-05-05 07:09:50.000000000 +0200 +++ new/File-ReadBackwards-1.06/t/bw.t 2021-04-23 04:42:44.000000000 +0200 @@ -1,14 +1,16 @@ #!/usr/local/bin/perl -ws use strict ; +use warnings ; use Test::More ; use Fcntl qw( :seek ) ; use File::ReadBackwards ; use Carp ; +use File::Temp qw( tempfile ); -use vars qw( $opt_v ) ; +our $opt_v ; -my $file = 'bw.data' ; +my (undef, $file) = tempfile('bw-XXXXXX', SUFFIX => '.data', TMPDIR => 1, CLEANUP => 1); my $is_crlf = ( $^O =~ /win32/i || $^O =~ /vms/i ) ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-ReadBackwards-1.05/t/large_file.t new/File-ReadBackwards-1.06/t/large_file.t --- old/File-ReadBackwards-1.05/t/large_file.t 2011-06-04 08:35:27.000000000 +0200 +++ new/File-ReadBackwards-1.06/t/large_file.t 2021-04-23 04:42:44.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/local/bin/perl -ws use strict ; - +use warnings ; use Carp ; use Config ; use Fcntl qw( :seek ) ; @@ -13,7 +13,7 @@ # NOTE: much of this code was taken from the core perl test script # ops/lfs.t. it was modified to test File::ReadBackwards and large files -my $test_file = 'bw.data' ; +my (undef, $test_file) = tempfile('bw-XXXXXX', SUFFIX => '.data', TMPDIR => 1, CLEANUP => 1); my @test_lines = ( "3rd from last line\n", ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #description: |- # override description from CPAN #summary: override summary from CPAN #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: # baz.patch: PATCH-FIX-OPENSUSE #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_build: |- # rm unused.files #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: |- #./Build build flags=%{?_smp_mflags} --myflag #custom_test: |- #startserver && make test #ignore_requires: Bizarre::Module #skip_doc: regexp_to_skip_for_doc.* #add_doc: files to add to docs #misc: |- #anything else to be added to spec file #follows directly after %files section, so it can contain new blocks or also #changes to %files section

1 0

commit ocaml-parmap for openSUSE:Factory
by Source-Sync 28 Apr '21

28 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-parmap for openSUSE:Factory checked in at 2021-04-29 01:37:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-parmap (Old) and /work/SRC/openSUSE:Factory/.ocaml-parmap.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ocaml-parmap" Thu Apr 29 01:37:39 2021 rev:9 rq:888344 version:20210423.2800b78 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-parmap/ocaml-parmap.changes 2020-03-09 14:13:35.406514745 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-parmap.new.12324/ocaml-parmap.changes 2021-04-29 01:38:29.086585614 +0200 @@ -1,0 +2,7 @@ +Sun Apr 25 22:22:22 UTC 2021 - ohering(a)suse.de + +- Update to version 20210423.2800b78 + avoid corruption on 32bit architectures + add support for returning results in the right order + +------------------------------------------------------------------- Old: ---- ocaml-parmap-20200124.526acc4.tar.xz New: ---- ocaml-parmap-20210423.2800b78.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-parmap.spec ++++++ --- /var/tmp/diff_new_pack.I3poOT/_old 2021-04-29 01:38:29.498586198 +0200 +++ /var/tmp/diff_new_pack.I3poOT/_new 2021-04-29 01:38:29.502586203 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-parmap # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,17 @@ Name: ocaml-parmap -Version: 20200124.526acc4 +Version: 20210423.2800b78 Release: 0 %{?ocaml_preserve_bytecode} Summary: Multicore architecture exploitation for OCaml programs with minimal modifications License: LGPL-2.0-only Group: Development/Languages/OCaml -URL: http://rdicosmo.github.io/parmap/ -Source: %{name}-%{version}.tar.xz +URL: https://opam.ocaml.org/packages/parmap +Source0: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20200220 +BuildRequires: ocaml-rpm-macros >= 20210409 BuildRequires: ocamlfind(bigarray) BuildRequires: ocamlfind(dune.configurator) BuildRequires: ocamlfind(graphics) @@ -57,6 +57,10 @@ %autosetup -p1 %build +sed -i~ ' +s@10000000@1000000@ +' tests/simplescale.ml +diff -u "$_"~ "$_" && exit 1 dune_release_pkgs='parmap' %ocaml_dune_setup %ocaml_dune_build @@ -66,11 +70,7 @@ %ocaml_create_file_list %check -test -x "$(type -P ocamlc.opt)" || exit 0 OCAML_DUNE_RUNTEST_ARGS="-j 1" -%if "%{_lib}" == "lib" -dune_test_tolerate_fail='dune_test_tolerate_fail Array.make' -%endif export nData=$((1000 * 10)) export nProcs=2 %ocaml_dune_test ++++++ _service ++++++ --- /var/tmp/diff_new_pack.I3poOT/_old 2021-04-29 01:38:29.546586266 +0200 +++ /var/tmp/diff_new_pack.I3poOT/_new 2021-04-29 01:38:29.550586272 +0200 @@ -1,8 +1,9 @@ <services> <service name="tar_scm" mode="disabled"> <param name="filename">ocaml-parmap</param> - <param name="revision">526acc4d2dd0f8949dfd53fa1ff015307c970899</param> + <param name="revision">2800b78e9e10ffffafc3cbb0ffaed646ab71cc6a</param> <param name="scm">git</param> + <param name="submodules">disable</param> <param name="url">https://github.com/rdicosmo/parmap.git</param> <param name="versionformat">%cd.%h</param> </service> ++++++ ocaml-parmap-20200124.526acc4.tar.xz -> ocaml-parmap-20210423.2800b78.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-parmap-20200124.526acc4/CHANGES new/ocaml-parmap-20210423.2800b78/CHANGES --- old/ocaml-parmap-20200124.526acc4/CHANGES 2020-01-24 15:22:21.000000000 +0100 +++ new/ocaml-parmap-20210423.2800b78/CHANGES 2021-04-23 12:12:28.000000000 +0200 @@ -1,3 +1,10 @@ +2021/01/09 (RDC) + Major enhancement: add support for returning results in the right order from + the calls to parmap/parmapi/array_parmap/array_parmapi even when the + chunksize parameter is used. This can be accomplished using the keeporder + parameter. + Documentation, tests and functions parameters updated accordingly. + 2020/01/23 (RDC) Integrated major rewriting of the build system, moving to dune; dropped compatibility with pre-4.02 OCaml versions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-parmap-20200124.526acc4/README.md new/ocaml-parmap-20210423.2800b78/README.md --- old/ocaml-parmap-20200124.526acc4/README.md 2020-01-24 15:22:21.000000000 +0100 +++ new/ocaml-parmap-20210423.2800b78/README.md 2021-04-23 12:12:28.000000000 +0200 @@ -65,16 +65,28 @@ If the number of chunks is equal to the number of cores, it is easy to preserve the order of the elements of the sequence passed to the map/fold operations, so the result will be a list with the same order as if the sequential function would -be applied to the input. This is what the `parmap`, `parmafold` and `parfold` functions +be applied to the input. This is what the `parmap`, `parmapfold` and `parfold` functions do when the chunksize argument is not used. If the user specifies a chunksize that is different from the number of cores, -there is no general way to preserve the ordering, so the result of calling -`Parmap.parmap f l` are not necessarily in the same order as `List.map f l`. - -In general, using little chunksize helps in balancing the load among the workers, -and provides better speed, at the price of losing the ordering: there is a -tradeoff, and it is up to the user to choose the solution that better suits him/her. +the current implementation for `parmap`, `parmapi`, `array_parmap` and +`array_parmapi` by default does not guarantee the preservation of the order +of the results. If the `keeporder` parameter is set to true, an alternative +implementation is used, that tags the chunks and reorders them at the end, so the result of +calling `Parmap.parmap f l` is the same as `List.map f l`. Depending on the +nature of your workload (in particular, number of chunks and size of the results), +this may be way more efficient than implementing a sorting mechanism yourself, but +may also end up using up to twice the space and time of the default implementation: +there is a tradeoff, and it is up to the user to choose the solution that better suits him/her. + +No reordering logic is implemented for `parmapfold`, `parfold` and their +variants, as performing these operations in parallel only make sense if the +order is irrelevant. + +In general, using little chunksize helps in balancing the load among the +workers, and provides better speed, but incurs a little overhead for tagging and +reordering the chunks: there is a tradeoff, and it is up to the user to choose +the solution that better suits him/her. ## Fast map on arrays and on float arrays @@ -103,7 +115,7 @@ - : float = 0.0501301288604736328 ``` - 2. create a shared memory area , + 2. create a shared memory area, 3. possibly copy the result array to the shared memory area, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-parmap-20200124.526acc4/config/discover.ml new/ocaml-parmap-20210423.2800b78/config/discover.ml --- old/ocaml-parmap-20200124.526acc4/config/discover.ml 2020-01-24 15:22:21.000000000 +0100 +++ new/ocaml-parmap-20210423.2800b78/config/discover.ml 2021-04-23 12:12:28.000000000 +0200 @@ -27,7 +27,6 @@ let ml_file = "parmap_compat.ml" in let pre_406 = [ "let map_file = Bigarray.Genarray.map_file" ] in let ml_code = match C.ocaml_config_var_exn c "version" with - | "4.02.3" -> pre_406 | "4.03.0" -> pre_406 | "4.04.0" -> pre_406 | "4.04.1" -> pre_406 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-parmap-20200124.526acc4/dune-project new/ocaml-parmap-20210423.2800b78/dune-project --- old/ocaml-parmap-20200124.526acc4/dune-project 2020-01-24 15:22:21.000000000 +0100 +++ new/ocaml-parmap-20210423.2800b78/dune-project 2021-04-23 12:12:28.000000000 +0200 @@ -27,4 +27,4 @@ base-bigarray base-unix (ocaml - (>= 4.02.3)))) + (>= 4.03.0)))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-parmap-20200124.526acc4/parmap.opam new/ocaml-parmap-20210423.2800b78/parmap.opam --- old/ocaml-parmap-20200124.526acc4/parmap.opam 2020-01-24 15:22:21.000000000 +0100 +++ new/ocaml-parmap-20210423.2800b78/parmap.opam 2021-04-23 12:12:28.000000000 +0200 @@ -26,5 +26,5 @@ "dune-configurator" "base-bigarray" "base-unix" - "ocaml" {>= "4.02.3"} + "ocaml" {>= "4.03.0"} ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-parmap-20200124.526acc4/src/bytearray.ml new/ocaml-parmap-20210423.2800b78/src/bytearray.ml --- old/ocaml-parmap-20200124.526acc4/src/bytearray.ml 2020-01-24 15:22:21.000000000 +0100 +++ new/ocaml-parmap-20210423.2800b78/src/bytearray.ml 2021-04-23 12:12:28.000000000 +0200 @@ -113,7 +113,7 @@ = "ml_blit_bigarray_to_floatarray" [@@noalloc] let to_floatarray a l = - let fa = Obj.obj (Obj.new_block Obj.double_array_tag l) in + let fa = Array.create_float l in unsafe_blit_to_floatarray a 0 fa 0 l; fa diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-parmap-20200124.526acc4/src/bytearray_stubs.c new/ocaml-parmap-20210423.2800b78/src/bytearray_stubs.c --- old/ocaml-parmap-20200124.526acc4/src/bytearray_stubs.c 2020-01-24 15:22:21.000000000 +0100 +++ new/ocaml-parmap-20210423.2800b78/src/bytearray_stubs.c 2021-04-23 12:12:28.000000000 +0200 @@ -37,7 +37,7 @@ CAMLprim value ml_blit_string_to_bigarray (value s, value i, value a, value j, value l) { - char *src = String_val(s) + Int_val(i); + const char *src = String_val(s) + Int_val(i); char *dest = Array_data(Bigarray_val(a), j); memcpy(dest, src, Long_val(l)); return Val_unit; @@ -47,7 +47,7 @@ (value a, value i, value s, value j, value l) { char *src = Array_data(Bigarray_val(a), i); - char *dest = String_val(s) + Long_val(j); + char *dest = &Byte(String_val(s), Long_val(j)); memcpy(dest, src, Long_val(l)); return Val_unit; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-parmap-20200124.526acc4/src/parmap.ml new/ocaml-parmap-20210423.2800b78/src/parmap.ml --- old/ocaml-parmap-20200124.526acc4/src/parmap.ml 2020-01-24 15:22:21.000000000 +0100 +++ new/ocaml-parmap-20210423.2800b78/src/parmap.ml 2021-04-23 12:12:28.000000000 +0200 @@ -524,34 +524,6 @@ (concat:'c->'c->'c) : 'c= parmapifold ~init ~finalize ?ncores ?chunksize (fun _ x -> f x) s op opid concat -(* the parallel map function *) - -let parmapi - ?(init = fun _ -> ()) - ?(finalize = fun () -> ()) - ?(ncores= !default_ncores) - ?chunksize - (f:int ->'a -> 'b) - (s:'a sequence) : 'b list= - (* enforce array to speed up access to the list elements *) - let al = match s with A al -> al | L l -> Array.of_list l in - let compute al lo hi previous exc_handler = - (* iterate in reverse order, to accumulate in the right order, - and add to acc *) - let f' j = - try let idx = lo+j in f idx (Array.unsafe_get al idx) - with e -> exc_handler e j in - let rec aux acc = - function - 0 -> (f' 0)::acc - | n -> aux ((f' n)::acc) (n-1) - in aux previous (hi-lo) - in - mapper init finalize ncores ~chunksize compute [] al (fun r -> Utils.concat_tr r) - -let parmap ?init ?finalize ?ncores ?chunksize (f:'a -> 'b) (s:'a sequence) : 'b list= - parmapi ?init ?finalize ?ncores ?chunksize (fun _ x -> f x) s - (* the parallel fold function *) let parfold @@ -565,7 +537,7 @@ (concat:'b->'b->'b) : 'b= parmapfold ~init ~finalize ~ncores ?chunksize (fun x -> x) s op opid concat -(* the parallel map function, on arrays *) +(* the parallel map function *) let mapi_range lo hi (f:int -> 'a -> 'b) a = let l = hi-lo in @@ -578,23 +550,95 @@ r end + +(* the parallel map function, on arrays *) + let array_parmapi ?(init = fun _ -> ()) ?(finalize = fun () -> ()) ?(ncores= !default_ncores) ?chunksize + ?(keeporder=false) (f:int -> 'a -> 'b) (al:'a array) : 'b array= - let compute a lo hi previous exc_handler = + (* compute, collect and opid definitions for reordering after load balancing *) + let compute_sorted a lo hi previous exc_handler = + try + (lo,mapi_range lo hi f a)::previous + with e -> exc_handler e lo + and collect_sorted (r:(int * 'b array) list list) = + let fragments = List.flatten r in + let ordered=List.map snd (List.stable_sort (fun (n,_) (m,_) -> n-m) fragments) in + Array.concat ordered + and opid_sorted = [(0,[||])] + (* compute, collect and opid definitions without reordering *) + and compute a lo hi previous exc_handler = try Array.concat [(mapi_range lo hi f a);previous] with e -> exc_handler e lo - in - mapper init finalize ncores ~chunksize compute [||] al (fun r -> Array.concat r) + and collect r = Array.concat r + and opid = [||] in + let ln = Array.length al in + match keeporder, chunksize with + | _ , None -> + (* no need of load balancing *) + mapper init finalize ncores ~chunksize compute opid al collect + | _ , Some v when ncores >= ln/v -> + (* no need of load balancing if more cores than tasks *) + mapper init finalize ncores ~chunksize compute opid al collect + | false , Some _ -> + (* load balancing without reordering *) + mapper init finalize ncores ~chunksize compute opid al collect + | true , Some _ -> + (* load balancing with reordering *) + mapper init finalize ncores ~chunksize compute_sorted opid_sorted al collect_sorted + +let array_parmap ?init ?finalize ?ncores ?chunksize ?keeporder (f:'a -> 'b) (al:'a array) : 'b array= + array_parmapi ?init ?finalize ?ncores ?chunksize ?keeporder (fun _ x -> f x) al + +let parmapi + ?(init = fun _ -> ()) + ?(finalize = fun () -> ()) + ?(ncores= !default_ncores) + ?chunksize + ?(keeporder=false) + (f:int ->'a -> 'b) + (s:'a sequence) : 'b list= + (* enforce array to speed up access to the list elements *) + let al = match s with A al -> al | L l -> Array.of_list l in + (* compute, collect and opid definitions without reordering *) + let compute al lo hi previous exc_handler = + (* iterate in reverse order, to accumulate in the right order, + and add to acc *) + let f' j = + try let idx = lo+j in f idx (Array.unsafe_get al idx) + with e -> exc_handler e j in + let rec aux acc = + function + 0 -> (f' 0)::acc + | n -> aux ((f' n)::acc) (n-1) + in aux previous (hi-lo) + and collect r = Utils.concat_tr r + and opid = [] in + let ln = Array.length al in + match keeporder, chunksize with + _ , None -> + (* no need of load balancing *) + mapper init finalize ncores ~chunksize compute opid al collect + | _ , Some v when ncores >= ln/v -> + (* no need of load balancing if more cores than tasks *) + mapper init finalize ncores ~chunksize compute opid al collect + | false , Some _ -> + (* load balancing without reordering *) + mapper init finalize ncores ~chunksize compute opid al collect + | true , Some _ -> + (* load balancing with reordering *) + Array.to_list (array_parmapi ~init ~finalize ~ncores ?chunksize ~keeporder f al) -let array_parmap ?init ?finalize ?ncores ?chunksize (f:'a -> 'b) (al:'a array) : 'b array= - array_parmapi ?init ?finalize ?ncores ?chunksize (fun _ x -> f x) al +let parmap ?init ?finalize ?ncores ?chunksize ?keeporder (f:'a -> 'b) (s:'a sequence) : 'b list= + parmapi ?init ?finalize ?ncores ?chunksize ?keeporder (fun _ x -> f x) s + (* This code is highly optimised for operations on float arrays: - knowing in advance the size of the result allows to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-parmap-20200124.526acc4/src/parmap.mli new/ocaml-parmap-20210423.2800b78/src/parmap.mli --- old/ocaml-parmap-20200124.526acc4/src/parmap.mli 2020-01-24 15:22:21.000000000 +0100 +++ new/ocaml-parmap-20210423.2800b78/src/parmap.mli 2021-04-23 12:12:28.000000000 +0200 @@ -105,13 +105,13 @@ function is only correct if [op] and [concat] are associative and commutative. If the optional [chunksize] parameter is specified, the processes compute the result in an on-demand fashion - on blocks of size [chunksize]. + on blocks of size [chunksize]. [parfold ~ncores:n op (A a) b concat] similarly computes [Array.fold_right op a b]. *) (** {3 Parallel map} *) -val parmap : ?init:(int -> unit) -> ?finalize:(unit -> unit) -> ?ncores:int -> ?chunksize:int -> ('a -> 'b) -> 'a sequence -> 'b list +val parmap : ?init:(int -> unit) -> ?finalize:(unit -> unit) -> ?ncores:int -> ?chunksize:int -> ?keeporder:bool-> ('a -> 'b) -> 'a sequence -> 'b list (** [parmap ~ncores:n f (L l) ] computes [List.map f l] by forking [n] processes on a multicore machine. [parmap ~ncores:n f (A a) ] computes [Array.map f a] @@ -119,8 +119,8 @@ If the optional [chunksize] parameter is specified, the processes compute the result in an on-demand fashion on blocks of size [chunksize]; this provides automatic - load balancing for unbalanced computations, but the order - of the result is no longer guaranteed to be preserved. *) + load balancing for unbalanced computations, preserving + the order of the results if [keeporder] is set to true. *) (** {3 Parallel iteration} *) @@ -142,7 +142,7 @@ (** {3 Parallel map, indexed} *) -val parmapi : ?init:(int -> unit) -> ?finalize:(unit -> unit) -> ?ncores:int -> ?chunksize:int -> (int -> 'a -> 'b) -> 'a sequence -> 'b list +val parmapi : ?init:(int -> unit) -> ?finalize:(unit -> unit) -> ?ncores:int -> ?chunksize:int -> ?keeporder:bool -> (int -> 'a -> 'b) -> 'a sequence -> 'b list (** Like parmap, but the map function gets as an extra argument the index of the mapped element *) @@ -154,18 +154,18 @@ (** {3 Parallel map on arrays} *) -val array_parmap : ?init:(int -> unit) -> ?finalize:(unit -> unit) -> ?ncores:int -> ?chunksize:int -> ('a -> 'b) -> 'a array -> 'b array +val array_parmap : ?init:(int -> unit) -> ?finalize:(unit -> unit) -> ?ncores:int -> ?chunksize:int -> ?keeporder:bool -> ('a -> 'b) -> 'a array -> 'b array (** [array_parmap ~ncores:n f a ] computes [Array.map f a] by forking [n] processes on a multicore machine. If the optional [chunksize] parameter is specified, the processes compute the result in an on-demand fashion on blochs of size [chunksize]; this provides automatic - load balancing for unbalanced computations, but the order - of the result is no longer guaranteed to be preserved. *) + load balancing for unbalanced computations, preserving + the order of the results if [keeporder] is set to true. *) (** {3 Parallel map on arrays, indexed} *) -val array_parmapi : ?init:(int -> unit) -> ?finalize:(unit -> unit) -> ?ncores:int -> ?chunksize:int -> (int -> 'a -> 'b) -> 'a array -> 'b array +val array_parmapi : ?init:(int -> unit) -> ?finalize:(unit -> unit) -> ?ncores:int -> ?chunksize:int -> ?keeporder:bool -> (int -> 'a -> 'b) -> 'a array -> 'b array (** Like array_parmap, but the map function gets as an extra argument the index of the mapped element *) @@ -189,7 +189,7 @@ optional [chunksize] parameter is specified, the processes compute the result in an on-demand fashion on blochs of size [chunksize]; this provides automatic load balancing for unbalanced computations, *and* the - order of the result is still guaranteed to be preserved. + order of the result is guaranteed to be preserved. In case you already have at hand an array where to store the result, you can squeeze out some more cpu cycles by passing it as optional parameter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-parmap-20200124.526acc4/src/setcore_stubs.c new/ocaml-parmap-20210423.2800b78/src/setcore_stubs.c --- old/ocaml-parmap-20200124.526acc4/src/setcore_stubs.c 2020-01-24 15:22:21.000000000 +0100 +++ new/ocaml-parmap-20210423.2800b78/src/setcore_stubs.c 2021-04-23 12:12:28.000000000 +0200 @@ -29,6 +29,8 @@ #endif int retcode; int finished=0; + if (numcores <= 1) // only one core in the system, no need to attempt pinning + return Val_unit; while (finished==0) { #if HAVE_DECL_SCHED_SETAFFINITY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-parmap-20200124.526acc4/tests/simplescale.ml new/ocaml-parmap-20210423.2800b78/tests/simplescale.ml --- old/ocaml-parmap-20200124.526acc4/tests/simplescale.ml 2020-01-24 15:22:21.000000000 +0100 +++ new/ocaml-parmap-20210423.2800b78/tests/simplescale.ml 2021-04-23 12:12:28.000000000 +0200 @@ -72,26 +72,38 @@ scale_test compute (L (initsegm 20000)) 2 1 10;; -Printf.printf "*** Computations on integer lists (chunksize=100)\n%!"; +Printf.printf "*** Computations on integer lists (chunksize=100, keeporder=false)\n%!"; scale_test ~chunksize:100 ~inorder:false compute (L (initsegm 20000)) 2 1 10;; +Printf.printf "*** Computations on integer lists (chunksize=100, keeporder=true)\n%!"; + +scale_test ~chunksize:100 ~keeporder:true compute (L (initsegm 20000)) 2 1 10;; + Printf.printf "*** Computations on integer arrays\n%!"; scale_test compute (A (Array.init 20000 (fun n -> n+1))) 2 1 10;; -Printf.printf "*** Computations on integer arrays (chunksize-100)\n%!"; +Printf.printf "*** Computations on integer arrays (chunksize=100, keeporder=false)\n%!"; scale_test ~chunksize:100 ~inorder:false compute (A (Array.init 20000 (fun n -> n+1))) 2 1 10;; +Printf.printf "*** Computations on integer arrays (chunksize=100, keeporder=true)\n%!"; + +scale_test ~chunksize:100 ~keeporder:true compute (A (Array.init 20000 (fun n -> n+1))) 2 1 10;; + Printf.printf "*** Computations on lists of floats\n%!"; scale_test fcompute (L (List.map float_of_int (initsegm 20000))) 2 1 10;; -Printf.printf "*** Computations on lists of floats (chunksize=100)\n%!"; +Printf.printf "*** Computations on lists of floats (chunksize=100, keeporder=false)\n%!"; scale_test ~chunksize:100 ~inorder:false fcompute (L (List.map float_of_int (initsegm 20000))) 2 1 10;; +Printf.printf "*** Computations on lists of floats (chunksize=100, keeporder=true)\n%!"; + +scale_test ~chunksize:100 ~keeporder:true fcompute (L (List.map float_of_int (initsegm 20000))) 2 1 10;; + Printf.printf "*** Computations on arrays of floats\n%!"; scale_test fcompute (A (Array.init 20000 (fun n -> float_of_int (n+1)))) 2 1 10;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-parmap-20200124.526acc4/tests/simplescale_array.ml new/ocaml-parmap-20210423.2800b78/tests/simplescale_array.ml --- old/ocaml-parmap-20200124.526acc4/tests/simplescale_array.ml 2020-01-24 15:22:21.000000000 +0100 +++ new/ocaml-parmap-20210423.2800b78/tests/simplescale_array.ml 2021-04-23 12:12:28.000000000 +0200 @@ -30,10 +30,12 @@ ;; array_scale_test fcompute (Array.init 20000 (fun i -> float_of_int i)) 2 1 10;; +array_scale_test ~chunksize:100 ~inorder:false fcompute (Array.init 20000 (fun i -> float_of_int i)) 2 1 10;; +array_scale_test ~chunksize:100 ~keeporder:true fcompute (Array.init 20000 (fun i -> float_of_int i)) 2 1 10;; array_float_scale_test fcompute (Array.init 20000 (fun i -> float_of_int i)) 2 1 10;; scale_test ~chunksize:100 ~inorder:false compute (A (Array.init 20000 (fun i -> i))) 2 1 10;; +scale_test ~chunksize:100 ~keeporder:true compute (A (Array.init 20000 (fun i -> i))) 2 1 10;; scale_test compute (A (Array.init 20000 (fun i -> i))) 2 1 10;; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-parmap-20200124.526acc4/tests/utils.ml new/ocaml-parmap-20210423.2800b78/tests/utils.ml --- old/ocaml-parmap-20200124.526acc4/tests/utils.ml 2020-01-24 15:22:21.000000000 +0100 +++ new/ocaml-parmap-20210423.2800b78/tests/utils.ml 2021-04-23 12:12:28.000000000 +0200 @@ -12,7 +12,7 @@ open Parmap -let scale_test ?(init=(fun _ -> ())) ?(inorder=true) ?(step=1) ?chunksize compute sequence iter nprocmin nprocmax = +let scale_test ?(init=(fun _ -> ())) ?(inorder=true) ?(step=1) ?chunksize ?(keeporder=false) compute sequence iter nprocmin nprocmax = Printf.eprintf "Testing scalability with %d iterations on %d to %d cores, step %d\n%!" iter nprocmin nprocmax step; let rseq,tseq = let d=Unix.gettimeofday() in @@ -26,14 +26,14 @@ let tot=ref 0.0 in for j=1 to iter do let d=Unix.gettimeofday() in - let rpar=parmap ~init ~ncores:i ?chunksize compute sequence in + let rpar=parmap ~init ~ncores:i ?chunksize ~keeporder compute sequence in tot:=!tot+.(Unix.gettimeofday()-.d); if rseq<>rpar then begin if (List.sort compare rseq) <> (List.sort compare rpar) then Printf.eprintf "Parmap failure: result mismatch!\n%!" else - if inorder then Printf.eprintf "Parmap failure: result order was expected to be preserved, and is not.\n%!" + if inorder || keeporder then Printf.eprintf "Parmap failure: result order was expected to be preserved, and is not.\n%!" else Printf.eprintf "Parmap warning: result order is not preserved (it was not expected to be).\n%!" end done; @@ -43,7 +43,7 @@ rseq ;; -let array_scale_test ?(init= (fun _ -> ())) ?(inorder=true) ?(step=1) ?chunksize compute a iter nprocmin nprocmax = +let array_scale_test ?(init= (fun _ -> ())) ?(inorder=true) ?(step=1) ?chunksize ?(keeporder=false) compute a iter nprocmin nprocmax = Printf.eprintf "Testing scalability with %d iterations on %d to %d cores, step %d\n" iter nprocmin nprocmax step; let rseq,tseq = let d=Unix.gettimeofday() in @@ -56,14 +56,14 @@ let tot=ref 0.0 in for j=1 to iter do let d=Unix.gettimeofday() in - let rpar=array_parmap ~init ~ncores:i compute a in + let rpar=array_parmap ~init ~ncores:i ?chunksize ~keeporder compute a in tot:=!tot+.(Unix.gettimeofday()-.d); if rseq<>rpar then begin if (Array.sort compare rseq) <> (Array.sort compare rpar) then Printf.eprintf "Parmap failure: result mismatch!\n" else - if inorder then Printf.eprintf "Parmap failure: result order was expected to be preserved, and is not.\n" + if inorder || keeporder then Printf.eprintf "Parmap failure: result order was expected to be preserved, and is not.\n" else Printf.eprintf "Parmap warning: result order is not preserved (it was not expected to be).\n" end done;

1 0

commit ocaml-mccs for openSUSE:Factory
by Source-Sync 28 Apr '21

28 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-mccs for openSUSE:Factory checked in at 2021-04-29 01:37:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-mccs (Old) and /work/SRC/openSUSE:Factory/.ocaml-mccs.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ocaml-mccs" Thu Apr 29 01:37:38 2021 rev:6 rq:888079 version:1.1+13 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-mccs/ocaml-mccs.changes 2019-11-11 21:26:18.215933707 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-mccs.new.12324/ocaml-mccs.changes 2021-04-29 01:38:28.290584485 +0200 @@ -1,0 +2,8 @@ +Fri Apr 9 09:09:09 UTC 2021 - ohering(a)suse.de + +- Require current ocaml-rpm-macros +- Update to version 1.1+13: + * No changelog provided. +- Fix build with ocaml-mccs.patch + +------------------------------------------------------------------- Old: ---- ocaml-mccs-1.1+10.tar.xz New: ---- ocaml-mccs-1.1+13.tar.xz ocaml-mccs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-mccs.spec ++++++ --- /var/tmp/diff_new_pack.PlITWv/_old 2021-04-29 01:38:28.662585013 +0200 +++ /var/tmp/diff_new_pack.PlITWv/_new 2021-04-29 01:38:28.666585018 +0200 @@ -18,18 +18,19 @@ Name: ocaml-mccs -Version: 1.1+10 +Version: 1.1+13 Release: 0 %{?ocaml_preserve_bytecode} Summary: Stripped-down version of mccs with OCaml bindings License: LGPL-2.1-only WITH OCaml-LGPL-linking-exception AND BSD-3-Clause AND GPL-3.0-only Group: Development/Languages/Other Url: https://github.com/AltGr/ocaml-mccs -Source: %{name}-%{version}.tar.xz +Source0: %{name}-%{version}.tar.xz +Patch0: %{name}.patch BuildRequires: gcc-c++ BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20191101 +BuildRequires: ocaml-rpm-macros >= 20210409 BuildRequires: ocamlfind(cudf) %description ++++++ _service ++++++ --- /var/tmp/diff_new_pack.PlITWv/_old 2021-04-29 01:38:28.690585052 +0200 +++ /var/tmp/diff_new_pack.PlITWv/_new 2021-04-29 01:38:28.690585052 +0200 @@ -1,8 +1,9 @@ <services> <service mode="disabled" name="tar_scm"> -  - <param name="revision">d8d36a6903aedc29e7c7d2dbbc93081e46ce782f</param> + <param name="filename">ocaml-mccs</param> + <param name="revision">b46f1df8d9ef9dfe7c153cc10198a0b1ff2fca36</param> <param name="scm">git</param> + <param name="submodules">disable</param> <param name="url">https://github.com/AltGr/ocaml-mccs.git</param> <param name="versionformat">@PARENT_TAG@</param> </service> ++++++ ocaml-mccs-1.1+10.tar.xz -> ocaml-mccs-1.1+13.tar.xz ++++++ ++++ 55043 lines of diff (skipped) ++++++ ocaml-mccs.patch ++++++ --- a/src/glpk/draft/glpios01.c +++ b/src/glpk/draft/glpios01.c @@ -1490,7 +1490,7 @@ int ios_add_row(glp_tree *tree, IOSPOOL #ifdef NEW_LOCAL /* 02/II-2018 */ IOSCUT *ios_find_row(IOSPOOL *pool, int i) { /* find row (constraint) in the cut pool */ - xassert(0); + xassert(0); return NULL; } #else IOSCUT *ios_find_row(IOSPOOL *pool, int i)

1 0

commit hivex for openSUSE:Factory
by Source-Sync 28 Apr '21

28 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hivex for openSUSE:Factory checked in at 2021-04-29 01:37:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hivex (Old) and /work/SRC/openSUSE:Factory/.hivex.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hivex" Thu Apr 29 01:37:35 2021 rev:17 rq:887311 version:1.3.19 Changes: -------- --- /work/SRC/openSUSE:Factory/hivex/hivex.changes 2021-01-11 17:17:48.804748343 +0100 +++ /work/SRC/openSUSE:Factory/.hivex.new.12324/hivex.changes 2021-04-29 01:38:25.478580500 +0200 @@ -1,0 +2,6 @@ +Wed Apr 21 12:34:56 UTC 2021 - ohering(a)suse.de + +- Remove ocaml_native_compiler conditional + build native target unconditionally + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hivex.spec ++++++ --- /var/tmp/diff_new_pack.bx2RwW/_old 2021-04-29 01:38:25.942581157 +0200 +++ /var/tmp/diff_new_pack.bx2RwW/_new 2021-04-29 01:38:25.946581163 +0200 @@ -184,9 +184,7 @@ %files -n ocaml-hivex-devel %{_libdir}/ocaml/hivex/*hivex.a -%if %{ocaml_native_compiler} %{_libdir}/ocaml/hivex/*hivex.cmx* -%endif %{_libdir}/ocaml/hivex/hivex.mli %endif

1 0

commit ocaml-zarith for openSUSE:Factory
by Source-Sync 28 Apr '21

28 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-zarith for openSUSE:Factory checked in at 2021-04-29 01:37:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-zarith (Old) and /work/SRC/openSUSE:Factory/.ocaml-zarith.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ocaml-zarith" Thu Apr 29 01:37:35 2021 rev:2 rq:887341 version:1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-zarith/ocaml-zarith.changes 2021-01-21 21:54:19.485769564 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-zarith.new.12324/ocaml-zarith.changes 2021-04-29 01:38:26.214581543 +0200 @@ -1,0 +2,9 @@ +Fri Apr 9 09:09:09 UTC 2021 - ohering(a)suse.de + +- Upgrade to version 1.12 + * PR #79: fast path in OCaml (instead of assembly language) + * PR #94: remove source preprocessing and simplify configuration + * PR #93: fix parallel build + * PR #92: fix benchmark for subtraction + +------------------------------------------------------------------- Old: ---- ocaml-zarith-1.11.tar.xz New: ---- ocaml-zarith-1.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-zarith.spec ++++++ --- /var/tmp/diff_new_pack.oZg57b/_old 2021-04-29 01:38:26.650582161 +0200 +++ /var/tmp/diff_new_pack.oZg57b/_new 2021-04-29 01:38:26.654582166 +0200 @@ -17,7 +17,7 @@ Name: ocaml-zarith -Version: 1.11 +Version: 1.12 Release: 0 %{?ocaml_preserve_bytecode} Summary: Arbitrary precision integers @@ -27,10 +27,11 @@ Source0: %{name}-%{version}.tar.xz Patch0: %{name}.patch BuildRequires: gmp-devel -BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20210114 -BuildRequires: ocaml(ocaml_base_version) >= 4.05 +BuildRequires: ocaml-dune >= 2.8 +BuildRequires: ocaml-rpm-macros >= 20210409 +BuildRequires: ocaml(ocaml_base_version) >= 4.04 BuildRequires: ocamlfind(dune.configurator) +BuildRequires: ocamlfind(ocamldoc) BuildRequires: ocamlfind(str) %description ++++++ _service ++++++ --- /var/tmp/diff_new_pack.oZg57b/_old 2021-04-29 01:38:26.678582201 +0200 +++ /var/tmp/diff_new_pack.oZg57b/_new 2021-04-29 01:38:26.678582201 +0200 @@ -4,8 +4,8 @@ <param name="url">https://github.com/ocaml/Zarith.git</param> <param name="scm">git</param> <param name="submodules">disable</param> - <param name="versionformat">1.11</param> - <param name="revision">b4c2f27be84661cca2719cfc44921ba1513854fe</param> + <param name="versionformat">1.12</param> + <param name="revision">39df015463f2797256dfb12440ed8f6c2dfd59cc</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ ocaml-zarith-1.11.tar.xz -> ocaml-zarith-1.12.tar.xz ++++++ ++++ 4532 lines of diff (skipped) ++++++ ocaml-zarith.patch ++++++ ++++ 1017 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ocaml-zarith/ocaml-zarith.patch ++++ and /work/SRC/openSUSE:Factory/.ocaml-zarith.new.12324/ocaml-zarith.patch

1 0

commit ocaml-findlib for openSUSE:Factory
by Source-Sync 28 Apr '21

28 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-findlib for openSUSE:Factory checked in at 2021-04-29 01:37:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-findlib (Old) and /work/SRC/openSUSE:Factory/.ocaml-findlib.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ocaml-findlib" Thu Apr 29 01:37:34 2021 rev:11 rq:887307 version:1.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-findlib/ocaml-findlib.changes 2020-02-29 21:20:18.734017530 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-findlib.new.12324/ocaml-findlib.changes 2021-04-29 01:38:24.770579496 +0200 @@ -1,0 +2,10 @@ +Fri Apr 9 09:09:09 UTC 2021 - ohering(a)suse.de + +- Require current ocaml-rpm-macros +- Update to upstream version 1.9.1 + Fix an incomaptibility with ocaml-4.13 + Switch from m4 to sed +- Remove ocaml_native_compiler conditional + build native target unconditionally + +------------------------------------------------------------------- Old: ---- findlib-1.8.1.tar.xz New: ---- findlib-1.9.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-findlib.spec ++++++ --- /var/tmp/diff_new_pack.o5xoor/_old 2021-04-29 01:38:25.182580080 +0200 +++ /var/tmp/diff_new_pack.o5xoor/_new 2021-04-29 01:38:25.186580086 +0200 @@ -18,13 +18,13 @@ Name: ocaml-findlib -Version: 1.8.1 +Version: 1.9.1 Release: 0 %{?ocaml_preserve_bytecode} Summary: Objective CAML package manager and build helper License: MIT Group: Development/Languages/OCaml - +BuildRoot: %_tmppath/%name-%version-build Url: https://github.com/ocaml/ocamlfind Source0: findlib-%{version}.tar.xz # @@ -32,12 +32,9 @@ Requires: ocaml-runtime # Provides: ocamlfind = %{version} - -BuildRequires: m4 -BuildRequires: ncurses-devel BuildRequires: ocaml BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-rpm-macros >= 20200220 +BuildRequires: ocaml-rpm-macros >= 20210409 %description Findlib is a library manager for Objective Caml. It provides a @@ -58,7 +55,7 @@ for developing applications that use ocaml-findlib. %prep -%autosetup -p1 -n findlib-%{version} +%setup -q -n findlib-%{version} %build rm -rfv site-lib-src @@ -70,17 +67,16 @@ -mandir %{_mandir} \ -with-toolbox make all -%if 0%{?ocaml_native_compiler} make opt -%endif -rm -fv doc/guide-html/TIMESTAMP %install make install prefix=%{buildroot} rm -rfv %{buildroot}%{ocaml_standard_library}/ocamlbuild +rm -rfv %{buildroot}%{ocaml_standard_library}/findlib/Makefile.packages %ocaml_create_file_list %files -f %{name}.files +%defattr(-,root,root,-) %{ocaml_standard_library}/ocamlfind.conf %{ocaml_standard_library}/topfind %{_bindir}/* @@ -88,6 +84,7 @@ # %files devel -f %{name}.files.devel +%defattr(-,root,root,-) %{ocaml_standard_library}/*/Makefile.config %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.o5xoor/_old 2021-04-29 01:38:25.230580148 +0200 +++ /var/tmp/diff_new_pack.o5xoor/_new 2021-04-29 01:38:25.230580148 +0200 @@ -2,8 +2,8 @@ <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/ocaml/ocamlfind.git</param> <param name="scm">git</param> - <param name="versionformat">1.8.1</param> - <param name="revision">findlib-1.8.1</param> + <param name="versionformat">1.9.1</param> + <param name="revision">findlib-1.9.1</param> <param name="filename">ocaml-findlib</param> </service> <service name="recompress" mode="disabled"> ++++++ findlib-1.8.1.tar.xz -> findlib-1.9.1.tar.xz ++++++ ++++ 4623 lines of diff (skipped)

1 0

commit ocaml-camlp5 for openSUSE:Factory
by Source-Sync 28 Apr '21

28 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-camlp5 for openSUSE:Factory checked in at 2021-04-29 01:37:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-camlp5 (Old) and /work/SRC/openSUSE:Factory/.ocaml-camlp5.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ocaml-camlp5" Thu Apr 29 01:37:33 2021 rev:9 rq:887306 version:8.00 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-camlp5/ocaml-camlp5.changes 2020-09-03 01:16:44.276527560 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-camlp5.new.12324/ocaml-camlp5.changes 2021-04-29 01:38:23.610577852 +0200 @@ -1,0 +2,9 @@ +Fri Apr 9 09:09:09 UTC 2021 - ohering(a)suse.de + +- Update to version 8.00 + cover ocaml-4.12 + add ocaml-camlp5.patch +- Remove ocaml_native_compiler conditional + build native target unconditionally + +------------------------------------------------------------------- Old: ---- ocaml-camlp5-7.12.tar.xz New: ---- ocaml-camlp5-8.00.tar.xz ocaml-camlp5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-camlp5.spec ++++++ --- /var/tmp/diff_new_pack.MMeSFs/_old 2021-04-29 01:38:24.050578476 +0200 +++ /var/tmp/diff_new_pack.MMeSFs/_new 2021-04-29 01:38:24.054578481 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-camlp5 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ocaml-camlp5 -Version: 7.12 +Version: 8.00 Release: 0 %{?ocaml_preserve_bytecode} Summary: Preprocessor-Pretty-Printer for Objective Caml @@ -25,8 +25,9 @@ Group: Development/Languages/OCaml URL: https://opam.ocaml.org/packages/camlp5 Source0: %{name}-%{version}.tar.xz -BuildRequires: ocaml <= 4.11.1 -BuildRequires: ocaml-rpm-macros >= 20200514 +Patch0: ocaml-camlp5.patch +BuildRequires: ocaml < 4.13 +BuildRequires: ocaml-rpm-macros >= 20210409 BuildRequires: ocamlfind(compiler-libs) %description @@ -43,9 +44,12 @@ This package contains the development files. %prep -%setup -q +%autosetup -p1 %build +%ifarch ppc64 +ulimit -s $((1024 * 64)) +%endif pushd ocaml_stuff test -e '4.11.1' || ln -s 4.11.0 "$_" popd @@ -56,9 +60,7 @@ --mandir %{_mandir} make %{?_smp_mflags} out make %{?_smp_mflags} world -%if 0%{?ocaml_native_compiler} make %{?_smp_mflags} world.opt -%endif %install %make_install ++++++ _service ++++++ --- /var/tmp/diff_new_pack.MMeSFs/_old 2021-04-29 01:38:24.086578527 +0200 +++ /var/tmp/diff_new_pack.MMeSFs/_new 2021-04-29 01:38:24.086578527 +0200 @@ -1,10 +1,11 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">git://github.com/camlp5/camlp5.git</param> - <param name="scm">git</param> - <param name="versionformat">7.12</param> - <param name="revision">rel712</param> <param name="filename">ocaml-camlp5</param> + <param name="revision">c1b0da5a79246d540a2a7adb759b8f842ee62823</param> + <param name="scm">git</param> + <param name="submodules">disable</param> + <param name="url">https://github.com/camlp5/camlp5.git</param> + <param name="versionformat">8.00</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ ocaml-camlp5-7.12.tar.xz -> ocaml-camlp5-8.00.tar.xz ++++++ ++++ 179929 lines of diff (skipped) ++++++ ocaml-camlp5.patch ++++++ --- a/etc/mkcamlp5.pl +++ b/etc/mkcamlp5.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl use strict ;

1 0

commit ocaml-lablgtk2 for openSUSE:Factory
by Source-Sync 28 Apr '21

28 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-lablgtk2 for openSUSE:Factory checked in at 2021-04-29 01:37:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-lablgtk2 (Old) and /work/SRC/openSUSE:Factory/.ocaml-lablgtk2.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ocaml-lablgtk2" Thu Apr 29 01:37:33 2021 rev:20 rq:887305 version:2.18.11 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-lablgtk2/ocaml-lablgtk2.changes 2020-06-17 14:56:33.986260881 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-lablgtk2.new.12324/ocaml-lablgtk2.changes 2021-04-29 01:38:22.706576571 +0200 @@ -2 +2,11 @@ -Wed Jun 17 06:06:06 UTC 2020 - olaf(a)aepfle.de +Fri Apr 9 09:09:09 UTC 2021 - ohering(a)suse.de + +- Update to version 2.18.11 + Remove obsolete ocaml-lablgtk2.ml_table_extension_events.patch +- add build conditionals for gl,glade,gnomecanvas,gtksourceview2, + gtkspell and rsvg, enable only the latter be default +- Remove ocaml_native_compiler conditional + build native target unconditionally + +------------------------------------------------------------------- +Wed Jun 17 06:06:06 UTC 2020 - ohering(a)suse.de Old: ---- ocaml-lablgtk2-2.18.10.tar.xz ocaml-lablgtk2.ml_table_extension_events.patch New: ---- ocaml-lablgtk2-2.18.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-lablgtk2.spec ++++++ --- /var/tmp/diff_new_pack.CqwXOB/_old 2021-04-29 01:38:23.114577149 +0200 +++ /var/tmp/diff_new_pack.CqwXOB/_new 2021-04-29 01:38:23.118577154 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-lablgtk2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,37 +15,54 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - -Version: 2.18.10 -Release: 0 -%{?ocaml_preserve_bytecode} +%bcond_with ocaml_lablgtk2_gl +%bcond_with ocaml_lablgtk2_glade +%bcond_with ocaml_lablgtk2_gnomecanvas +%bcond_with ocaml_lablgtk2_gtksourceview2 +%bcond_with ocaml_lablgtk2_gtkspell +%bcond_without ocaml_lablgtk2_rsvg # handle built-in ocaml helper from rpm-build, and helper from ocaml-rpm-macros %global __suseocaml_requires_opts -i GtkSourceView2_types %global __ocaml_requires_opts -i GtkSourceView2_types + Name: ocaml-lablgtk2 +Version: 2.18.11 +Release: 0 +%{?ocaml_preserve_bytecode} +Summary: An Objective Caml Interface to gtk2+ +License: LGPL-2.1-only +Group: Development/Languages/OCaml +BuildRoot: %_tmppath/%name-%version-build +URL: https://opam.ocaml.org/packages/lablgtk Source0: %{name}-%{version}.tar.xz -Patch0: ocaml-lablgtk2.ml_table_extension_events.patch -BuildRequires: gtk2-devel -BuildRequires: gtksourceview2-devel -BuildRequires: gtkspell-devel -BuildRequires: libglade2-devel -BuildRequires: libgnomecanvas-devel -BuildRequires: librsvg-devel BuildRequires: ocaml -BuildRequires: ocaml-findlib -BuildRequires: ocaml-lablgl-devel -BuildRequires: ocaml-rpm-macros >= 20200514 -BuildRequires: xorg-x11 -BuildRequires: zlib-devel -Requires: ocaml +BuildRequires: ocaml-rpm-macros >= 20210409 +BuildRequires: ocamlfind(findlib) +%if %{with ocaml_lablgtk2_gl} +BuildRequires: ocamlfind(lablgl) +%endif +BuildRequires: pkg-config +BuildRequires: pkgconfig(gtk+-2.0) +%if %{with ocaml_lablgtk2_gtksourceview2} +BuildRequires: pkgconfig(gtksourceview-2.0) +%endif +%if %{with ocaml_lablgtk2_gtkspell} +BuildRequires: pkgconfig(gtkspell-2.0) +%endif +%if %{with ocaml_lablgtk2_glade} +BuildRequires: pkgconfig(libglade-2.0) +%endif +%if %{with ocaml_lablgtk2_gnomecanvas} +BuildRequires: pkgconfig(libgnomecanvas-2.0) +%endif +%if %{with ocaml_lablgtk2_rsvg} +BuildRequires: pkgconfig(librsvg-2.0) +%endif + Provides: lablgtk2 = %{version} Obsoletes: lablgtk2 < %{version} Provides: ocaml-lablgtk = %{version} Obsoletes: ocaml-lablgtk < %{version} -Url: https://github.com/garrigue/lablgtk -Summary: An Objective Caml Interface to gtk2+ -License: LGPL-2.1-only -Group: Development/Languages/OCaml %description LablGTK2 uses the rich type system of Objective Caml 3 to provide a @@ -63,9 +80,6 @@ Obsoletes: ocaml-lablgtk-devel < %{version} Provides: lablgtk2:/usr/lib/ocaml/lablgtk2/glib.cmi Requires: %{name} = %{version} -Requires: gtk2-devel -Requires: gtksourceview2-devel -Requires: libgnomecanvas-devel %description devel LablGTK2 uses the rich type system of Objective Caml 3 to provide a @@ -74,37 +88,58 @@ level, which allows for interactive use of the library. %prep -%autosetup -p1 +%setup -q %build -find -name ".cvsignore" -print -delete -# fix README file executable permissions chmod a-x README -export CFLAGS="$RPM_OPT_FLAGS" -make configure -%configure --with-gnomecanvas +%configure \ + --without-gl \ + --without-glade \ + --without-gnomecanvas \ + --without-gnomeui \ + --without-gtksourceview \ + --without-gtksourceview2 \ + --without-gtkspell \ + --without-panel \ + --without-quartz \ + --without-rsvg \ + \ +%if %{with ocaml_lablgtk2_gl} + --with-gl \ +%endif +%if %{with ocaml_lablgtk2_glade} + --with-glade \ +%endif +%if %{with ocaml_lablgtk2_gnomecanvas} + --with-gnomecanvas \ +%endif +%if %{with ocaml_lablgtk2_gtksourceview2} + --with-gtksourceview2 \ +%endif +%if %{with ocaml_lablgtk2_gtkspell} + --with-gtkspell \ +%endif +%if %{with ocaml_lablgtk2_rsvg} + --with-rsvg \ +%endif + %{nil} make world -%if 0%{?ocaml_native_compiler} make opt -pushd src -make lablgtk.cmxa -make lablrsvg.cmxa -make gtkInit.cmx -popd -%endif %install -%makeinstall +%make_install # Remove ld.conf (part of main OCaml dist). -rm $RPM_BUILD_ROOT%{ocaml_standard_library}/ld.conf +rm -fv %{buildroot}%{ocaml_standard_library}/ld.conf # %ocaml_create_file_list %files -f %{name}.files -%doc CHANGES README +%defattr(-,root,root,-) +%doc README %{_bindir}/* %files devel -f %{name}.files.devel +%defattr(-,root,root,-) %{ocaml_standard_library}/*/propcc %{ocaml_standard_library}/*/varcc ++++++ _service ++++++ --- /var/tmp/diff_new_pack.CqwXOB/_old 2021-04-29 01:38:23.150577200 +0200 +++ /var/tmp/diff_new_pack.CqwXOB/_new 2021-04-29 01:38:23.150577200 +0200 @@ -1,15 +1,17 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">https://github.com/garrigue/lablgtk.git</param> + <param name="exclude">.cvsignore</param> + <param name="exclude">applications</param> + <param name="exclude">doc</param> + <param name="exclude">examples</param> + <param name="filename">ocaml-lablgtk2</param> + <param name="revision">156973670a9c00b10f7f97201bbca054e6f3b66b</param> <param name="scm">git</param> + <param name="submodules">disable</param> + <param name="url">https://github.com/garrigue/lablgtk.git</param> <param name="versionformat">@PARENT_TAG@</param> -  - <param name="revision">d66addf4e9dc5ed489e85529475645996afa68a8</param> - <param name="filename">ocaml-lablgtk2</param> -<param name="exclude">.cvsignore</param> -<param name="exclude">applications</param> -<param name="exclude">doc</param> -<param name="exclude">examples</param> + <param name="versionrewrite-pattern">[v]?([^\+]+)(.*)</param> + <param name="versionrewrite-replacement">\1</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ ocaml-lablgtk2-2.18.10.tar.xz -> ocaml-lablgtk2-2.18.11.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.10/CHANGES new/ocaml-lablgtk2-2.18.11/CHANGES --- old/ocaml-lablgtk2-2.18.10/CHANGES 2020-01-23 15:38:11.000000000 +0100 +++ new/ocaml-lablgtk2-2.18.11/CHANGES 2020-06-19 17:37:39.000000000 +0200 @@ -1,11 +1,15 @@ LablGTK changes log +In Lablgtk-2.18.11: + +2020.06.19 [Jerry James] + * Fix the build with -fno-common, the default for GCC 10 + In Lablgtk-2.18.10: 2020.01.23 [Jacques] * headers changed again in ocaml 4.10.0beta2 * fix C compilation warnings - * fix SourceMarkAttributes.new_attribute In Lablgtk-2.18.9: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.10/src/ml_gdk.c new/ocaml-lablgtk2-2.18.11/src/ml_gdk.c --- old/ocaml-lablgtk2-2.18.10/src/ml_gdk.c 2020-01-23 15:38:11.000000000 +0100 +++ new/ocaml-lablgtk2-2.18.11/src/ml_gdk.c 2020-06-19 17:37:39.000000000 +0200 @@ -55,6 +55,8 @@ #define GDK_WINDOW_TYPE_HINT_DOCK GDK_WINDOW_TYPE_HINT_NORMAL #endif +CAMLexport lookup_info *ml_table_extension_events; + CAMLprim void ml_raise_gdk (const char *errmsg) { static const value * exn = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.10/src/ml_gdk.h new/ocaml-lablgtk2-2.18.11/src/ml_gdk.h --- old/ocaml-lablgtk2-2.18.10/src/ml_gdk.h 2020-01-23 15:38:11.000000000 +0100 +++ new/ocaml-lablgtk2-2.18.11/src/ml_gdk.h 2020-06-19 17:37:39.000000000 +0200 @@ -102,7 +102,7 @@ CAMLexport int OptFlags_GdkModifier_val (value); CAMLexport int Flags_GdkModifier_val (value); CAMLexport int Flags_Event_mask_val (value); -CAMLexport lookup_info *ml_table_extension_events; +CAMLextern lookup_info *ml_table_extension_events; #define Extension_events_val(key) ml_lookup_to_c(ml_table_extension_events,key) #define GdkDragContext_val(val) check_cast(GDK_DRAG_CONTEXT,val)

1 0

commit ocaml-sha for openSUSE:Factory
by Source-Sync 28 Apr '21

28 Apr '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-sha for openSUSE:Factory checked in at 2021-04-29 01:37:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-sha (Old) and /work/SRC/openSUSE:Factory/.ocaml-sha.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ocaml-sha" Thu Apr 29 01:37:27 2021 rev:6 rq:885616 version:1.14 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-sha/ocaml-sha.changes 2021-02-04 20:25:12.970930583 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-sha.new.12324/ocaml-sha.changes 2021-04-29 01:38:14.242564574 +0200 @@ -1,0 +2,6 @@ +Fri Apr 9 09:09:09 UTC 2021 - ohering(a)suse.de + +- Update to version 1.14 +- remove ocaml-sha.patch, fixed upstream + +------------------------------------------------------------------- Old: ---- ocaml-sha-1.13.tar.xz ocaml-sha.patch New: ---- ocaml-sha-1.14.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-sha.spec ++++++ --- /var/tmp/diff_new_pack.rZ9X7T/_old 2021-04-29 01:38:14.674565186 +0200 +++ /var/tmp/diff_new_pack.rZ9X7T/_new 2021-04-29 01:38:14.678565192 +0200 @@ -25,7 +25,7 @@ %define pkg ocaml-sha Name: %{pkg}%{nsuffix} -Version: 1.13 +Version: 1.14 Release: 0 %{?ocaml_preserve_bytecode} Summary: Binding to the SHA cryptographic functions @@ -33,10 +33,10 @@ Group: Development/Languages/OCaml URL: https://opam.ocaml.org/packages/sha Source0: %{pkg}-%{version}.tar.xz -Patch0: ocaml-sha.patch BuildRequires: ocaml BuildRequires: ocaml-dune >= 2.0 -BuildRequires: ocaml-rpm-macros >= 20210121 +BuildRequires: ocamlfind(stdlib-shims) +BuildRequires: ocaml-rpm-macros >= 20210409 %if "%{build_flavor}" == "testsuite" BuildRequires: ocamlfind(oUnit) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.rZ9X7T/_old 2021-04-29 01:38:14.718565248 +0200 +++ /var/tmp/diff_new_pack.rZ9X7T/_new 2021-04-29 01:38:14.718565248 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> <param name="filename">ocaml-sha</param> - <param name="revision">12073dab52b52abc29994a30456c8fded95be8fb</param> + <param name="revision">c86a4c76b23a6bd3ae700ea054dc4b6e4d4feef7</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://github.com/djs55/ocaml-sha.git</param> ++++++ ocaml-sha-1.13.tar.xz -> ocaml-sha-1.14.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-sha-1.13/CHANGES.md new/ocaml-sha-1.14/CHANGES.md --- old/ocaml-sha-1.13/CHANGES.md 2020-03-29 15:18:02.000000000 +0200 +++ new/ocaml-sha-1.14/CHANGES.md 2021-03-15 09:17:31.000000000 +0100 @@ -1,3 +1,8 @@ +## v1.14 + +- Handle `safe-string` by @olafhering, reviewed by @nojb (#47) +- Remove `--dev` option from `dune` invocation by @arthurteisseire (#48) + ## v1.13 - Update to dune2, fix Windows compilation, make C fns static @nojb (#42) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-sha-1.13/Makefile new/ocaml-sha-1.14/Makefile --- old/ocaml-sha-1.13/Makefile 2020-03-29 15:18:02.000000000 +0200 +++ new/ocaml-sha-1.14/Makefile 2021-03-15 09:17:31.000000000 +0100 @@ -1,5 +1,5 @@ all: - dune build --dev @install + dune build @install test: dune runtest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-sha-1.13/dune new/ocaml-sha-1.14/dune --- old/ocaml-sha-1.13/dune 2020-03-29 15:18:02.000000000 +0200 +++ new/ocaml-sha-1.14/dune 2021-03-15 09:17:31.000000000 +0100 @@ -7,6 +7,7 @@ (wrapped false) (modules sha1 sha256 sha512) (flags -warn-error -3) + (libraries stdlib-shims) (foreign_stubs (language c) (flags (:include c_flags.sexp)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-sha-1.13/dune-project new/ocaml-sha-1.14/dune-project --- old/ocaml-sha-1.13/dune-project 2020-03-29 15:18:02.000000000 +0200 +++ new/ocaml-sha-1.14/dune-project 2021-03-15 09:17:31.000000000 +0100 @@ -13,12 +13,22 @@ "Florent Monnier" "Forrest L Norvell" "Vincent Bernadoff" - "David Scott") + "David Scott" + "Olaf Hering" + "Arthur Teisseire" + "Nicol��s Ojeda B��r" + "Christopher Zimmermann" + "Thomas Leonard" +) (maintainers dave(a)recoil.org) (package (name sha) - (depends (dune (>= 2.0)) (ounit :with-test))) + (synopsis "Binding to the SHA cryptographic functions") + (description "This is the binding for SHA interface code in OCaml. Offering the same +interface than the MD5 digest included in the OCaml standard library. +It's currently providing SHA1, SHA256 and SHA512 hash functions.") + (depends (dune (>= 2.0)) (stdlib-shims (>= 0.3.0)) (ounit :with-test))) (generate_opam_files true) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-sha-1.13/sha.opam new/ocaml-sha-1.14/sha.opam --- old/ocaml-sha-1.13/sha.opam 2020-03-29 15:18:02.000000000 +0200 +++ new/ocaml-sha-1.14/sha.opam 2021-03-15 09:17:31.000000000 +0100 @@ -1,5 +1,10 @@ # This file is generated by dune, edit dune-project instead opam-version: "2.0" +synopsis: "Binding to the SHA cryptographic functions" +description: """ +This is the binding for SHA interface code in OCaml. Offering the same +interface than the MD5 digest included in the OCaml standard library. +It's currently providing SHA1, SHA256 and SHA512 hash functions.""" maintainer: ["dave(a)recoil.org"] authors: [ "Vincent Hanquez" @@ -10,12 +15,18 @@ "Forrest L Norvell" "Vincent Bernadoff" "David Scott" + "Olaf Hering" + "Arthur Teisseire" + "Nicol��s Ojeda B��r" + "Christopher Zimmermann" + "Thomas Leonard" ] license: "ISC" homepage: "https://github.com/djs55/ocaml-sha" bug-reports: "https://github.com/djs55/ocaml-sha/issues" depends: [ "dune" {>= "2.0"} + "stdlib-shims" {>= "0.3.0"} "ounit" {with-test} ] build: [ @@ -32,9 +43,4 @@ "@doc" {with-doc} ] ] -synopsis: "Binding to the SHA cryptographic functions" -description: """ -This is the binding for SHA interface code in OCaml. Offering the same -interface than the MD5 digest included in the OCaml standard library. -It's currently providing SHA1, SHA256 and SHA512 hash functions.""" dev-repo: "git+https://github.com/djs55/ocaml-sha.git" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-sha-1.13/sha1.ml new/ocaml-sha-1.14/sha1.ml --- old/ocaml-sha-1.13/sha1.ml 2020-03-29 15:18:02.000000000 +0200 +++ new/ocaml-sha-1.14/sha1.ml 2021-03-15 09:17:31.000000000 +0100 @@ -62,7 +62,7 @@ while (!left == -1 || !left > 0) && not !eof do let len = if !left < 0 then blksize else (min !left blksize) in - let readed = Pervasives.input chan buf 0 len in + let readed = Stdlib.input chan buf 0 len in if readed = 0 then eof := true else ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-sha-1.13/sha1_stubs.c new/ocaml-sha-1.14/sha1_stubs.c --- old/ocaml-sha-1.13/sha1_stubs.c 2020-03-29 15:18:02.000000000 +0200 +++ new/ocaml-sha-1.14/sha1_stubs.c 2021-03-15 09:17:31.000000000 +0100 @@ -154,7 +154,7 @@ CAMLlocal1(result); result = caml_alloc_string(20); - sha1_to_bin((sha1_digest *) digest, String_val(result)); + sha1_to_bin((sha1_digest *) digest, &Byte(result, 0)); CAMLreturn(result); } @@ -165,7 +165,7 @@ CAMLlocal1(result); result = caml_alloc_string(40); - sha1_to_hex((sha1_digest *) digest, String_val(result)); + sha1_to_hex((sha1_digest *) digest, &Byte(result, 0)); CAMLreturn(result); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-sha-1.13/sha256.ml new/ocaml-sha-1.14/sha256.ml --- old/ocaml-sha-1.13/sha256.ml 2020-03-29 15:18:02.000000000 +0200 +++ new/ocaml-sha-1.14/sha256.ml 2021-03-15 09:17:31.000000000 +0100 @@ -66,7 +66,7 @@ while (!left == -1 || !left > 0) && not !eof do let len = if !left < 0 then blksize else (min !left blksize) in - let readed = Pervasives.input chan buf 0 len in + let readed = Stdlib.input chan buf 0 len in if readed = 0 then eof := true else ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-sha-1.13/sha256_stubs.c new/ocaml-sha-1.14/sha256_stubs.c --- old/ocaml-sha-1.13/sha256_stubs.c 2020-03-29 15:18:02.000000000 +0200 +++ new/ocaml-sha-1.14/sha256_stubs.c 2021-03-15 09:17:31.000000000 +0100 @@ -152,7 +152,7 @@ CAMLlocal1(result); result = caml_alloc_string(32); - sha256_to_bin((sha256_digest *) digest, String_val(result)); + sha256_to_bin((sha256_digest *) digest, &Byte(result, 0)); CAMLreturn(result); } @@ -163,7 +163,7 @@ CAMLlocal1(result); result = caml_alloc_string(64); - sha256_to_hex((sha256_digest *) digest, String_val(result)); + sha256_to_hex((sha256_digest *) digest, &Byte(result, 0)); CAMLreturn(result); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-sha-1.13/sha512.ml new/ocaml-sha-1.14/sha512.ml --- old/ocaml-sha-1.13/sha512.ml 2020-03-29 15:18:02.000000000 +0200 +++ new/ocaml-sha-1.14/sha512.ml 2021-03-15 09:17:31.000000000 +0100 @@ -66,7 +66,7 @@ while (!left == -1 || !left > 0) && not !eof do let len = if !left < 0 then blksize else (min !left blksize) in - let readed = Pervasives.input chan buf 0 len in + let readed = Stdlib.input chan buf 0 len in if readed = 0 then eof := true else ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-sha-1.13/sha512_stubs.c new/ocaml-sha-1.14/sha512_stubs.c --- old/ocaml-sha-1.13/sha512_stubs.c 2020-03-29 15:18:02.000000000 +0200 +++ new/ocaml-sha-1.14/sha512_stubs.c 2021-03-15 09:17:31.000000000 +0100 @@ -152,7 +152,7 @@ CAMLlocal1(result); result = caml_alloc_string(64); - sha512_to_bin((sha512_digest *) digest, String_val(result)); + sha512_to_bin((sha512_digest *) digest, &Byte(result, 0)); CAMLreturn(result); } @@ -163,7 +163,7 @@ CAMLlocal1(result); result = caml_alloc_string(128); - sha512_to_hex((sha512_digest *) digest, String_val(result)); + sha512_to_hex((sha512_digest *) digest, &Byte(result, 0)); CAMLreturn(result); }

1 0