[packages/liborcus] - updated to 0.18.1 (new api version 0.18)
qboosh
qboosh at pld-linux.org
Thu Aug 29 19:39:46 CEST 2024
commit 8b63a26cbce826d5bb637d2deb0361f7f82a2050
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Aug 29 19:22:56 2024 +0200
- updated to 0.18.1 (new api version 0.18)
gcc-13.patch | 52 ---------------------------------------------
liborcus-flags.patch | 10 ++++-----
liborcus.spec | 60 +++++++++++++++++++++++++---------------------------
3 files changed, 34 insertions(+), 88 deletions(-)
---
diff --git a/liborcus.spec b/liborcus.spec
index d4a0e7a..b629562 100644
--- a/liborcus.spec
+++ b/liborcus.spec
@@ -9,27 +9,26 @@ Summary: Standalone file import filter library for spreadsheet documents
Summary(pl.UTF-8): Biblioteka samodzielnego filtra importującego pliki dla arkuszy kalkulacyjnych
Name: liborcus
# keep in sync with BuildRequires in libreoffice.spec
-Version: 0.17.2
-Release: 2
+Version: 0.18.1
+Release: 1
License: MPL v2.0
Group: Libraries
#Source0Download: https://gitlab.com/orcus/orcus/-/releases
Source0: https://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz
-# Source0-md5: 4df3646ca736fa0d04965e25fee4898e
+# Source0-md5: bcfdf8223bda9b07f802d121a2ff6716
Patch0: %{name}-flags.patch
-Patch1: gcc-13.patch
URL: https://gitlab.com/orcus/orcus
BuildRequires: autoconf >= 2.65
BuildRequires: automake >= 1:1.11
BuildRequires: boost-devel >= 1.36
%if %{with ixion}
-BuildRequires: ixion-devel >= 0.17.0
-BuildRequires: ixion-devel < 0.18
+BuildRequires: ixion-devel >= 0.18.0
+BuildRequires: ixion-devel < 0.19
%endif
BuildRequires: libstdc++-devel >= 6:7
BuildRequires: libtool >= 2:1.5
-BuildRequires: mdds-devel >= 2.0.0
-BuildRequires: mdds-devel < 2.1
+BuildRequires: mdds-devel >= 2.1.0
+BuildRequires: mdds-devel < 2.2
BuildRequires: pkgconfig >= 1:0.20
%{?with_python:BuildRequires: python3-devel >= 1:3.2}
BuildRequires: rpm-build >= 4.6
@@ -88,7 +87,7 @@ Summary: liborcus spreadsheet model library
Summary(pl.UTF-8): Biblioteka liborcus spreadsheet model
Group: Libraries
Requires: %{name} = %{version}-%{release}
-Requires: ixion >= 0.17.0
+Requires: ixion >= 0.18.0
%description spreadsheet
liborcus spreadsheet model library.
@@ -102,7 +101,7 @@ Summary(pl.UTF-8): Pliki programistyczne biblioteki liborcus spreadsheet model
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
Requires: %{name}-spreadsheet = %{version}-%{release}
-Requires: ixion-devel >= 0.17.0
+Requires: ixion-devel >= 0.18.0
%description spreadsheet-devel
Development files for liborcus spreadsheet model library.
@@ -150,7 +149,6 @@ Wiązanie Pythona 3 do biblioteki liborcus.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%{__libtoolize}
@@ -165,7 +163,7 @@ Wiązanie Pythona 3 do biblioteki liborcus.
%{!?with_python:--disable-python} \
--disable-silent-rules \
%{!?with_ixion:--disable-spreadsheet-model} \
- %{!?with_static_libs:--disable-static} \
+ %{?with_static_libs:--enable-static} \
--disable-werror \
--with-pic
@@ -214,27 +212,27 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/orcus-mso-encryption
%attr(755,root,root) %{_bindir}/orcus-yaml
%attr(755,root,root) %{_bindir}/orcus-zip-dump
-%attr(755,root,root) %{_libdir}/liborcus-0.17.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-0.17.so.0
-%attr(755,root,root) %{_libdir}/liborcus-mso-0.17.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-mso-0.17.so.0
-%attr(755,root,root) %{_libdir}/liborcus-parser-0.17.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-parser-0.17.so.0
+%attr(755,root,root) %{_libdir}/liborcus-0.18.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-0.18.so.0
+%attr(755,root,root) %{_libdir}/liborcus-mso-0.18.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-mso-0.18.so.0
+%attr(755,root,root) %{_libdir}/liborcus-parser-0.18.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-parser-0.18.so.0
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/liborcus-0.17.so
-%attr(755,root,root) %{_libdir}/liborcus-mso-0.17.so
-%attr(755,root,root) %{_libdir}/liborcus-parser-0.17.so
-%{_includedir}/liborcus-0.17
-%{_pkgconfigdir}/liborcus-0.17.pc
+%attr(755,root,root) %{_libdir}/liborcus-0.18.so
+%attr(755,root,root) %{_libdir}/liborcus-mso-0.18.so
+%attr(755,root,root) %{_libdir}/liborcus-parser-0.18.so
+%{_includedir}/liborcus-0.18
+%{_pkgconfigdir}/liborcus-0.18.pc
%if %{with static_libs}
%files static
%defattr(644,root,root,755)
-%{_libdir}/liborcus-0.17.a
-%{_libdir}/liborcus-mso-0.17.a
-%{_libdir}/liborcus-parser-0.17.a
+%{_libdir}/liborcus-0.18.a
+%{_libdir}/liborcus-mso-0.18.a
+%{_libdir}/liborcus-parser-0.18.a
%endif
%if %{with ixion}
@@ -248,18 +246,18 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/orcus-xls-xml
%attr(755,root,root) %{_bindir}/orcus-xlsx
%attr(755,root,root) %{_bindir}/orcus-xml
-%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.17.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-spreadsheet-model-0.17.so.0
+%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.18.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-spreadsheet-model-0.18.so.0
%files spreadsheet-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.17.so
-%{_pkgconfigdir}/liborcus-spreadsheet-model-0.17.pc
+%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.18.so
+%{_pkgconfigdir}/liborcus-spreadsheet-model-0.18.pc
%if %{with static_libs}
%files spreadsheet-static
%defattr(644,root,root,755)
-%{_libdir}/liborcus-spreadsheet-model-0.17.a
+%{_libdir}/liborcus-spreadsheet-model-0.18.a
%endif
%endif
diff --git a/gcc-13.patch b/gcc-13.patch
deleted file mode 100644
index ada4416..0000000
--- a/gcc-13.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From fa68d6a76778df26e41108e3400f4a907e351203 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida at gmail.com>
-Date: Tue, 19 Jul 2022 21:11:16 -0400
-Subject: [PATCH] Explicitly include <cstdint> header with GCC 13 (#162)
-
-c.f. https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
----
- include/orcus/types.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/orcus/types.hpp b/include/orcus/types.hpp
-index f5ec320de..46edd1ca0 100644
---- a/include/orcus/types.hpp
-+++ b/include/orcus/types.hpp
-@@ -8,6 +8,7 @@
- #ifndef INCLUDED_ORCUS_TYPES_HPP
- #define INCLUDED_ORCUS_TYPES_HPP
-
-+#include <cstdint>
- #include <cstdlib>
- #include <vector>
- #include <string>
---
-GitLab
-
-From ce66c0fb64c667e78476f8611eb5f097ec572f0a Mon Sep 17 00:00:00 2001
-From: WANG Xuerui <xen0n at gentoo.org>
-Date: Tue, 23 Aug 2022 15:35:38 +0800
-Subject: [PATCH] Include <cstdint> in base64.hpp too
-
-This is also necessary for building with gcc-13.
-
-Signed-off-by: WANG Xuerui <xen0n at gentoo.org>
----
- include/orcus/base64.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/orcus/base64.hpp b/include/orcus/base64.hpp
-index f880b7fe7..44c70175d 100644
---- a/include/orcus/base64.hpp
-+++ b/include/orcus/base64.hpp
-@@ -9,6 +9,7 @@
- #define __ORCUS_BASE64_HPP__
-
- #include "env.hpp"
-+#include <cstdint>
- #include <vector>
- #include <string>
-
---
-GitLab
-
diff --git a/liborcus-flags.patch b/liborcus-flags.patch
index c77647e..aef2fba 100644
--- a/liborcus-flags.patch
+++ b/liborcus-flags.patch
@@ -1,11 +1,11 @@
---- liborcus-0.16.1/configure.ac.orig 2020-10-31 08:29:30.443076469 +0100
-+++ liborcus-0.16.1/configure.ac 2020-10-31 08:30:02.636235397 +0100
-@@ -112,10 +112,9 @@
+--- liborcus-0.18.1/configure.ac.orig 2024-08-29 18:05:17.828527833 +0200
++++ liborcus-0.18.1/configure.ac 2024-08-29 18:11:03.589288016 +0200
+@@ -109,10 +109,9 @@ AC_ARG_ENABLE(debug,
[enable_debug=no]
)
AS_IF([test "x$enable_debug" != "xno"], [
-- CXXFLAGS="$CXXFLAGS -g -O0 -DMDDS_ASSERT_STRING_MAP"
-+ CXXFLAGS="$CXXFLAGS -g -DMDDS_ASSERT_STRING_MAP"
+- CXXFLAGS="$CXXFLAGS -g -O0"
++ CXXFLAGS="$CXXFLAGS -g"
enable_debug_utils=yes
], [
- CXXFLAGS="$CXXFLAGS -O2"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/liborcus.git/commitdiff/8b63a26cbce826d5bb637d2deb0361f7f82a2050
More information about the pld-cvs-commit
mailing list