Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package liborcus for openSUSE:Factory checked in at 2023-08-12 15:06:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liborcus (Old) and /work/SRC/openSUSE:Factory/.liborcus.new.11712 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "liborcus" Sat Aug 12 15:06:01 2023 rev:41 rq:1103506 version:0.18.1 Changes: -------- --- /work/SRC/openSUSE:Factory/liborcus/liborcus.changes 2023-08-11 15:55:31.811761615 +0200 +++ /work/SRC/openSUSE:Factory/.liborcus.new.11712/liborcus.changes 2023-08-12 15:06:09.426490023 +0200 @@ -1,0 +2,14 @@ +Fri Aug 11 14:29:57 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Removed patches: + * liborcus-filesystem.patch + * liborcus-tests.patch + + reworked in order to send them upstream +- Added patches: + * 0001-Possibility-to-build-against-a-host-of-filesystem-im.patch + * 0003-Allow-running-tests-with-python-3.4.patch + * 0002-Allow-using-older-boost-filesystem.patch + + split into chunks per topic so that upsteam can decide what + to do + +------------------------------------------------------------------- Old: ---- liborcus-filesystem.patch liborcus-tests.patch New: ---- 0001-Possibility-to-build-against-a-host-of-filesystem-im.patch 0002-Allow-using-older-boost-filesystem.patch 0003-Allow-running-tests-with-python-3.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liborcus.spec ++++++ --- /var/tmp/diff_new_pack.fZJWK3/_old 2023-08-12 15:06:10.778498758 +0200 +++ /var/tmp/diff_new_pack.fZJWK3/_new 2023-08-12 15:06:10.790498835 +0200 @@ -26,8 +26,9 @@ License: MPL-2.0 URL: https://gitlab.com/orcus/orcus/ Source: http://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz -Patch0: liborcus-filesystem.patch -Patch1: liborcus-tests.patch +Patch0: 0001-Possibility-to-build-against-a-host-of-filesystem-im.patch +Patch1: 0002-Allow-using-older-boost-filesystem.patch +Patch2: 0003-Allow-running-tests-with-python-3.4.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: coreutils @@ -43,7 +44,6 @@ BuildRequires: gcc >= 7 BuildRequires: gcc-c++ >= 7 BuildRequires: libboost_date_time-devel -BuildRequires: libboost_filesystem-devel BuildRequires: libboost_iostreams-devel BuildRequires: libboost_program_options-devel BuildRequires: libboost_system-devel @@ -91,11 +91,11 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %global optflags %{optflags} -fexcess-precision=fast -libtoolize --force --copy -autoreconf -fi +NOCONFIGURE=indeed ./autogen.sh %if 0%{?suse_version} < 1500 export CC=gcc-7 export CXX=g++-7 ++++++ 0001-Possibility-to-build-against-a-host-of-filesystem-im.patch ++++++ ++++ 1743 lines (skipped) ++++++ 0002-Allow-using-older-boost-filesystem.patch ++++++ >From 24e8e72332c5784c3b2a0566ecaae74b7d0a7559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch> Date: Fri, 11 Aug 2023 12:24:26 +0200 Subject: [PATCH 2/3] Allow using older boost::filesystem --- src/liborcus/format_detection_test.cpp | 3 ++- src/liborcus/json_structure_tree_test.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/liborcus/format_detection_test.cpp b/src/liborcus/format_detection_test.cpp index c62ec8a2..5026624c 100644 --- a/src/liborcus/format_detection_test.cpp +++ b/src/liborcus/format_detection_test.cpp @@ -57,8 +57,9 @@ void test_invalids() // Bail out silently. return; - for (const fs::path& p : fs::directory_iterator(root_dir)) + for (fs::directory_iterator itr(root_dir); itr!=fs::directory_iterator(); ++itr) { + const fs::path& p = itr->path(); orcus::file_content content(p.string()); assert(!content.empty()); diff --git a/src/liborcus/json_structure_tree_test.cpp b/src/liborcus/json_structure_tree_test.cpp index d71bb214..0dd899ae 100644 --- a/src/liborcus/json_structure_tree_test.cpp +++ b/src/liborcus/json_structure_tree_test.cpp @@ -49,8 +49,9 @@ void test_no_value_nodes() { fs::path base_dir(SRCDIR"/test/json-structure/no-value-nodes"); - for (const fs::path& p : fs::directory_iterator(base_dir)) + for (fs::directory_iterator itr(base_dir); itr!=fs::directory_iterator(); ++itr) { + const fs::path& p = itr->path(); if (!fs::is_regular_file(p)) continue; -- 2.41.0 ++++++ 0003-Allow-running-tests-with-python-3.4.patch ++++++ >From a083266479ac7b3023cb4dd2d19e27e5ac4b565c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch> Date: Fri, 11 Aug 2023 12:25:10 +0200 Subject: [PATCH 3/3] Allow running tests with python 3.4 --- test/python/file_load_common.py | 6 +++--- test/python/test_module.py | 4 ++-- test/python/test_ods.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/python/file_load_common.py b/test/python/file_load_common.py index 55874050..934ce2a8 100644 --- a/test/python/file_load_common.py +++ b/test/python/file_load_common.py @@ -202,14 +202,14 @@ def run_test_dir(self, test_dir, doc_loader): """ print("test directory: {}".format(test_dir)) - expected = ExpectedDocument(os.path.join(test_dir, "check.txt")) + expected = ExpectedDocument(os.path.join(str(test_dir), "check.txt")) # Find the input file to load. input_file = None - for file_name in os.listdir(test_dir): + for file_name in os.listdir(str(test_dir)): name, ext = os.path.splitext(file_name) if name == "input": - input_file = os.path.join(test_dir, file_name) + input_file = os.path.join(str(test_dir), file_name) break print("input file: {}".format(input_file)) diff --git a/test/python/test_module.py b/test/python/test_module.py index 2d6ca4be..ccfbb6c6 100755 --- a/test/python/test_module.py +++ b/test/python/test_module.py @@ -20,12 +20,12 @@ class ModuleTest(unittest.TestCase): @classmethod def setUpClass(cls): top_builddir = Path(os.environ["BUILDDIR"]) - with open(top_builddir / "test" / "python" / "env.json", "r") as f: + with open(str(top_builddir / "test" / "python" / "env.json"), "r") as f: cls.env = json.load(f) def test_version(self): s = orcus.__version__ - expected = f"{self.env['version-major']}.{self.env['version-minor']}.{self.env['version-micro']}" + expected = "{}.{}.{}".format(self.env['version-major'], self.env['version-minor'], self.env['version-micro']) self.assertEqual(expected, s) def test_detect_format(self): diff --git a/test/python/test_ods.py b/test/python/test_ods.py index e4c0dc97..29ab10a8 100755 --- a/test/python/test_ods.py +++ b/test/python/test_ods.py @@ -31,7 +31,7 @@ class TestCase(unittest.TestCase): def test_formula_tokens_1(self): filepath = self.basedir / "formula-1" / "input.ods" - with open(filepath, "rb") as f: + with open(str(filepath), "rb") as f: doc = ods.read(f, recalc=False) self.assertEqual(len(doc.sheets), 1) @@ -82,7 +82,7 @@ class TestCase(unittest.TestCase): def test_formula_tokens_2(self): filepath = self.basedir / "formula-2" / "input.ods" - with open(filepath, "rb") as f: + with open(str(filepath), "rb") as f: doc = ods.read(f, recalc=False) self.assertEqual(len(doc.sheets), 1) -- 2.41.0
