From 3fe8d2707d7ce24cce8f5d7eaa16b0b68cbaa2a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 20 Feb 2024 23:40:15 +0000 Subject: gentoo auto-resync : 20:02:2024 - 23:40:15 --- dev-libs/liborcus/Manifest | 7 --- .../liborcus/files/liborcus-0.17.0-test-fix.patch | 51 ---------------- .../liborcus/files/liborcus-0.17.2-clang.patch | 26 -------- .../liborcus/files/liborcus-0.17.2-gcc-13.patch | 29 --------- .../liborcus/files/liborcus-0.17.2-gcc-14.patch | 21 ------- .../files/liborcus-0.17.2-python-optional.patch | 26 -------- dev-libs/liborcus/liborcus-0.17.2-r1.ebuild | 71 ---------------------- 7 files changed, 231 deletions(-) delete mode 100644 dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch delete mode 100644 dev-libs/liborcus/files/liborcus-0.17.2-clang.patch delete mode 100644 dev-libs/liborcus/files/liborcus-0.17.2-gcc-13.patch delete mode 100644 dev-libs/liborcus/files/liborcus-0.17.2-gcc-14.patch delete mode 100644 dev-libs/liborcus/files/liborcus-0.17.2-python-optional.patch delete mode 100644 dev-libs/liborcus/liborcus-0.17.2-r1.ebuild (limited to 'dev-libs/liborcus') diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest index 0859d09f70a8..2beacaa6f00b 100644 --- a/dev-libs/liborcus/Manifest +++ b/dev-libs/liborcus/Manifest @@ -1,11 +1,4 @@ -AUX liborcus-0.17.0-test-fix.patch 1691 BLAKE2B eff681313577d7964eb9c58bf9e2e68951ea6430303b81cefc26ef1e63337188f415b4a5f2b44cbe44111776c99ade992aa40ca6692e126608a9d15bd89fb44b SHA512 fb46233985a69fc9b5991efddf9e855217b4641eb558aa1b5df7bed4d1639e702500b03ce8526cdcee9cd22f139b4efabef18aa36367f840754aee49b3ec9f66 -AUX liborcus-0.17.2-clang.patch 1095 BLAKE2B 8ed1904f8e2d35447ad5275b5dc58f1ba72416872d8995baa1243c27d135f682780aa3504fff9fb82d2341371b7f021f1e7826a332f3e9f0fdb68c7e45fb67a1 SHA512 c22d38d5fc947a3e02047cc1bf2f9661ea60920faa57b038a344cd500d6bfd42a7298a62bdb4ed9f580916b523837f3af2a9edc4ed4091d2a36069063689dfa6 -AUX liborcus-0.17.2-gcc-13.patch 843 BLAKE2B 80d9c07b9497ee4322f5c0c2faf3c967773e23cad20e8107e274c4e781974c6a658ac5452b3f28ad6e978f8b6459c7dfcc6476ce2ab0a6846adbe646c4218a25 SHA512 caa36e269a88f380bb8848a28e44d92f93ba0b363a27f4ea2db4de4c91b2e11e25a2c0b170c150f25c15ca609fd55511c06f9bebf178aa30e3ddfab6af5f381a -AUX liborcus-0.17.2-gcc-14.patch 720 BLAKE2B 71c053130f2655b237fa017d2ec72f44f6357d0b58c9c8f348caaeb66260453576cd94563af29ab24706aa45be5bb6ea3e0832ef737af36e282038491982524e SHA512 ac4497ca9a881e52909abbed8844d067d2b8d040a9a11f945ac301a7845bfeaf54960926c31b4caf10204563ef81039cd15b021f1f32dc5baba859a30a9fbfe8 -AUX liborcus-0.17.2-python-optional.patch 681 BLAKE2B 2338884cd5e694c850cd63b85db466c4f296020b9f8fef5c547dadabd6b45d7936f5f64a1f1a920024a1e06d7d49d629ae4b8fca392500ea8be769ae2a0f3151 SHA512 d47de37c0eba4e6edf698d2ce67e21621f1ba9a5ded0984d1c006f0254e79756b42ce41de20c35a2c592fc62d67da132979ead14ccaf8882c85bd2b0912ac473 -DIST liborcus-0.17.2.tar.xz 1839188 BLAKE2B d274e3af71df16866e305403d63d3978613915753412ac9de19d7de7802930c3886d8653d6d48a8d9a971dc0ee284f8f83af8dc07850b5f28fcdab2815b6d9b2 SHA512 8ad8db46c23673260057aff555286d95ebfeff0a027bdeae24f11f8aa12456284f7f4446edddb91936b3011eb1227cfe1618ab3c4d909f8356c8c151f5739d79 DIST liborcus-0.19.2.tar.xz 2211268 BLAKE2B 4ee3fd2fb122d3a9840cb92452bf8a6d3d54b7b50a32be84e1bb08dfe2e2abc2de80098d9460b6bd82d0249304a7ba5c39b18ace3f69150ba71e16ef14795ca4 SHA512 c955490f57e91615278a83bb48726025cd5f8059b97ed5532f770199e134ca511c7ee6b0cd0a9d3a2d54208a5fdd19117054e95e818162ea568052fa11b21d4e -EBUILD liborcus-0.17.2-r1.ebuild 1526 BLAKE2B 234852ad4fc1f27d4d798002ae8298600a6bb99449d891ffed5e1fadd712d909e0dba233bc2ef1f061f1a4065fc43dfe44cb39bc9de60c722a90a3602015a4f5 SHA512 b38f8f96a4a53d8e5150074cd6d1137f984464df4e9bbb316d65aa03e4819aa72d2ce48b8bedb83283fd08ab53e00142ccd683d751b747eb87a2094b0d58ea42 EBUILD liborcus-0.19.2.ebuild 1328 BLAKE2B c1ea6854b837ab60a668d69021d80e6a033c136dbc05728eb1fcda225826ea75cf0c825b457a643fdea5727c39d1f382e56a8c69440f691781a6f184a7248657 SHA512 20c743c8468b0447847d7837ad6ccc533663faee4262f909d8d50f01b5e0df0afc63cf811eec2c9d7ba01b3ec21a2c7fa34f9e746b063edcadad6392fe58167f EBUILD liborcus-9999.ebuild 1354 BLAKE2B 037783df1a45f3b788aacdd4ddc85ad506bf39b2ca67ccba83749e068ac697d1217efec8a54e0eb884a16f65feced6d87f3a73eddf1252f374d97f6b146056ad SHA512 4563e04c0ee5625bffa371b69fdea1eb4bcb07cd27f3b73a0f3ad7057d481eabfb79244743a5a48d0cf745d3defb156f4245e58a558e3d18f8aed06ad476060f MISC metadata.xml 557 BLAKE2B b8dd01b0df50a1c6dafedc40f4cebbbd7851ee67fd1ac94f4c8107f052db8721ce12b0ae486e42f459e0b5d337525edc0359e9e94b8da1261e3521c11f66ef64 SHA512 2eca4f5fd25121bdb3ecb9470b66c2c5373ab266c53bf7af55b3f46245ad6973f3cd65ff80c6d1c33cb738136cddf22489b61dc1863701225842ca9dfa4e2c9d diff --git a/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch b/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch deleted file mode 100644 index 1de33a7e3f4c..000000000000 --- a/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch +++ /dev/null @@ -1,51 +0,0 @@ -# https://bugs.gentoo.org/713586 - -[PATCH] Build orcus-env-dump unconditionally - -The rule for `orcus-env-dump.o` is guarded by `if WITH_TOOLS` however, -the rule for the executable `orcus-env-dump` is not. This leads to -linking errors when running the test suite without tools. - -Move the rule for `orcus-env-dump.o` out of the if WITH_TOOLS block to -always build it. ---- - src/Makefile.am | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -25,6 +25,16 @@ orcus_test_xml_LDADD = \ - - orcus_test_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) -DSRCDIR=\""$(top_srcdir)"\" - -+#---------------------------------------------------------------------------- -+ -+# orcus-env-dump -+ -+orcus_env_dump_SOURCES = orcus_env_dump.cpp -+orcus_env_dump_LDADD = \ -+ parser/liborcus-parser-@ORCUS_API_VERSION@.la \ -+ liborcus/liborcus-@ORCUS_API_VERSION@.la -+orcus_env_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) -+ - - TESTS = \ - orcus-test-xml \ -@@ -136,16 +146,6 @@ orcus_detect_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS - - #---------------------------------------------------------------------------- - --# orcus-env-dump -- --orcus_env_dump_SOURCES = orcus_env_dump.cpp --orcus_env_dump_LDADD = \ -- parser/liborcus-parser-@ORCUS_API_VERSION@.la \ -- liborcus/liborcus-@ORCUS_API_VERSION@.la --orcus_env_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) -- --#---------------------------------------------------------------------------- -- - if BUILD_SPREADSHEET_MODEL - - orcus_json_LDADD += \ diff --git a/dev-libs/liborcus/files/liborcus-0.17.2-clang.patch b/dev-libs/liborcus/files/liborcus-0.17.2-clang.patch deleted file mode 100644 index 62950cfcecb9..000000000000 --- a/dev-libs/liborcus/files/liborcus-0.17.2-clang.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://gitlab.com/orcus/orcus/-/commit/469aca3c76965b9031947506a15d940cbcd11cdb - -From: Tom Stellard -Date: Mon, 16 May 2022 22:12:30 +0000 -Subject: [PATCH] Fix error when compiling with clang - -csv.cpp:83:29: error: non-constant-expression cannot be narrowed from type 'Py_ssize_t' (aka 'long') to 'std::basic_string_view::size_type' (aka 'unsigned long') in initializer list [-Wc++11-narrowing] - app.read_stream({p, n}); - ^ -csv.cpp:83:29: note: insert an explicit cast to silence this issue - app.read_stream({p, n}); - ^ - static_cast( ) -1 error generated. ---- a/src/python/csv.cpp -+++ b/src/python/csv.cpp -@@ -80,7 +80,7 @@ PyObject* csv_read(PyObject* /*module*/, PyObject* args, PyObject* kwargs) - - Py_ssize_t n = 0; - const char* p = PyUnicode_AsUTF8AndSize(str.get(), &n); -- app.read_stream({p, n}); -+ app.read_stream({p, static_cast(n)}); - - return create_document(std::move(doc)); - } -GitLab diff --git a/dev-libs/liborcus/files/liborcus-0.17.2-gcc-13.patch b/dev-libs/liborcus/files/liborcus-0.17.2-gcc-13.patch deleted file mode 100644 index fa4892053b10..000000000000 --- a/dev-libs/liborcus/files/liborcus-0.17.2-gcc-13.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://gitlab.com/orcus/orcus/-/commit/fa68d6a76778df26e41108e3400f4a907e351203 -https://gitlab.com/orcus/orcus/-/merge_requests/136 - -From fa68d6a76778df26e41108e3400f4a907e351203 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida -Date: Tue, 19 Jul 2022 21:11:16 -0400 -Subject: [PATCH] Explicitly include header with GCC 13 (#162) - -c.f. https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes ---- a/include/orcus/base64.hpp -+++ b/include/orcus/base64.hpp -@@ -9,6 +9,7 @@ - #define __ORCUS_BASE64_HPP__ - - #include "env.hpp" -+#include - #include - #include - ---- 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 - #include - #include - #include diff --git a/dev-libs/liborcus/files/liborcus-0.17.2-gcc-14.patch b/dev-libs/liborcus/files/liborcus-0.17.2-gcc-14.patch deleted file mode 100644 index a8455c9dff71..000000000000 --- a/dev-libs/liborcus/files/liborcus-0.17.2-gcc-14.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://gitlab.com/orcus/orcus/-/commit/f5dca3b4f7c6ffda4b71e0ba9f7081ab2eec3405 -https://gitlab.com/orcus/orcus/-/issues/192 -https://bugs.gentoo.org/916582 - -From f5dca3b4f7c6ffda4b71e0ba9f7081ab2eec3405 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida -Date: Thu, 26 Oct 2023 22:09:30 -0400 -Subject: [PATCH] Attempt to fix a build failure with GCC 14 as reported in #192 - -diff --git a/src/spreadsheet/document.cpp b/src/spreadsheet/document.cpp -index 1cf240a..562be32 100644 ---- a/src/spreadsheet/document.cpp -+++ b/src/spreadsheet/document.cpp -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - using namespace std; - namespace fs = boost::filesystem; diff --git a/dev-libs/liborcus/files/liborcus-0.17.2-python-optional.patch b/dev-libs/liborcus/files/liborcus-0.17.2-python-optional.patch deleted file mode 100644 index 9473958c196a..000000000000 --- a/dev-libs/liborcus/files/liborcus-0.17.2-python-optional.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 14d15bf331b5cc3ca2c1cdb8097dfe918173cba1 Mon Sep 17 00:00:00 2001 -From: matoro <11910244-matoro3@users.noreply.gitlab.com> -Date: Wed, 24 Aug 2022 13:42:27 -0400 -Subject: [PATCH] Only recurse into src/python when BUILD_PYTHON is set - ---- - src/Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index d586299c..7e44aed8 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,4 +1,8 @@ --SUBDIRS = include test parser mso liborcus spreadsheet python -+SUBDIRS = include test parser mso liborcus spreadsheet -+ -+if BUILD_PYTHON -+SUBDIRS += python -+endif - - AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ --- -GitLab - diff --git a/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild b/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild deleted file mode 100644 index 61ab30e5ff93..000000000000 --- a/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools python-single-r1 - -DESCRIPTION="Standalone file import filter library for spreadsheet documents" -HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" - -if [[ ${PV} == *9999* ]]; then - MDDS_SLOT="1/2.0" - EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" - inherit git-r3 -else - MDDS_SLOT="1/2.0" - SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" -fi - -LICENSE="MIT" -SLOT="0/0.17" # based on SONAME of liborcus.so -IUSE="python +spreadsheet-model test tools" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/boost:=[zlib(+)] - sys-libs/zlib - python? ( ${PYTHON_DEPS} ) - spreadsheet-model? ( dev-libs/libixion:${SLOT} ) -" -DEPEND="${RDEPEND} - dev-util/mdds:${MDDS_SLOT} -" - -PATCHES=( - "${FILESDIR}"/${P}-clang.patch - "${FILESDIR}"/${P}-gcc-13.patch - "${FILESDIR}"/${P}-gcc-14.patch - "${FILESDIR}"/${P}-python-optional.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # bug 713586 - use test && eapply "${FILESDIR}/${PN}-0.17.0-test-fix.patch" - - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-werror - $(use_enable python) - $(use_enable spreadsheet-model) - $(use_with tools) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die -} -- cgit v1.2.3