commit e5cbfb8393f640f22c0d1ba1c3399f67cd1df46d Author: Tim Biermann <tbier@posteo.de> Date: Sat Jan 28 14:42:58 2023 +0100 libmythes: pulled patch from libreoffice diff --git a/libmythes/.signature b/libmythes/.signature index c60727941..39245d475 100644 --- a/libmythes/.signature +++ b/libmythes/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zStNfAQ5B2xn2Pbou6BzYlaThILKS4du/tS4FKu9tSHKsSZS5CH9PHflFglLL1xXo9Vb8X210h/2wLBNmo6uAM= -SHA256 (Pkgfile) = 765ae4c659b6052c94385e80a38334a88f0bfbb314564f2798c791ad45119702 +RWSagIOpLGJF31GudFeLWDHtTZAusIj3faa18ITYbgS9HWQF1I2FgUzflUHqIGfqXvNxqKaTtgHkikjIHAz9CEXwY7ZVvL5BRg0= +SHA256 (Pkgfile) = 5393ebce7ab351d926ab123aba1dbe88aed9ccf1d82eca4e2e9c930df73af928 SHA256 (.footprint) = 5fb91a5df0379a43f7fe7e7966631fe19ac5629459e92945bbca9994b573e008 SHA256 (mythes-1.2.5.tar.xz) = 19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d +SHA256 (mythes-1.2.0-vanilla-th-gen-idx.patch) = f3c75d18074b3b6033931f1369dbc76b8bfb165d6249a025c63c7557d5a42822 diff --git a/libmythes/Pkgfile b/libmythes/Pkgfile index ccdd57e0a..1d531c56a 100644 --- a/libmythes/Pkgfile +++ b/libmythes/Pkgfile @@ -5,11 +5,15 @@ name=libmythes version=1.2.5 -release=1 -source=(https://github.com/hunspell/mythes/releases/download/v$version/mythes-$versi...) +release=2 +source=(https://github.com/hunspell/mythes/releases/download/v$version/mythes-$versi... + mythes-1.2.0-vanilla-th-gen-idx.patch) build() { cd mythes-$version + + patch -Np2 -i $SRC/mythes-1.2.0-vanilla-th-gen-idx.patch + ./configure --prefix=/usr make make DESTDIR=$PKG install diff --git a/libmythes/mythes-1.2.0-vanilla-th-gen-idx.patch b/libmythes/mythes-1.2.0-vanilla-th-gen-idx.patch new file mode 100644 index 000000000..3752e2912 --- /dev/null +++ b/libmythes/mythes-1.2.0-vanilla-th-gen-idx.patch @@ -0,0 +1,90 @@ +--- misc/mythes-1.2.3.orig/th_gen_idx.pl ++++ misc/build/mythes-1.2.3/th_gen_idx.pl +@@ -1,11 +1,25 @@ +-#!/usr/bin/perl +- +-# perl program to take a thesaurus structured text data file +-# and create the proper sorted index file (.idx) ++: ++eval 'exec perl -wS $0 ${1+"$@"}' ++ if 0; ++# ++# This file is part of the LibreOffice project. ++# ++# This Source Code Form is subject to the terms of the Mozilla Public ++# License, v. 2.0. If a copy of the MPL was not distributed with this ++# file, You can obtain one at http://mozilla.org/MPL/2.0/. ++# ++# This file incorporates work covered by the following license notice: ++# ++# Licensed to the Apache Software Foundation (ASF) under one or more ++# contributor license agreements. See the NOTICE file distributed ++# with this work for additional information regarding copyright ++# ownership. The ASF licenses this file to you under the Apache ++# License, Version 2.0 (the "License"); you may not use this file ++# except in compliance with the License. You may obtain a copy of ++# the License at http://www.apache.org/licenses/LICENSE-2.0 . ++# + # +-# typically invoked as follows: +-# cat th_en_US_new.dat | ./th_gen_idx.pl > th_en_US_new.idx + # + + sub by_entry { + my ($aent, $aoff) = split('\|',$a); +@@ -13,6 +34,27 @@ sub by_entry { + $aent cmp $bent; + } + ++#FIXME: someone may want "infile" or even parameter parsing ++sub get_outfile { ++ my $next_is_file = 0; ++ foreach ( @ARGV ) { ++ if ( $next_is_file ) { ++ return $_ ++ } ++ if ( $_ eq "-o" ) { ++ $next_is_file = 1; ++ } ++ } ++ return ""; ++} ++ ++sub usage { ++ print "usage:\n"; ++ print "$0 -o outfile < input\n"; ++ ++ exit 99; ++} ++ + # main routine + my $ne = 0; # number of entries in index + my @tindex=(); # the index itself +@@ -24,6 +66,10 @@ my $nm=0; # number of meaning fo + my $meaning=""; # current meaning and synonyms + my $p; # misc uses + my $encoding; # encoding used by text file ++my $outfile = ""; ++ ++$outfile = get_outfile(); ++usage() if ( $outfile eq "" ); + + # top line of thesaurus provides encoding + $encoding=<STDIN>; +@@ -51,9 +97,13 @@ while ($rec=<STDIN>){ + # now we have all of the information + # so sort it and then output the encoding, count and index data + @tindex = sort by_entry @tindex; +-print STDOUT "$encoding\n"; +-print STDOUT "$ne\n"; ++ ++print "$outfile\n"; ++open OUTFILE, ">$outfile" or die "ERROR: Can't open $outfile for writing!"; ++print OUTFILE "$encoding\n"; ++print OUTFILE "$ne\n"; + foreach $one (@tindex) { +- print STDOUT "$one\n"; ++ print OUTFILE "$one\n"; + } ++close OUTFILE; +