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

Accepting request 1174844 from LibreOffice:Factory

Browse Source 
- Update to git snapshot 0.10.0+git22 (e0d8122)

OBS-URL: https://build.opensuse.org/request/show/1174844
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/foma?expand=0&rev=8
This commit is contained in:
Ana Guerrero 2024-05-20 16:09:37 +00:00 committed by Git OBS Bridge
commit bf1a769dc1
7 changed files with 40 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
_service
View File

@ -1,14 +1,15 @@
<services>
<service mode="disabled" name="tar_scm">
<service mode="manual" name="tar_scm">
<param name="url">https://github.com/mhulden/foma</param>
<param name="scm">git</param>
<param name="filename">foma</param>
<param name="revision">dfe1ccb1055af99be0232a26520d247b5fe093bc</param>
<param name="versionformat">0.10.0</param>
<param name="revision">master</param>
<param name="parent-tag">dfe1ccb1055af99be0232a26520d247b5fe093bc</param>
<param name="versionformat">0.10.0+git@TAG_OFFSET@</param>
</service>
<service mode="disabled" name="recompress">
<service mode="manual" name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service mode="disabled" name="set_version"/>
<service mode="manual" name="set_version"/>
</services>

3
foma-0.10.0+git22.tar.xz Normal file
View File

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

BIN
foma-0.10.0.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

14
foma-gcc14.patch
View File

@ -1,14 +0,0 @@
diff --git a/foma/io.c b/foma/io.c
index b7bf69b..da1c57a 100644
--- a/foma.orig/io.c
+++ a/foma/io.c
@@ -999,7 +999,7 @@ static BOM BOM_codes[] = {
{ { 0x00, 0x00, 0xFE, 0xFF }, 4, "UTF-32BE" },
{ { 0xFF, 0xFE }, 2, "UTF16-LE" },
{ { 0xFE, 0xFF }, 2, "UTF16-BE" },
- { NULL, 0, NULL },
+ { { 0, } , 0, NULL },
};
BOM *check_BOM(char *buffer) {

34
foma-harden-build.patch
View File

@ -1,34 +0,0 @@
---
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: foma/Makefile
===================================================================
--- a/foma.orig/Makefile
+++ a/foma/Makefile
@@ -23,13 +23,13 @@ LIBOBJS = int_stack.o define.o determini
all: libfoma foma flookup cgflookup
foma: $(FOMAOBJS) $(LIBOBJS)
- $(CC) $(CFLAGS) $(FOMAOBJS) $(LIBOBJS) $(LDFLAGS) -o $@
+ $(CC) $(CFLAGS) -pie -Wl,-z,now $(FOMAOBJS) $(LIBOBJS) $(LDFLAGS) -o $@
flookup: flookup.o libfoma
- $(CC) $(CFLAGS) flookup.o $(FLOOKUPLDFLAGS) -o $@
+ $(CC) $(CFLAGS) -pie -Wl,-z,now flookup.o $(FLOOKUPLDFLAGS) -o $@
cgflookup: cgflookup.o libfoma
- $(CC) $(CFLAGS) cgflookup.o $(FLOOKUPLDFLAGS) -o $@
+ $(CC) $(CFLAGS) -pie -Wl,-z,now cgflookup.o $(FLOOKUPLDFLAGS) -o $@
STATICLIB = libfoma.a
@@ -72,7 +72,7 @@ libfoma: $(SHAREDLIBV)
$(SHAREDLIBV): $(LIBOBJS)
$(AR) $(ARFLAGS) $(STATICLIB) $(LIBOBJS)
$(RANLIB) $(STATICLIB)
- $(CC) $(CFLAGS) -shared -Wl,$(DFLAG),$(SHAREDLIBM) -o $(SHAREDLIBV) $(LIBOBJS) $(LDFLAGS)
+ $(CC) $(CFLAGS) -shared -Wl,-z,now,$(DFLAG),$(SHAREDLIBM) -o $(SHAREDLIBV) $(LIBOBJS) $(LDFLAGS)
install: foma libfoma libfoma.pc
-@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi

8
foma.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri May 17 06:34:16 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Update to git snapshot 0.10.0+git22 (e0d8122)
* Build fixes for various compilers and C++ standard modes
- Drop foma-gcc14.patch (merged), delete foma-harden-build.patch
(obsolete)
-------------------------------------------------------------------
Mon May 13 12:10:56 UTC 2024 - pgajdos@suse.com

55
foma.spec
View File

@ -19,39 +19,36 @@
%{!?make_build:%global make_build make %{?_smp_mflags}}
%define libname libfoma0
Name: foma
Version: 0.10.0
Version: 0.10.0+git22
Release: 0
Summary: Finite-state compiler and C library
License: Apache-2.0
URL: https://fomafst.github.io/
Source0: foma-%{version}.tar.xz
Patch0: foma-harden-build.patch
# https://github.com/mhulden/foma/commit/9a99d2d41809422080606bb49531b38ce1e2111a
Patch1: foma-gcc14.patch
Source: foma-%version.tar.xz
BuildRequires: bison
BuildRequires: cmake
BuildRequires: flex
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
BuildRequires: pkg-config
BuildRequires: readline-devel
BuildRequires: pkgconfig(zlib)
%description
Foma is a compiler, programming language, and C library for constructing
finite-state automata and transducers for various uses. It has specific
support for many natural language processing applications such as producing
morphological analyzers. Although NLP applications are probably the main
use of foma, it is sufficiently generic to use for a large number of purposes.
finite-state automata and transducers for various uses. It has specific support
for many natural language processing applications such as producing
morphological analyzers. Although NLP applications are probably the main use of
foma, it is sufficiently generic to use for a large number of purposes.
%package -n %{libname}
Summary: Finite-state C library
%description -n %{libname}
The library contains efficient implementations of all classical
automata/transducer algorithms: determinization, minimization,
epsilon-removal, composition, boolean operations. Also, more
advanced construction methods are available: context restriction,
quotients, first-order regular logic, transducers from replacement
rules, etc.
automata/transducer algorithms: determinization, minimization, epsilon-removal,
composition, boolean operations. Also, more advanced construction methods are
available: context restriction, quotients, first-order regular logic,
transducers from replacement rules, etc.
%package devel
Summary: Finite-state C library development files and headers
@ -61,27 +58,21 @@ Requires: %{libname} = %{version}
Finite-state C library development files and headers for %{name}.
%prep
%autosetup -p2 -n %{name}-%{version}/%{name}
sed -i '/^CFLAGS/c\CFLAGS = %{optflags} -fcommon -Wl,--as-needed -D_GNU_SOURCE -std=c99 -fvisibility=hidden -fPIC' Makefile
sed -i '/^LDFLAGS/c\LDFLAGS = -lreadline -lz -lreadline -fpic' Makefile
sed -i '/^FLOOKUPLDFLAGS/c\FLOOKUPLDFLAGS = libfoma.a -lz -fpic' Makefile
%autosetup -p1
%build
# hand written Makefile that gets to be quite PITA
%make_build -j1
pushd foma/
%cmake
%cmake_build
popd
%install
%make_install \
prefix=%{buildroot}%{_prefix} \
libdir=%{buildroot}%{_libdir}
rm -rf %{buildroot}%{_libdir}/*.a
# github.com/mhulden/foma/issues/127
perl -i -pe 's{\Q%{buildroot}\E}{}' "%{buildroot}/%{_libdir}/pkgconfig"/*.pc
cat "%{buildroot}/%{_libdir}/pkgconfig"/*.pc
pushd foma/
%cmake_install
popd
find "%buildroot" -type f -name "*.a" -print -delete
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
%ldconfig_scriptlets -n %libname
%files
%{_bindir}/cgflookup
@ -95,7 +86,7 @@ cat "%{buildroot}/%{_libdir}/pkgconfig"/*.pc
%{_libdir}/pkgconfig/libfoma.pc
%files -n %{libname}
%license COPYING
%license foma/COPYING
%{_libdir}/libfoma.so.*
%changelog