From a6ad8e50dc185a7204403b1792eed4a7734e09ec956143de1ef78db268bdab41 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Fri, 19 Nov 2021 10:24:19 +0000 Subject: [PATCH 1/2] Accepting request 932309 from home:dspinella:branches:LibreOffice:Factory - update to 0.17.0: * set the baseline C++ version to 17. * mdds has been internalized so that the public header no longer contains references to mdds. With this change, the users can use different API versions of mdds between the ixion build and run-time use. * cleaned up public API to make use of std::string_view and std::variant where appropriate. * implemented built-in LEFT() function in the formula interpreter. * it is no longer required to set the size of void* at build time to ensure the binaries to be fully functional. * fixed a bug where named expressions with names containing invalid characters were still allowed in. OBS-URL: https://build.opensuse.org/request/show/932309 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libixion?expand=0&rev=40 --- libixion-0.16.1.tar.xz | 3 --- libixion-0.17.0.tar.xz | 3 +++ libixion.changes | 16 ++++++++++++++++ libixion.spec | 7 ++++--- 4 files changed, 23 insertions(+), 6 deletions(-) delete mode 100644 libixion-0.16.1.tar.xz create mode 100644 libixion-0.17.0.tar.xz diff --git a/libixion-0.16.1.tar.xz b/libixion-0.16.1.tar.xz deleted file mode 100644 index c85a1e9..0000000 --- a/libixion-0.16.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:426c643b3c346d546027c0226619abb2e59848e94470b9b5aa6365e26125089f -size 482500 diff --git a/libixion-0.17.0.tar.xz b/libixion-0.17.0.tar.xz new file mode 100644 index 0000000..682ceb8 --- /dev/null +++ b/libixion-0.17.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53c97139223f3b786d498f86512a20ee878fab0ef981947647aa116df7c4101e +size 499836 diff --git a/libixion.changes b/libixion.changes index 32444ee..2c2294e 100644 --- a/libixion.changes +++ b/libixion.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Nov 18 18:01:23 UTC 2021 - Danilo Spinella + +- update to 0.17.0: + * set the baseline C++ version to 17. + * mdds has been internalized so that the public header no longer contains + references to mdds. With this change, the users can use different API + versions of mdds between the ixion build and run-time use. + * cleaned up public API to make use of std::string_view and std::variant + where appropriate. + * implemented built-in LEFT() function in the formula interpreter. + * it is no longer required to set the size of void* at build time to ensure + the binaries to be fully functional. + * fixed a bug where named expressions with names containing invalid + characters were still allowed in. + ------------------------------------------------------------------- Wed May 19 14:49:56 UTC 2021 - Fridrich Strba diff --git a/libixion.spec b/libixion.spec index f721ea1..e8f6adf 100644 --- a/libixion.spec +++ b/libixion.spec @@ -17,9 +17,9 @@ %{!?make_build:%global make_build make %{?_smp_mflags}} -%define libname libixion-0_16-0 +%define libname libixion-0_17-0 Name: libixion -Version: 0.16.1 +Version: 0.17.0 Release: 0 Summary: Threaded multi-target formula parser & interpreter License: MIT @@ -30,9 +30,10 @@ BuildRequires: gcc-c++ BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: pkgconfig(mdds-1.5) +BuildRequires: pkgconfig(mdds-2.0) BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(spdlog) >= 0.16.0 +BuildRequires: pkgconfig(vulkan) >= 1.2.0 %if 0%{?suse_version} > 1325 BuildRequires: libboost_filesystem-devel BuildRequires: libboost_program_options-devel From 1fb9a98d5ee338668eb461c3ea5e00581154277956763cff084fcf74c4100c7b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 27 Jan 2022 13:28:12 +0000 Subject: [PATCH 2/2] Accepting request 949441 from home:fstrba fix build on older systems OBS-URL: https://build.opensuse.org/request/show/949441 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libixion?expand=0&rev=41 --- libixion-boost-system.patch | 22 ++++++++++++++++++++++ libixion.changes | 7 +++++++ libixion.spec | 9 ++++++++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 libixion-boost-system.patch diff --git a/libixion-boost-system.patch b/libixion-boost-system.patch new file mode 100644 index 0000000..e27dffc --- /dev/null +++ b/libixion-boost-system.patch @@ -0,0 +1,22 @@ +--- libixion-0.17.0/src/Makefile.am 2022-01-27 14:11:13.211161581 +0100 ++++ libixion-0.17.0/src/Makefile.am 2022-01-27 14:11:40.751322069 +0100 +@@ -19,7 +19,7 @@ + table_handler.cpp + + ixion_parser_LDADD = libixion/libixion-@IXION_API_VERSION@.la \ +- $(BOOST_PROGRAM_OPTIONS_LIBS) ++ $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SYSTEM_LIBS) + + ixion_sorter_SOURCES = \ + ixion_sorter.cpp \ +--- libixion-0.17.0/src/python/Makefile.am 2022-01-27 14:11:13.215161603 +0100 ++++ libixion-0.17.0/src/python/Makefile.am 2022-01-27 14:20:51.778555056 +0100 +@@ -16,7 +16,7 @@ + ixion_la_CPPFLAGS = -I$(top_srcdir)/include $(PYTHON_CFLAGS) $(MDDS_CFLAGS) + ixion_la_LIBADD = \ + ../libixion/libixion-@IXION_API_VERSION@.la \ +- $(PYTHON_LIBS) ++ $(PYTHON_LIBS) $(BOOST_SYSTEM_LIBS) + + if OSX + diff --git a/libixion.changes b/libixion.changes index 2c2294e..1df0940 100644 --- a/libixion.changes +++ b/libixion.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 27 13:22:22 UTC 2022 - Fridrich Strba + +- Added patch: + * libixion-boost-system.patch + + fix missing symbols from boost_system library + ------------------------------------------------------------------- Thu Nov 18 18:01:23 UTC 2021 - Danilo Spinella diff --git a/libixion.spec b/libixion.spec index e8f6adf..f8c573e 100644 --- a/libixion.spec +++ b/libixion.spec @@ -1,7 +1,7 @@ # # spec file for package libixion # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,10 +25,14 @@ Summary: Threaded multi-target formula parser & interpreter License: MIT URL: https://gitlab.com/ixion/ixion Source: http://kohei.us/files/ixion/src/%{name}-%{version}.tar.xz +Patch0: libixion-boost-system.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: coreutils BuildRequires: gcc-c++ BuildRequires: libstdc++-devel BuildRequires: libtool +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(mdds-2.0) BuildRequires: pkgconfig(python3) @@ -79,8 +83,11 @@ Python 3 bindings for %{name}. %prep %setup -q +%patch0 -p1 %build +libtoolize --force --copy +autoreconf -fi %configure \ --disable-silent-rules \ --disable-static \