jengelh/hfst
SHA256
1
0
Fork 0
forked from pool/hfst
Code Pull Requests Activity

- Update to new upstream release 3.15.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools/hfst?expand=0&rev=6
This commit is contained in:
Jan Engelhardt 2019-08-22 19:04:06 +00:00 committed by Git OBS Bridge
parent d819ca54bf
commit c1ac445366
7 changed files with 63 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gcc7.diff
View File

@ -1,25 +0,0 @@
From 134d5a5aac3fd015c4955b6f5fdfede42159e402 Mon Sep 17 00:00:00 2001
From: Tino Didriksen <tino@didriksen.cc>
Date: Tue, 8 Aug 2017 11:28:03 +0000
Subject: [PATCH] Works around issue #358
---
back-ends/openfst/src/include/fst/replace.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/back-ends/openfst/src/include/fst/replace.h b/back-ends/openfst/src/include/fst/replace.h
index 5cf4759c..791a6ff8 100644
--- a/back-ends/openfst/src/include/fst/replace.h
+++ b/back-ends/openfst/src/include/fst/replace.h
@@ -1050,7 +1050,7 @@ class ArcIterator< ReplaceFst<A, T> > {
// If state is already cached, use cached arcs array.
if (fst_.GetImpl()->HasArcs(state_)) {
- (fst_.GetImpl())->template CacheImpl<A>::InitArcIterator(state_,
+ (fst_.GetImpl())->CacheImpl<A>::InitArcIterator(state_,
&cache_data_);
num_arcs_ = cache_data_.narcs;
arcs_ = cache_data_.arcs; // 'arcs_' is a ptr to the cached arcs.
--
2.14.1

3
hfst-3.12.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1573c2d91f3834687fb4e2cbe950c3f08e6794293996c8afeb0d5a941c48a4a3
size 3285488

3
hfst-3.15.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bf50099174a0e14a53ab4d37d514bec2347dea3d4f2ff69d652659357cdd667f
size 3314547

28
hfst-scripts-install.diff
View File

@ -1,28 +0,0 @@
Date: 2014-09-12 12:01:17.376375609 +0200
From: Jan Engelhardt <jengelh@inai.de>
build: resolve bogus installation of hfst_foma causing trouble
hsft_foma is not a script, and it is installed by
back-ends/foma/Makefile.am already. Do not install it twice.
---
scripts/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: hfst-3.12.2/scripts/Makefile.am
===================================================================
--- hfst-3.12.2.orig/scripts/Makefile.am
+++ hfst-3.12.2/scripts/Makefile.am
@@ -16,9 +16,9 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>.
if GENERATE_FOMA_WRAPPER
-bin_SCRIPTS = hfst-foma-wrapper.sh hfst-foma ${top_srcdir}/back-ends/foma/hfst_foma$(EXEEXT)
+bin_SCRIPTS = hfst-foma-wrapper.sh hfst-foma
EXTRA_DIST=hfst-foma generate-cc-files.sh
-AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=hfst-foma-wrapper.sh hfst-foma ${top_srcdir}/back-ends/foma/hfst_foma$(EXEEXT)
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=hfst-foma-wrapper.sh hfst-foma
else
EXTRA_DIST=generate-cc-files.sh
endif

51
hfst-split-libs.diff
View File

@ -5,37 +5,39 @@ X-Upstream: likely not
Install sublibraries such that we can make them separate packages
and tag these with their licenses.
---
back-ends/foma/Makefile.am | 6 +++++-
back-ends/foma/Makefile.am | 4 +++-
back-ends/openfst/src/lib/Makefile.am | 3 ++-
back-ends/sfst/Makefile.am | 3 ++-
3 files changed, 9 insertions(+), 3 deletions(-)
back-ends/sfst/Makefile.am | 5 +++--
3 files changed, 8 insertions(+), 4 deletions(-)
Index: hfst-3.12.2/back-ends/foma/Makefile.am
Index: hfst-3.15.0/back-ends/foma/Makefile.am
===================================================================
--- hfst-3.12.2.orig/back-ends/foma/Makefile.am
+++ hfst-3.12.2/back-ends/foma/Makefile.am
@@ -8,12 +8,16 @@ if WANT_MINGW
AM_CPPFLAGS += -D__NO_MINGW_LFS
--- hfst-3.15.0.orig/back-ends/foma/Makefile.am
+++ hfst-3.15.0/back-ends/foma/Makefile.am
@@ -9,9 +9,10 @@ AM_CPPFLAGS += -D__NO_MINGW_LFS
endif
if WANT_FOMA
-noinst_LTLIBRARIES = libfoma.la
+lib_LTLIBRARIES = libfoma.la
endif
+libfoma_la_LDFLAGS = -release hfst -version-number 0 -no-undefined
libfoma_la_SOURCES = int_stack.c define.c determinize.c apply.c \
rewrite.c lexcread.c topsort.c flags.c minimize.c reverse.c \
extract.c sigma.c structures.c constructions.c \
coaccessible.c io.c utf8.c spelling.c dynarray.c mem.c stringhash.c \
trie.c lex.lexc.c lex.yy.c regex.c
+if GENERATE_FOMA_WRAPPER
@@ -40,6 +41,7 @@ endif
if GENERATE_FOMA_WRAPPER
bin_PROGRAMS=hfst_foma
+libfoma_la_LIBADD = -lz
+endif
AM_CPPFLAGS += -DZLIB
endif
hfst_foma_LDADD = $(top_builddir)/back-ends/foma/libfoma.la
Index: hfst-3.12.2/back-ends/openfst/src/lib/Makefile.am
Index: hfst-3.15.0/back-ends/openfst/src/lib/Makefile.am
===================================================================
--- hfst-3.12.2.orig/back-ends/openfst/src/lib/Makefile.am
+++ hfst-3.12.2/back-ends/openfst/src/lib/Makefile.am
--- hfst-3.15.0.orig/back-ends/openfst/src/lib/Makefile.am
+++ hfst-3.15.0/back-ends/openfst/src/lib/Makefile.am
@@ -11,6 +11,7 @@
AUTOMAKE_OPTIONS=subdir-objects
@ -45,15 +47,22 @@ Index: hfst-3.12.2/back-ends/openfst/src/lib/Makefile.am
+libfst_la_LDFLAGS = -release hfst -version-number 0 -no-undefined
libfst_la_SOURCES = compat.cc flags.cc fst.cc properties.cc \
symbol-table.cc symbol-table-ops.cc util.cc
Index: hfst-3.12.2/back-ends/sfst/Makefile.am
Index: hfst-3.15.0/back-ends/sfst/Makefile.am
===================================================================
--- hfst-3.12.2.orig/back-ends/sfst/Makefile.am
+++ hfst-3.12.2/back-ends/sfst/Makefile.am
@@ -1,6 +1,7 @@
--- hfst-3.15.0.orig/back-ends/sfst/Makefile.am
+++ hfst-3.15.0/back-ends/sfst/Makefile.am
@@ -1,12 +1,13 @@
AM_CPPFLAGS=-Wno-deprecated
if WANT_SFST
-noinst_LTLIBRARIES = libsfst.la
+lib_LTLIBRARIES = libsfst.la
endif
if WANT_LEAN_SFST
-noinst_LTLIBRARIES = libsfst.la
+lib_LTLIBRARIES = libsfst.la
endif
+libsfst_la_LDFLAGS = -release hfst -version-number 0 -no-undefined
libsfst_la_SOURCES = alphabet.cc basic.cc utf8.cc compact.cc fst.cc \
operators.cc determinise.cc generate.cc hopcroft.cc

10
hfst.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Aug 22 18:51:23 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 3.15.0
* Numerous improvements to pmatching and tokenization.
* Add tool hfst-eliminate-flags.
* Allow both escaped and unescaped zeros in multicharacters in
all lexc lexicon entries.
- Drop gcc7.diff, hfst-scripts-install.diff
-------------------------------------------------------------------
Tue Sep 5 00:44:15 UTC 2017 - jengelh@inai.de

49
hfst.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package hfst
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,24 +12,22 @@
# 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/
#
Name: hfst
Version: 3.12.2
Version: 3.15.0
Release: 0
Summary: Helsinki Finite-State Transducer Technology
License: GPL-3.0+ and GPL-3.0 and GPL-2.0+ and GPL-2.0 and GPL-3.0 and Apache-2.0
License: GPL-3.0-or-later AND GPL-3.0-only AND GPL-2.0-or-later AND GPL-2.0-only AND GPL-3.0-only AND Apache-2.0
Group: Development/Tools/Other
Url: http://www.ling.helsinki.fi/kieliteknologia/tutkimus/hfst/
URL: https://hfst.github.io/
Source: https://github.com/hfst/hfst/releases/download/v%version/hfst-%version.tar.gz
Patch2: hfst-wrong-flags.diff
Patch3: hfst-split-libs.diff
Patch4: hfst-scripts-install.diff
Patch5: hfst-nodate.diff
Patch6: gcc7.diff
Patch1: hfst-wrong-flags.diff
Patch2: hfst-split-libs.diff
Patch3: hfst-nodate.diff
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@ -55,7 +53,7 @@ based on weighted and unweighted finite-state transducer technology.
%package -n libfoma-hfst0
Summary: Multi-purpose finite-state toolkit
License: GPL-2.0
License: GPL-2.0-only
Group: System/Libraries
%description -n libfoma-hfst0
@ -73,12 +71,12 @@ Group: System/Libraries
OpenFst is a library for constructing, combining, optimizing, and
searching weighted finite-state transducers (FSTs).
%package -n libhfst49
%package -n libhfst52
Summary: Helsinki Finite-State Transducer Technology Libraries
License: GPL-3.0
License: GPL-3.0-only
Group: System/Libraries
%description -n libhfst49
%description -n libhfst52
The Helsinki Finite-State Transducer software is intended for the
implementation of morphological analyzers and other tools which are
based on weighted and unweighted finite-state transducer technology.
@ -87,7 +85,7 @@ based on weighted and unweighted finite-state transducer technology.
Summary: SFST Finite State Tools
# HFST is missing the license file; a look in SFST upstream code
# (https://code.google.com/p/cistern/wiki/SFST) reveals it is GPL-2.0.
License: GPL-2.0
License: GPL-2.0-only
Group: System/Libraries
%description -n libsfst-hfst0
@ -97,9 +95,9 @@ technology.
%package devel
Summary: Development files for the Helsinki Finite-State Transducer
License: GPL-3.0
License: GPL-3.0-only
Group: Development/Libraries/C and C++
Requires: libhfst49 = %version
Requires: libhfst52 = %version
%description devel
The Helsinki Finite-State Transducer software is intended for the
@ -110,8 +108,7 @@ This subpackage contains the files necessary to build programs that
want to make use of the HFST library.
%prep
%setup -q
%patch -P 2 -P 3 -P 4 -P 5 -P 6 -p1
%autosetup -p1
%build
autoreconf -fiv
@ -130,37 +127,31 @@ rm -f "%buildroot/%_libdir/"{libfoma,libfst,libsfst}.so
%postun -n libfoma-hfst0 -p /sbin/ldconfig
%post -n libfst-hfst0 -p /sbin/ldconfig
%postun -n libfst-hfst0 -p /sbin/ldconfig
%post -n libhfst49 -p /sbin/ldconfig
%postun -n libhfst49 -p /sbin/ldconfig
%post -n libhfst52 -p /sbin/ldconfig
%postun -n libhfst52 -p /sbin/ldconfig
%post -n libsfst-hfst0 -p /sbin/ldconfig
%postun -n libsfst-hfst0 -p /sbin/ldconfig
%files
%defattr(-,root,root)
%_bindir/hfst*
%_mandir/man1/*.1*
%doc AUTHORS COPYING NEWS README
%files -n libfoma-hfst0
%defattr(-,root,root)
%_libdir/libfoma-hfst.so.0*
%doc back-ends/foma/COPYING
%files -n libfst-hfst0
%defattr(-,root,root)
%_libdir/libfst-hfst.so.0*
%doc back-ends/openfst/COPYING
%files -n libhfst49
%defattr(-,root,root)
%_libdir/libhfst.so.49*
%files -n libhfst52
%_libdir/libhfst.so.52*
%files -n libsfst-hfst0
%defattr(-,root,root)
%_libdir/libsfst-hfst.so.0*
%files devel
%defattr(-,root,root)
%_includedir/*
%_libdir/libhfst.so
%_libdir/pkgconfig/*.pc