[gentoo-commits] repo/gentoo:master commit in: dev-libs/sord/files/, dev-libs/sord/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     c47e948b711401b0d2dcab6e21f3a9874302e255
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  5 17:16:28 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 17:16:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c47e948b

dev-libs/sord: fixed compilation with gcc10 + added live

Closes: https://bugs.gentoo.org/726312
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-libs/sord/files/sord-0.16.4-gcc10.patch        | 25 ++++++++++++++++++++++
 .../{sord-0.16.4.ebuild => sord-0.16.4-r1.ebuild}  |  4 ++++
 .../sord/{sord-0.16.4.ebuild => sord-9999.ebuild}  |  6 +++---
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/dev-libs/sord/files/sord-0.16.4-gcc10.patch b/dev-libs/sord/files/sord-0.16.4-gcc10.patch
new file mode 100644
index 00000000000..a793b335a0a
--- /dev/null
+++ b/dev-libs/sord/files/sord-0.16.4-gcc10.patch
@@ -0,0 +1,25 @@
+From 616517f44ceeacb26592e50e2bf914aad2d93b90 Mon Sep 17 00:00:00 2001
+From: David Robillard <d@drobilla.net>
+Date: Fri, 17 Jul 2020 15:38:38 +0200
+Subject: [PATCH] Fix crash with optimized builds with GCC 10.1.0
+
+---
+ src/zix/btree.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/zix/btree.c b/src/zix/btree.c
+index 78a5a0d..d830008 100644
+--- a/src/zix/btree.c
++++ b/src/zix/btree.c
+@@ -689,7 +689,7 @@ zix_btree_begin(const ZixBTree* const t)
+ ZIX_API bool
+ zix_btree_iter_is_end(const ZixBTreeIter* const i)
+ {
+-	return !i || i->stack[0].node == NULL;
++	return !i || (i->level == 0 && i->stack[0].node == NULL);
+ }
+ 
+ ZIX_API void
+-- 
+2.28.0
+

diff --git a/dev-libs/sord/sord-0.16.4.ebuild b/dev-libs/sord/sord-0.16.4-r1.ebuild
similarity index 96%
copy from dev-libs/sord/sord-0.16.4.ebuild
copy to dev-libs/sord/sord-0.16.4-r1.ebuild
index 39cd7d0b3fd..2c0d0b7cfc2 100644
--- a/dev-libs/sord/sord-0.16.4.ebuild
+++ b/dev-libs/sord/sord-0.16.4-r1.ebuild
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( "AUTHORS" "NEWS" "README.md" )
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10.patch"
+)
+
 src_prepare() {
 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	default

diff --git a/dev-libs/sord/sord-0.16.4.ebuild b/dev-libs/sord/sord-9999.ebuild
similarity index 84%
rename from dev-libs/sord/sord-0.16.4.ebuild
rename to dev-libs/sord/sord-9999.ebuild
index 39cd7d0b3fd..e1388ab2877 100644
--- a/dev-libs/sord/sord-0.16.4.ebuild
+++ b/dev-libs/sord/sord-9999.ebuild
@@ -5,15 +5,15 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal
+inherit python-any-r1 waf-utils multilib-build multilib-minimal git-r3
 
 DESCRIPTION="Library for storing RDF data in memory"
 HOMEPAGE="http://drobilla.net/software/sord/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+EGIT_REPO_URI="https://github.com/drobilla/sord.git"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS=""
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"