public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/, dev-libs/liborcus/files/
@ 2020-05-28 17:09 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-05-28 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     d131fa2acad53017e0374759dd5f2f0766ecabeb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 28 16:52:15 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 28 17:09:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d131fa2a

dev-libs/liborcus: Fix bashisms in configure.ac, --disable-static

Reported-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://bugs.gentoo.org/723130
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../liborcus/files/liborcus-0.15.4-bashism.patch   | 26 ++++++++++++++++++++++
 dev-libs/liborcus/liborcus-0.15.4.ebuild           | 14 +++++++-----
 dev-libs/liborcus/liborcus-9999.ebuild             |  8 +++----
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch b/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch
new file mode 100644
index 00000000000..cc201a5024e
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch
@@ -0,0 +1,26 @@
+From 7d2ae0b6e47aa0c1fc43a91300d82c5394420162 Mon Sep 17 00:00:00 2001
+From: Ryo ONODERA <ryo@tetera.org>
+Date: Sat, 11 Jan 2020 23:01:29 +0900
+Subject: [PATCH] Improve POSIX shell portability
+
+DO not use bash syntax.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index bc5dc195..a854c0c9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -322,7 +322,7 @@ AC_ARG_ENABLE([werror],
+ 	[enable_werror="$enableval"],
+ 	[enable_werror=no]
+ )
+-AS_IF([test x"$enable_werror" == "xyes"], [
++AS_IF([test x"$enable_werror" = "xyes"], [
+ 	CXXFLAGS="$CXXFLAGS -Werror"
+ ])
+ 
+-- 
+2.26.2
+

diff --git a/dev-libs/liborcus/liborcus-0.15.4.ebuild b/dev-libs/liborcus/liborcus-0.15.4.ebuild
index 231fb4345b5..999baa80ea0 100644
--- a/dev-libs/liborcus/liborcus-0.15.4.ebuild
+++ b/dev-libs/liborcus/liborcus-0.15.4.ebuild
@@ -4,14 +4,14 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1
+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
 	EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-	inherit git-r3 autotools
+	inherit git-r3
 else
 	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
 	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
@@ -19,7 +19,9 @@ fi
 
 LICENSE="MIT"
 SLOT="0/0.15" # based on SONAME of liborcus.so
-IUSE="python +spreadsheet-model static-libs tools"
+IUSE="python +spreadsheet-model tools"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/boost:=[zlib(+)]
@@ -31,7 +33,7 @@ DEPEND="${RDEPEND}
 	dev-util/mdds:1/1.5
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=( "${FILESDIR}/${P}-bashism.patch" ) # bug 723130
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -39,15 +41,15 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
 		--disable-werror
 		$(use_enable python)
 		$(use_enable spreadsheet-model)
-		$(use_enable static-libs static)
 		$(use_with tools)
 	)
 	econf "${myeconfargs[@]}"

diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index 0ae4b1aa76b..3aa2c7dcba2 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -21,7 +21,9 @@ fi
 
 LICENSE="MIT"
 SLOT="0/0.16" # based on SONAME of liborcus.so
-IUSE="python +spreadsheet-model static-libs tools"
+IUSE="python +spreadsheet-model tools"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/boost:=[zlib(+)]
@@ -33,8 +35,6 @@ DEPEND="${RDEPEND}
 	dev-util/mdds:${MDDS_SLOT}
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -46,10 +46,10 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
 		--disable-werror
 		$(use_enable python)
 		$(use_enable spreadsheet-model)
-		$(use_enable static-libs static)
 		$(use_with tools)
 	)
 	econf "${myeconfargs[@]}"


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/, dev-libs/liborcus/files/
@ 2024-02-20 20:49 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-02-20 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     e2b69b10888a5c03aa7e4750672da333a96e555c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 19:32:20 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 20:48:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2b69b10

dev-libs/liborcus: drop 0.17.2-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/liborcus/Manifest                         |  1 -
 .../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, 225 deletions(-)

diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 521c0a55f1a7..43b43bede6f9 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,2 +1 @@
-DIST liborcus-0.17.2.tar.xz 1839188 BLAKE2B d274e3af71df16866e305403d63d3978613915753412ac9de19d7de7802930c3886d8653d6d48a8d9a971dc0ee284f8f83af8dc07850b5f28fcdab2815b6d9b2 SHA512 8ad8db46c23673260057aff555286d95ebfeff0a027bdeae24f11f8aa12456284f7f4446edddb91936b3011eb1227cfe1618ab3c4d909f8356c8c151f5739d79
 DIST liborcus-0.19.2.tar.xz 2211268 BLAKE2B 4ee3fd2fb122d3a9840cb92452bf8a6d3d54b7b50a32be84e1bb08dfe2e2abc2de80098d9460b6bd82d0249304a7ba5c39b18ace3f69150ba71e16ef14795ca4 SHA512 c955490f57e91615278a83bb48726025cd5f8059b97ed5532f770199e134ca511c7ee6b0cd0a9d3a2d54208a5fdd19117054e95e818162ea568052fa11b21d4e

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 <tstellar@redhat.com>
-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<size_type>( )
-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<std::string_view::size_type>(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 <kohei.yoshida@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
---- 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>
- 
---- 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>

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 <kohei.yoshida@gmail.com>
-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 <fstream>
- #include <sstream>
- #include <map>
-+#include <algorithm>
-
- 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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/, dev-libs/liborcus/files/
@ 2023-02-25 10:27 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-02-25 10:27 UTC (permalink / raw
  To: gentoo-commits

commit:     632310480c2bd41af986d9c6580969fe9d29cab3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 10:20:07 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 10:27:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63231048

dev-libs/liborcus: python3_11

Tests pass.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/liborcus-0.17.2-python-optional.patch    | 26 ++++++++
 dev-libs/liborcus/liborcus-0.17.2-r1.ebuild        | 70 ++++++++++++++++++++++
 2 files changed, 96 insertions(+)

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
new file mode 100644
index 000000000000..9473958c196a
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.17.2-python-optional.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000000..bb555485c7bb
--- /dev/null
+++ b/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 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 ~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}-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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/, dev-libs/liborcus/files/
@ 2022-06-14 15:20 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-06-14 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     6b07f09a4b8f79ac28c03c033c89b272d658642c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 13:33:42 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 15:19:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b07f09a

dev-libs/liborcus: Drop 0.16.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/liborcus/Manifest                         |  1 -
 .../liborcus/files/liborcus-0.15.4-gcc11.patch     | 72 ----------------------
 dev-libs/liborcus/liborcus-0.16.1.ebuild           | 69 ---------------------
 3 files changed, 142 deletions(-)

diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index b440e512ac7d..a10f5c5f0982 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,2 +1 @@
-DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739
 DIST liborcus-0.17.2.tar.xz 1839188 BLAKE2B d274e3af71df16866e305403d63d3978613915753412ac9de19d7de7802930c3886d8653d6d48a8d9a971dc0ee284f8f83af8dc07850b5f28fcdab2815b6d9b2 SHA512 8ad8db46c23673260057aff555286d95ebfeff0a027bdeae24f11f8aa12456284f7f4446edddb91936b3011eb1227cfe1618ab3c4d909f8356c8c151f5739d79

diff --git a/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch b/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch
deleted file mode 100644
index f1dda1390539..000000000000
--- a/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 50506d534230d90de2b0a2af3fb072428c942a4e Mon Sep 17 00:00:00 2001
-From: hedmo <hedmoo@yahoo.com>
-Date: Fri, 8 Jan 2021 07:30:16 +0000
-Subject: [PATCH] Update orcus_xlsx.cpp to build with gcc-11
-
----
- src/liborcus/orcus_xlsx.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/liborcus/orcus_xlsx.cpp b/src/liborcus/orcus_xlsx.cpp
-index 6df72a32..a59b2b9d 100644
---- a/src/liborcus/orcus_xlsx.cpp
-+++ b/src/liborcus/orcus_xlsx.cpp
-@@ -32,6 +32,7 @@
- 
- #include <cstdlib>
- #include <iostream>
-+#include <limits>
- #include <string>
- #include <cstring>
- #include <sstream>
--- 
-GitLab
-
-From 3bfa1a000e4639fe68781c584356ceea7c6b1a72 Mon Sep 17 00:00:00 2001
-From: hedmo <hedmoo@yahoo.com>
-Date: Fri, 8 Jan 2021 07:32:53 +0000
-Subject: [PATCH] Update xls_xml_context.cpp to build with gcc-11
-
----
- src/liborcus/xls_xml_context.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/liborcus/xls_xml_context.cpp b/src/liborcus/xls_xml_context.cpp
-index 538f5607..ca3dc4d0 100644
---- a/src/liborcus/xls_xml_context.cpp
-+++ b/src/liborcus/xls_xml_context.cpp
-@@ -16,6 +16,7 @@
- #include <mdds/sorted_string_map.hpp>
- 
- #include <iostream>
-+#include <limits>
- 
- using namespace std;
- namespace ss = orcus::spreadsheet;
--- 
-GitLab
-
-From 5e8fb255dc6bc9b7084a05b8dc24f31417542e5e Mon Sep 17 00:00:00 2001
-From: hedmo <hedmoo@yahoo.com>
-Date: Fri, 8 Jan 2021 07:34:17 +0000
-Subject: [PATCH] Update xlsx_revision_context.cpp to build with gcc-11
-
----
- src/liborcus/xlsx_revision_context.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/liborcus/xlsx_revision_context.cpp b/src/liborcus/xlsx_revision_context.cpp
-index edfd9eed..0b6ec0af 100644
---- a/src/liborcus/xlsx_revision_context.cpp
-+++ b/src/liborcus/xlsx_revision_context.cpp
-@@ -16,6 +16,7 @@
- #include "orcus/global.hpp"
- 
- #include <iostream>
-+#include <limits>
- 
- using namespace std;
- 
--- 
-GitLab
-

diff --git a/dev-libs/liborcus/liborcus-0.16.1.ebuild b/dev-libs/liborcus/liborcus-0.16.1.ebuild
deleted file mode 100644
index 18b38d862e5e..000000000000
--- a/dev-libs/liborcus/liborcus-0.16.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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/9999"
-	EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-	inherit git-r3
-else
-	MDDS_SLOT="1/1.5"
-	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/0.16" # 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}/${PN}-0.15.4-gcc11.patch" ) # bug 764035
-
-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-static
-		--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
-	use python && python_optimize
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/, dev-libs/liborcus/files/
@ 2021-06-10 15:34 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2021-06-10 15:34 UTC (permalink / raw
  To: gentoo-commits

commit:     f785edab75088cf38ebbe8c3ff24d171388b51ae
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  6 17:00:02 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 10 15:32:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f785edab

dev-libs/liborcus: Drop 0.15.4

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/liborcus/Manifest                         |  1 -
 .../liborcus/files/liborcus-0.15.4-bashism.patch   | 26 ---------
 dev-libs/liborcus/liborcus-0.15.4.ebuild           | 64 ----------------------
 3 files changed, 91 deletions(-)

diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index d43ffdc4292..570800afb04 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,2 +1 @@
-DIST liborcus-0.15.4.tar.xz 1590048 BLAKE2B b2edff8a00439154c2850e49fff151f59c0c5a43163cebe5cac84b627fcf87c89a0a522797d8a5bc39eaca9205d74ff3f0bdf9ba77561c5cc7aefe98f35a4c8b SHA512 edbe1d6f86a249e43915e7fb960e6b269fa8703e3f571a023e811dd3f9b5d9c9a36edff491faa7ed7ea3490bf5afe1999e26d05c658a0a393b3ffd08b311b76f
 DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739

diff --git a/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch b/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch
deleted file mode 100644
index cc201a5024e..00000000000
--- a/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7d2ae0b6e47aa0c1fc43a91300d82c5394420162 Mon Sep 17 00:00:00 2001
-From: Ryo ONODERA <ryo@tetera.org>
-Date: Sat, 11 Jan 2020 23:01:29 +0900
-Subject: [PATCH] Improve POSIX shell portability
-
-DO not use bash syntax.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index bc5dc195..a854c0c9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -322,7 +322,7 @@ AC_ARG_ENABLE([werror],
- 	[enable_werror="$enableval"],
- 	[enable_werror=no]
- )
--AS_IF([test x"$enable_werror" == "xyes"], [
-+AS_IF([test x"$enable_werror" = "xyes"], [
- 	CXXFLAGS="$CXXFLAGS -Werror"
- ])
- 
--- 
-2.26.2
-

diff --git a/dev-libs/liborcus/liborcus-0.15.4.ebuild b/dev-libs/liborcus/liborcus-0.15.4.ebuild
deleted file mode 100644
index def16d79f7b..00000000000
--- a/dev-libs/liborcus/liborcus-0.15.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-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
-	EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-	inherit git-r3
-else
-	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/0.15" # based on SONAME of liborcus.so
-IUSE="python +spreadsheet-model tools"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=[zlib(+)]
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( dev-libs/libixion:${SLOT} )
-"
-DEPEND="${RDEPEND}
-	dev-util/mdds:1/1.5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-bashism.patch" # bug 723130
-	"${FILESDIR}/${P}-gcc11.patch" # bug 764035
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/, dev-libs/liborcus/files/
@ 2018-09-18 19:05 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-09-18 19:05 UTC (permalink / raw
  To: gentoo-commits

commit:     9e74d08669eae0d59cb658e049aa3008a80de3cd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 19:03:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 19:04:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e74d086

dev-libs/liborcus: Fix build with boost-1.67

Thanks-to: Yuriy Ilinykh <yurark96 <AT> gmail.com>
Closes: https://bugs.gentoo.org/663218
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 .../files/liborcus-0.13.4-boost-1.67.patch         | 50 ++++++++++++++++++++++
 dev-libs/liborcus/liborcus-0.13.4.ebuild           |  6 ++-
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch b/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
new file mode 100644
index 00000000000..b1d44b8db4c
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
@@ -0,0 +1,50 @@
+From f7485813af8e50f88c77312fb29b7bb489a0a17d Mon Sep 17 00:00:00 2001
+From: Adam Majer <amajer@suse.de>
+Date: Wed, 23 May 2018 10:45:56 +0200
+Subject: [PATCH] Fix build with Boost 1.67
+
+Boost:DateTime that no longer accepts non-integer types.
+In the past, these types were implicitly cast down to integer
+values. Now this requires explicit cast.
+
+https://svn.boost.org/trac10/ticket/11168
+
+This fixes #60
+---
+ src/spreadsheet/sheet.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/spreadsheet/sheet.cpp b/src/spreadsheet/sheet.cpp
+index 7df1aedb..33b372ad 100644
+--- a/src/spreadsheet/sheet.cpp
++++ b/src/spreadsheet/sheet.cpp
+@@ -289,7 +289,7 @@ void sheet::set_date_time(row_t row, col_t col, int year, int month, int day, in
+ 
+     double days_since_epoch = (d - origin).days();
+ 
+-    double ms = second * 1000000.0;
++    long ms = second * 1000000.0;
+ 
+     posix_time::time_duration t(
+         posix_time::hours(hour) +
+@@ -606,7 +606,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
+     if (time_fraction)
+     {
+         // Convert a fraction day to microseconds.
+-        double ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
++        long ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
+         posix_time::time_duration td = posix_time::microsec(ms);
+ 
+         hours = td.hours();
+@@ -615,7 +615,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
+ 
+         td -= posix_time::hours(hours);
+         td -= posix_time::minutes(minutes);
+-        td -= posix_time::seconds(seconds);
++        td -= posix_time::seconds((long)seconds);
+ 
+         ms = td.total_microseconds(); // remaining microseconds.
+ 
+-- 
+2.18.0
+

diff --git a/dev-libs/liborcus/liborcus-0.13.4.ebuild b/dev-libs/liborcus/liborcus-0.13.4.ebuild
index 2f74b321685..c3a85e9f2fa 100644
--- a/dev-libs/liborcus/liborcus-0.13.4.ebuild
+++ b/dev-libs/liborcus/liborcus-0.13.4.ebuild
@@ -23,9 +23,9 @@ IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="
 	dev-libs/boost:=
-	sys-libs/zlib:=
+	sys-libs/zlib
 	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( >=dev-libs/libixion-0.13.0:= )
+	spreadsheet-model? ( =dev-libs/libixion-0.13*:= )
 "
 DEPEND="${RDEPEND}
 	=dev-util/mdds-1.3*:1
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=( "${FILESDIR}/${P}-boost-1.67.patch" )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/, dev-libs/liborcus/files/
@ 2016-03-19 21:39 Andreas Hüttel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2016-03-19 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     8033e10463d6df37e1605c9eef8ee6af45e9c2f8
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Mar 12 15:05:13 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 21:39:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8033e104

dev-libs/liborcus: Drop 0.7.0 and obsolete patches

Package-Manager: portage-2.2.27

 dev-libs/liborcus/Manifest                         |  1 -
 .../liborcus/files/liborcus-0.5.1-linking.patch    | 13 ------
 dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch  | 12 ------
 .../files/liborcus-0.5.1-oldnamespace.patch        | 11 -----
 .../liborcus/files/liborcus-0.7.0-boost-1.56.patch | 25 -----------
 dev-libs/liborcus/liborcus-0.7.0.ebuild            | 48 ----------------------
 6 files changed, 110 deletions(-)

diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 1936012..1d9a4c9 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,4 +1,3 @@
 DIST liborcus-0.11.1.tar.xz 1627332 SHA256 02a6251a9b732c2c555c1be083411a2d0383dfd2ebc79f60ac282875b1ada49b SHA512 2a818a8888115281ea9c34d8911df99a2af131991b43de77ddf1182592becc9f77ca0df23aac5f2f92e1bcd732a0f704d15b98c66b308eaa1715f66d78a8ab76 WHIRLPOOL 67c616d3509ec18994dae6e4b718014adc3dd385aa9fa4ed5bf8b099c659f1390b15a7d6307b2a409f66abd2a5041942ee5e17e3cb7843fad49129575a829951
-DIST liborcus-0.7.0.tar.bz2 1665988 SHA256 7773a8f5f0b810e0f146dbcf3dbb42e89dd8af0868235e01d9f0cdefde41a8a9 SHA512 63aad5154e25d7d7bfd10f07e614e4c1ed2691a31c61c2b1e7ec029fa4d9168eba5b4303f5164ab29ef92843ce8f8afa9682772515c8b5e8ae65f4561b331db8 WHIRLPOOL b555b005b41fb41571ac7dbc63e32541decd0b79d61435a6730de9438761afe363d063905b671e1b724c02f2846e65e2af7fffca40282d08d35e1c4ff787fc63
 DIST liborcus-0.7.1.tar.xz 1472804 SHA256 04846b64262210a0d4e18d72779c901633e45dc9cca2108235b38d4715266a43 SHA512 30461311b084f3c91ef8cc504ca7adfd212f95d49c0a320958ca203606901ddf84e37d5c95073437bad21af4c6ce71fa606dd7cdb7cc7bd58b2699d8863a318c WHIRLPOOL af6f4ff639851b94298f847437c25962412f37617f82c143b1bf71aa4f27b26003ffb2dad61fdbe9718f9b42a0f11c1dda71825da8b2ee8bf9e9fd727f309134
 DIST liborcus-0.9.2.tar.xz 1558072 SHA256 dd49f9f1b8ff8a648434dd5c8b4fe1081d1118d61d0a71d4effee8f32553199c SHA512 1dd847012cf78df962c28408e0b56412a89e1d978d532a17fa92352f6788bbc1a0fe806c2d886ff148a8ee2db54620ce039b1809f347a976dca0078f248fd8ea WHIRLPOOL fe74951704b4cfbdfeeb894be459c4f7046fc23f813c50e43816943d064cbfc4a4f7feebf6a6737cf94d50826ac23796031b7626b89264ee21f42356ffbb44e8

diff --git a/dev-libs/liborcus/files/liborcus-0.5.1-linking.patch b/dev-libs/liborcus/files/liborcus-0.5.1-linking.patch
deleted file mode 100644
index f9cb64d..0000000
--- a/dev-libs/liborcus/files/liborcus-0.5.1-linking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN liborcus-0.5.1/src/parser/Makefile.am liborcus-0.5.1.new/src/parser/Makefile.am
---- liborcus-0.5.1/src/parser/Makefile.am	2013-04-12 16:25:03.000000000 +0200
-+++ liborcus-0.5.1.new/src/parser/Makefile.am	2013-04-23 19:45:47.794480191 +0200
-@@ -20,7 +20,8 @@
- 
- liborcus_parser_@ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined
- liborcus_parser_@ORCUS_API_VERSION@_la_LIBADD = \
--	 $(ZLIB_LIBS)
-+	$(BOOST_SYSTEM_LIB) \
-+	$(ZLIB_LIBS)
- 
- EXTRA_PROGRAMS = \
- 	parser-test-string-pool \

diff --git a/dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch b/dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch
deleted file mode 100644
index 740376b..0000000
--- a/dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN liborcus-0.5.1.old/src/spreadsheet/sheet.cpp liborcus-0.5.1/src/spreadsheet/sheet.cpp
---- liborcus-0.5.1.old/src/spreadsheet/sheet.cpp	2013-05-27 19:07:41.712302036 +0200
-+++ liborcus-0.5.1/src/spreadsheet/sheet.cpp	2013-05-27 19:08:51.432302028 +0200
-@@ -734,7 +734,7 @@
-         con.build_tree();
- 
-     size_t index;
--    if (!con.search_tree(col, index))
-+    if (!con.search_tree(col, index).second)
-         return 0;
- 
-     return index;

diff --git a/dev-libs/liborcus/files/liborcus-0.5.1-oldnamespace.patch b/dev-libs/liborcus/files/liborcus-0.5.1-oldnamespace.patch
deleted file mode 100644
index c8a669e..0000000
--- a/dev-libs/liborcus/files/liborcus-0.5.1-oldnamespace.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN liborcus-0.5.1.old/src/orcus_xml_main.cpp liborcus-0.5.1/src/orcus_xml_main.cpp
---- liborcus-0.5.1.old/src/orcus_xml_main.cpp	2013-05-27 19:07:41.713302036 +0200
-+++ liborcus-0.5.1/src/orcus_xml_main.cpp	2013-05-27 20:01:44.007301649 +0200
-@@ -36,6 +36,7 @@
- 
- #include <cstdlib>
- #include <cstring>
-+#include <iostream>
- #include <fstream>
- 
- using namespace orcus;

diff --git a/dev-libs/liborcus/files/liborcus-0.7.0-boost-1.56.patch b/dev-libs/liborcus/files/liborcus-0.7.0-boost-1.56.patch
deleted file mode 100644
index f72d66b..0000000
--- a/dev-libs/liborcus/files/liborcus-0.7.0-boost-1.56.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c01874c7770f4f56c031d7463156e03f2945e015 Mon Sep 17 00:00:00 2001
-From: Dmitry Roshchin <dmitry@roshchin.org>
-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 <iostream>
-+
- #include "orcus/string_pool.hpp"
- #include "orcus/pstring.hpp"
- 
--- 
-1.7.1
-

diff --git a/dev-libs/liborcus/liborcus-0.7.0.ebuild b/dev-libs/liborcus/liborcus-0.7.0.ebuild
deleted file mode 100644
index 5e300e8..0000000
--- a/dev-libs/liborcus/liborcus-0.7.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://gitorious.org/orcus/orcus.git"
-
-[[ ${PV} == 9999 ]] && GITECLASS="git-2 autotools"
-inherit eutils ${GITECLASS}
-unset GITECLASS
-
-DESCRIPTION="Standalone file import filter library for spreadsheet documents"
-HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
-[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="static-libs"
-
-RDEPEND="
-	>=dev-libs/boost-1.51.0:=
-	=dev-libs/libixion-0.7*
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.8.1
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.7.0-boost-1.56.patch" # bug 527242
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-02-20 20:49 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-28 17:09 [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/, dev-libs/liborcus/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-02-20 20:49 Andreas Sturmlechner
2023-02-25 10:27 Andreas Sturmlechner
2022-06-14 15:20 Andreas Sturmlechner
2021-06-10 15:34 Andreas Sturmlechner
2018-09-18 19:05 Andreas Sturmlechner
2016-03-19 21:39 Andreas Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox