diff --git a/liborcus-0.16.1-gcc-11.1.0.patch b/liborcus-0.16.1-gcc-11.1.0.patch deleted file mode 100644 index 0a9700c..0000000 --- a/liborcus-0.16.1-gcc-11.1.0.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- liborcus-0.16.1/src/liborcus/orcus_xlsx.cpp.orig 2021-06-12 13:07:43.538046287 +0100 -+++ liborcus-0.16.1/src/liborcus/orcus_xlsx.cpp 2021-06-12 13:04:47.582553788 +0100 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - using namespace std; - ---- liborcus-0.16.1/src/liborcus/xls_xml_context.cpp.orig 2021-06-12 13:15:25.390761088 +0100 -+++ liborcus-0.16.1/src/liborcus/xls_xml_context.cpp 2021-06-12 13:15:40.979047827 +0100 -@@ -16,6 +16,7 @@ - #include - - #include -+#include - - using namespace std; - namespace ss = orcus::spreadsheet; ---- liborcus-0.16.1/src/liborcus/xlsx_revision_context.cpp.orig 2021-06-12 13:08:08.410530072 +0100 -+++ liborcus-0.16.1/src/liborcus/xlsx_revision_context.cpp 2021-06-12 13:08:22.426801761 +0100 -@@ -16,6 +16,7 @@ - #include "orcus/global.hpp" - - #include -+#include - - using namespace std; - diff --git a/liborcus-0.3.0-libboost-1.52.patch b/liborcus-0.3.0-libboost-1.52.patch deleted file mode 100644 index 8909949..0000000 --- a/liborcus-0.3.0-libboost-1.52.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- liborcus_0.3.0.orig/src/liborcus/dom_tree.cpp 2012-11-28 13:21:10.000000000 +0100 -+++ liborcus_0.3.0/src/liborcus/dom_tree.cpp 2013-02-12 22:34:45.213647053 +0100 -@@ -28,6 +28,7 @@ - #include "orcus/dom_tree.hpp" - #include "orcus/exception.hpp" - #include "orcus/xml_namespace.hpp" -+#include "boost/noncopyable.hpp" - - #include "string_pool.hpp" - diff --git a/liborcus-0.5.1-libmdds-0.8.patch b/liborcus-0.5.1-libmdds-0.8.patch deleted file mode 100644 index 51b37b8..0000000 --- a/liborcus-0.5.1-libmdds-0.8.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- liborcus-0.5.1/src/spreadsheet/sheet.cpp.orig 2013-08-08 10:18:56.779004541 +0200 -+++ liborcus-0.5.1/src/spreadsheet/sheet.cpp 2013-08-08 10:19:02.839946649 +0200 -@@ -734,7 +734,7 @@ - con.build_tree(); - - size_t index; -- if (!con.search_tree(col, index)) -+ if (!con.search_tree(row, index).second) - return 0; - - return index; diff --git a/liborcus-0.7.0-gcc-5.3.patch b/liborcus-0.7.0-gcc-5.3.patch deleted file mode 100644 index aba44e2..0000000 --- a/liborcus-0.7.0-gcc-5.3.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/configure -+++ b/configure -@@ -14842,7 +14842,7 @@ else - #include - boost-lib-version = BOOST_LIB_VERSION - _ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+if (eval "$ac_cpp -P conftest.$ac_ext") 2>&5 | - tr -d '\r' | - $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then : - boost_cv_lib_version=`cat conftest.i` ---- a/m4/boost.m4 -+++ b/m4/boost.m4 -@@ -71,7 +71,7 @@ dnl strip `\n' with backquotes, not the - dnl boost_cv_lib_version='1_37\r' for instance, which breaks - dnl everything else. - dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK --(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | -+(eval "$ac_cpp -P conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | - tr -d '\r' | - $SED -n -e "$1" >conftest.i 2>&1], - [$3], diff --git a/liborcus-0.7.0-libboost-1.56.patch b/liborcus-0.7.0-libboost-1.56.patch deleted file mode 100644 index f72d66b..0000000 --- a/liborcus-0.7.0-libboost-1.56.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c01874c7770f4f56c031d7463156e03f2945e015 Mon Sep 17 00:00:00 2001 -From: Dmitry Roshchin -Date: Mon, 27 Oct 2014 16:19:32 +0300 -Subject: [PATCH] Fix build with boost 1.56 - ---- - src/parser/string_pool_test.cpp | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/parser/string_pool_test.cpp b/src/parser/string_pool_test.cpp -index ad7d7c8..0d32c62 100644 ---- a/src/parser/string_pool_test.cpp -+++ b/src/parser/string_pool_test.cpp -@@ -5,6 +5,8 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -+#include -+ - #include "orcus/string_pool.hpp" - #include "orcus/pstring.hpp" - --- -1.7.1 - diff --git a/liborcus.spec b/liborcus.spec index 7abb189..103c0dd 100644 --- a/liborcus.spec +++ b/liborcus.spec @@ -1,6 +1,6 @@ Name: liborcus Version: 0.19.2 -Release: 1mamba +Release: 2mamba Summary: Standalone file import filter library for spreadsheet documents Group: System/Libraries Vendor: openmamba @@ -8,19 +8,14 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://gitlab.com/orcus/orcus Source: https://dev-www.libreoffice.org/src/liborcus-%{version}.tar.xz -Patch0: liborcus-0.3.0-libboost-1.52.patch -Patch1: liborcus-0.5.1-libmdds-0.8.patch Patch2: liborcus-0.5.1-libboost-1.54.patch -Patch3: liborcus-0.7.0-libboost-1.56.patch -Patch4: liborcus-0.7.0-gcc-5.3.patch -Patch5: liborcus-0.16.1-gcc-11.1.0.patch License: MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libboost-devel BuildRequires: libgcc BuildRequires: libixion-devel -BuildRequires: libpython310-devel +BuildRequires: libpython311-devel BuildRequires: libstdc++6-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END @@ -52,13 +47,13 @@ This package contains utility applications for %{name}. %setup -q #-D -T #:<< _EOF -%patch 2 -p1 +#%patch 2 -p1 ./autogen.sh %build %configure \ - PYTHON=%{__python310} + PYTHON=%{__python3} %make @@ -75,10 +70,10 @@ This package contains utility applications for %{name}. %files %defattr(-,root,root) %{_libdir}/liborcus-*.so.* -%dir %{python310_sitelib}/orcus -%{python310_sitelib}/orcus/* -%{python310_sitearch}/_orcus.* -%{python310_sitearch}/_orcus_json.* +%dir %{python3_sitelib}/orcus +%{python3_sitelib}/orcus/* +%{python3_sitearch}/_orcus.* +%{python3_sitearch}/_orcus_json.* %doc AUTHORS %files devel @@ -89,7 +84,6 @@ This package contains utility applications for %{name}. %{_includedir}/liborcus-*/orcus/detail/thread.hpp %dir %{_includedir}/liborcus-*/orcus/spreadsheet %{_includedir}/liborcus-*/orcus/spreadsheet/*.hpp -#%{_libdir}/liborcus-*.a %{_libdir}/liborcus-*.so %{_libdir}/pkgconfig/liborcus-*.pc @@ -98,6 +92,9 @@ This package contains utility applications for %{name}. %{_bindir}/orcus-* %changelog +* Fri Jan 26 2024 Silvan Calarco 0.19.2-2mamba +- rebuilt with python3 == 3.11 + * Sat Nov 11 2023 Automatic Build System 0.19.2-1mamba - automatic version update by autodist