* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/files/, dev-libs/liborcus/
@ 2019-09-12 20:27 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-09-12 20:27 UTC (permalink / raw
To: gentoo-commits
commit: 9a219810105d6b01d02aa6e7f6f43fe0025ebd5b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 12 20:25:04 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 20:27:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a219810
dev-libs/liborcus: Drop 0.13.4
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/liborcus/Manifest | 1 -
.../files/liborcus-0.13.4-boost-1.67.patch | 50 ------------------
dev-libs/liborcus/liborcus-0.13.4.ebuild | 59 ----------------------
3 files changed, 110 deletions(-)
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 5ef7b99786f..e358a2fd14f 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,2 +1 @@
-DIST liborcus-0.13.4.tar.xz 1816340 BLAKE2B f8e7251c8688f82604d5ac1212938890e42f23ce45edb09eba9ab26a810e5fd4215a23dd20e86ddf9100db67818fc73fbbee7357642a6390f8f60dc28596be31 SHA512 f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b
DIST liborcus-0.14.1.tar.xz 1894680 BLAKE2B 0070baf319bf35275f36f3082141f154404ad43d8143588b35c00b8b536f0c1cf5bf38fd9e997c4be45a454f16de1cc1a25186da40e3ed0606a87e9a6a968053 SHA512 a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f
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
deleted file mode 100644
index b1d44b8db4c..00000000000
--- a/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index 81e4c1673a3..00000000000
--- a/dev-libs/liborcus/liborcus-0.13.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit python-single-r1 ${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="https://kohei.us/files/orcus/src/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/0.13" # based on SONAME of liborcus.so
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="python +spreadsheet-model static-libs tools"
-
-RDEPEND="
- dev-libs/boost:=
- sys-libs/zlib
- python? ( ${PYTHON_DEPS} )
- spreadsheet-model? ( =dev-libs/libixion-0.13*:= )
-"
-DEPEND="${RDEPEND}
- =dev-util/mdds-1.3*:1
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}/${P}-boost-1.67.patch" )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_enable python) \
- $(use_enable spreadsheet-model) \
- $(use_enable static-libs static) \
- $(use_with tools)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/files/, dev-libs/liborcus/
@ 2021-01-24 13:02 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2021-01-24 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 3d1c1e19ca22ad4ed81932940665e205afe08a97
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 12:46:13 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 12:59:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d1c1e19
dev-libs/liborcus: Fix build with GCC-11, python3_9
Upstream commits:
50506d534230d90de2b0a2af3fb072428c942a4e
3bfa1a000e4639fe68781c584356ceea7c6b1a72
5e8fb255dc6bc9b7084a05b8dc24f31417542e5e
Reported-by: Geoff Leach <gl <AT> cs.rmit.edu.au>
Thanks-to: andy <hedmoo <AT> yahoo.com>
Closes: https://bugs.gentoo.org/764035
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../liborcus/files/liborcus-0.15.4-gcc11.patch | 72 ++++++++++++++++++++++
dev-libs/liborcus/liborcus-0.15.4.ebuild | 9 ++-
2 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch b/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch
new file mode 100644
index 00000000000..f1dda139053
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch
@@ -0,0 +1,72 @@
+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.15.4.ebuild b/dev-libs/liborcus/liborcus-0.15.4.ebuild
index 4ed618d5956..d0e8089f307 100644
--- a/dev-libs/liborcus/liborcus-0.15.4.ebuild
+++ b/dev-libs/liborcus/liborcus-0.15.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit autotools python-single-r1
DESCRIPTION="Standalone file import filter library for spreadsheet documents"
@@ -33,7 +33,10 @@ DEPEND="${RDEPEND}
dev-util/mdds:1/1.5
"
-PATCHES=( "${FILESDIR}/${P}-bashism.patch" ) # bug 723130
+PATCHES=(
+ "${FILESDIR}/${P}-bashism.patch" # bug 723130
+ "${FILESDIR}/${P}-gcc11.patch" # bug 764035
+)
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/files/, dev-libs/liborcus/
@ 2021-11-14 5:25 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2021-11-14 5:25 UTC (permalink / raw
To: gentoo-commits
commit: 6d2facc6865eeebf112e7690c28504ed687dbe8f
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sun Oct 31 02:37:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 05:24:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2facc6
dev-libs/liborcus: fix build failure with USE=-tools
Closes: https://bugs.gentoo.org/713586
Signed-off-by: James Beddek <telans <AT> posteo.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../liborcus/files/liborcus-0.17.0-test-fix.patch | 51 ++++++++++++++++++++++
dev-libs/liborcus/liborcus-0.16.1.ebuild | 13 ++++--
2 files changed, 60 insertions(+), 4 deletions(-)
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
new file mode 100644
index 000000000000..1de33a7e3f4c
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch
@@ -0,0 +1,51 @@
+# 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/liborcus-0.16.1.ebuild b/dev-libs/liborcus/liborcus-0.16.1.ebuild
index 11e425439697..18b38d862e5e 100644
--- a/dev-libs/liborcus/liborcus-0.16.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.16.1.ebuild
@@ -4,7 +4,8 @@
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
-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"
@@ -12,7 +13,7 @@ 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 autotools
+ inherit git-r3
else
MDDS_SLOT="1/1.5"
SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
@@ -21,9 +22,10 @@ fi
LICENSE="MIT"
SLOT="0/0.16" # based on SONAME of liborcus.so
-IUSE="python +spreadsheet-model tools"
+IUSE="python +spreadsheet-model test tools"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/boost:=[zlib(+)]
@@ -42,8 +44,11 @@ pkg_setup() {
}
src_prepare() {
+ # bug 713586
+ use test && eapply "${FILESDIR}/${PN}-0.17.0-test-fix.patch"
+
default
- [[ ${PV} == *9999 ]] && eautoreconf
+ eautoreconf
}
src_configure() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/files/, dev-libs/liborcus/
@ 2022-07-17 14:23 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-07-17 14:23 UTC (permalink / raw
To: gentoo-commits
commit: 2318040e31ef2c5c72332281ae2987319bf46e38
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 14:21:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 14:21:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2318040e
dev-libs/liborcus: fix build w/ Clang
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../liborcus/files/liborcus-0.17.2-clang.patch | 26 ++++++++++++++++++++++
dev-libs/liborcus/liborcus-0.17.2.ebuild | 4 ++++
2 files changed, 30 insertions(+)
diff --git a/dev-libs/liborcus/files/liborcus-0.17.2-clang.patch b/dev-libs/liborcus/files/liborcus-0.17.2-clang.patch
new file mode 100644
index 000000000000..62950cfcecb9
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.17.2-clang.patch
@@ -0,0 +1,26 @@
+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/liborcus-0.17.2.ebuild b/dev-libs/liborcus/liborcus-0.17.2.ebuild
index 1bf855fc46a8..cc350aa44e50 100644
--- a/dev-libs/liborcus/liborcus-0.17.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.17.2.ebuild
@@ -37,6 +37,10 @@ DEPEND="${RDEPEND}
dev-util/mdds:${MDDS_SLOT}
"
+PATCHES=(
+ "${FILESDIR}"/${P}-clang.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/files/, dev-libs/liborcus/
@ 2022-08-23 7:41 WANG Xuerui
0 siblings, 0 replies; 7+ messages in thread
From: WANG Xuerui @ 2022-08-23 7:41 UTC (permalink / raw
To: gentoo-commits
commit: 07677fc22445c8e3c18352c0a7166ff20321fcca
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 02:33:37 2022 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 07:40:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07677fc2
dev-libs/liborcus: fix build on gcc-13
Closes: https://bugs.gentoo.org/865213
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
.../liborcus/files/liborcus-0.17.2-gcc-13.patch | 29 ++++++++++++++++++++++
dev-libs/liborcus/liborcus-0.17.2.ebuild | 1 +
2 files changed, 30 insertions(+)
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
new file mode 100644
index 000000000000..fa4892053b10
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.17.2-gcc-13.patch
@@ -0,0 +1,29 @@
+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/liborcus-0.17.2.ebuild b/dev-libs/liborcus/liborcus-0.17.2.ebuild
index cc350aa44e50..4d6c290cda94 100644
--- a/dev-libs/liborcus/liborcus-0.17.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.17.2.ebuild
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-clang.patch
+ "${FILESDIR}"/${P}-gcc-13.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/files/, dev-libs/liborcus/
@ 2023-11-03 23:58 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-11-03 23:58 UTC (permalink / raw
To: gentoo-commits
commit: 6f0e7fbdb25bc731c4b9d769c0bcb21e33aff004
Author: Kostadin Shishmanov <kocelfc <AT> tutanota <DOT> com>
AuthorDate: Tue Oct 31 16:56:06 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 3 23:51:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f0e7fbd
dev-libs/liborcus: fix build with gcc 14
Closes: https://bugs.gentoo.org/916582
Signed-off-by: Kostadin Shishmanov <kocelfc <AT> tutanota.com>
Closes: https://github.com/gentoo/gentoo/pull/33609
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../liborcus/files/liborcus-0.17.2-gcc-14.patch | 21 +++++++++++++++++++++
dev-libs/liborcus/liborcus-0.17.2-r1.ebuild | 1 +
2 files changed, 22 insertions(+)
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
new file mode 100644
index 000000000000..a8455c9dff71
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.17.2-gcc-14.patch
@@ -0,0 +1,21 @@
+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/liborcus-0.17.2-r1.ebuild b/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild
index 18b82b04bab9..bd813219cc60 100644
--- a/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-clang.patch
"${FILESDIR}"/${P}-gcc-13.patch
+ "${FILESDIR}"/${P}-gcc-14.patch
"${FILESDIR}"/${P}-python-optional.patch
)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/files/, dev-libs/liborcus/
@ 2024-08-15 20:15 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-08-15 20:15 UTC (permalink / raw
To: gentoo-commits
commit: a288e9723fab18d340ee1173dc647a118d806bc0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 20:06:20 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 20:10:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a288e972
dev-libs/liborcus: fix build w/ gcc-15
Closes: https://bugs.gentoo.org/937392
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/liborcus-0.19.2-gcc15-cstdint.patch | 52 ++++++++++++++++++++++
dev-libs/liborcus/liborcus-0.19.2.ebuild | 4 ++
2 files changed, 56 insertions(+)
diff --git a/dev-libs/liborcus/files/liborcus-0.19.2-gcc15-cstdint.patch b/dev-libs/liborcus/files/liborcus-0.19.2-gcc15-cstdint.patch
new file mode 100644
index 000000000000..5cf7ab1e46f7
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.19.2-gcc15-cstdint.patch
@@ -0,0 +1,52 @@
+https://bugs.gentoo.org/937392
+https://gitlab.com/orcus/orcus/-/issues/199
+https://gitlab.com/orcus/orcus/-/merge_requests/200
+
+From b7932facdf56994b7b1238bafe1e13b4817f69f1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kacper=20S=C5=82omi=C5=84ski?=
+ <kacper.slominski72@gmail.com>
+Date: Wed, 14 Aug 2024 03:36:46 +0200
+Subject: [PATCH] Add missing <cstdint> includes
+
+--- a/include/orcus/json_document_tree.hpp
++++ b/include/orcus/json_document_tree.hpp
+@@ -14,6 +14,7 @@
+ #include <string>
+ #include <memory>
+ #include <vector>
++#include <cstdint>
+
+ namespace orcus {
+
+--- a/include/orcus/sax_parser.hpp
++++ b/include/orcus/sax_parser.hpp
+@@ -11,6 +11,7 @@
+ #include "sax_parser_base.hpp"
+
+ #include <string_view>
++#include <cstdint>
+
+ namespace orcus {
+
+--- a/include/orcus/yaml_document_tree.hpp
++++ b/include/orcus/yaml_document_tree.hpp
+@@ -14,6 +14,7 @@
+ #include <string>
+ #include <memory>
+ #include <vector>
++#include <cstdint>
+
+ namespace orcus {
+
+--- a/include/orcus/zip_archive.hpp
++++ b/include/orcus/zip_archive.hpp
+@@ -15,6 +15,7 @@
+ #include <vector>
+ #include <memory>
+ #include <ostream>
++#include <cstdint>
+
+ namespace orcus {
+
+--
+GitLab
diff --git a/dev-libs/liborcus/liborcus-0.19.2.ebuild b/dev-libs/liborcus/liborcus-0.19.2.ebuild
index 8a3e66a9fe84..aa54bf03f037 100644
--- a/dev-libs/liborcus/liborcus-0.19.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.19.2.ebuild
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
dev-util/mdds:${MDDS_SLOT}
"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc15-cstdint.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-08-15 20:15 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-24 13:02 [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/files/, dev-libs/liborcus/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-08-15 20:15 Sam James
2023-11-03 23:58 Sam James
2022-08-23 7:41 WANG Xuerui
2022-07-17 14:23 Sam James
2021-11-14 5:25 Sam James
2019-09-12 20:27 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox