From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-libs/sord/Manifest | 3 +- ...ash-with-optimized-builds-with-gcc-10.1.0.patch | 25 +++++++++ dev-libs/sord/sord-0.16.8-r1.ebuild | 63 ++++++++++++++++++++++ dev-libs/sord/sord-0.16.8.ebuild | 59 -------------------- 4 files changed, 90 insertions(+), 60 deletions(-) create mode 100644 dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch create mode 100644 dev-libs/sord/sord-0.16.8-r1.ebuild delete mode 100644 dev-libs/sord/sord-0.16.8.ebuild (limited to 'dev-libs/sord') diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest index 62850e74a3ef..8fe7217963d7 100644 --- a/dev-libs/sord/Manifest +++ b/dev-libs/sord/Manifest @@ -1,4 +1,5 @@ +AUX sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch 673 BLAKE2B cec32a83d67d5d8157f13dae4ba0d2e59e32aeba233cfc76811cf3f66f1d1c2e76d439be40f2de4ea8901da88a5f547e699aa57bc989360ebc31e5e1a4b1e099 SHA512 f4d310e31b1ad7075ad0ebb6d7d249dcd2c773093f36434518891b5b44d43851c13c2d20d2fc9b96f7e85f4ca30a27f7b248300a8ad2e21724e8e4bd100508d6 DIST sord-0.16.8.tar.bz2 525038 BLAKE2B 3ba43b2edb69efec64ac68f139a18f23dc1b92290b054f420c400d2907af74fa550b042596374136c53b7cf0db1b775cfc7edd24c771bbf26d25928845787c7b SHA512 24ed50de8e5bb321e557bac6d3e441b2ed49adabf828bf0e1b33a080c89306dde80443dc8b563098fcc184c4d6e53b7e716b523ddccdf56d08301d1b0120f2b2 -EBUILD sord-0.16.8.ebuild 1175 BLAKE2B 4e2cb2c54f6b80c968b090d384ebb154d23d8c531cc395644a5933f99a896feab71195b06d67a2946efe4e3b5cc60d4a01a73c3cbc2d9aafd2fb49c73a0791fa SHA512 951e2799df07c7946207332eb18a7c8bc9ebc3418aa9b1c1b2af9ccb79cf853be8f86f1a11b04d05642453a0d31d3e9a813cfc53c8951949a4d525b19806b915 +EBUILD sord-0.16.8-r1.ebuild 1262 BLAKE2B 70ded9e298c379e67972315f2c120e3f073f2bcbe22daac77cdea6588506727c6f98fd8a29dd96748bd1543b33513b6765ddc37273e8179a52fbc1235bb22b9d SHA512 3b162883431e52fef892a40a1f7eda518c8cedd3a4d17a1a36b283537a18aa6b9ba308703baf3ec8a367b5b25c3a3dbafa3b5821749616c73c5bad1f41ce933d EBUILD sord-9999.ebuild 1128 BLAKE2B 77268a5bc22cb33548eb443e14cea7adbf3a1789e05c9b8070e0c59c91d7c315a64aa3ba924d3d21f8bd1c32a6408c3cf66435f38f88df77fd3559c02bdf0a9d SHA512 926eb592bdf596e9d1b64410e391b74a4a39ce97695aeb337bf7adfb6bf457a596a5999753bdce53f1c797dcf6ddd7d4ab919693d9f3ecbceb58abed139c3e65 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 diff --git a/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch b/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch new file mode 100644 index 000000000000..c7f3e66c79f9 --- /dev/null +++ b/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch @@ -0,0 +1,25 @@ +From 616517f44ceeacb26592e50e2bf914aad2d93b90 Mon Sep 17 00:00:00 2001 +From: David Robillard +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 +-- +GitLab + diff --git a/dev-libs/sord/sord-0.16.8-r1.ebuild b/dev-libs/sord/sord-0.16.8-r1.ebuild new file mode 100644 index 000000000000..1b9950ec3e5e --- /dev/null +++ b/dev-libs/sord/sord-0.16.8-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_REQ_USE='threads(+)' +inherit python-any-r1 waf-utils multilib-build multilib-minimal + +DESCRIPTION="Library for storing RDF data in memory" +HOMEPAGE="http://drobilla.net/software/sord/" +SRC_URI="http://download.drobilla.net/${P}.tar.bz2" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" +IUSE="doc static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" +RDEPEND=" + dev-libs/libpcre + dev-libs/serd +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} +" +DOCS=( "AUTHORS" "NEWS" "README.md" ) + +PATCHES=( + "${FILESDIR}/${P}-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch" +) + +src_prepare() { + sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die + default + multilib_copy_sources +} + +multilib_src_configure() { + waf-utils_src_configure \ + --docdir=/usr/share/doc/${PF} \ + $(multilib_native_usex doc --docs "") \ + $(usex test --test "") \ + $(usex static-libs --static "") +} + +multilib_src_test() { + ./waf test || die +} + +multilib_src_compile() { + waf-utils_src_compile + default +} + +multilib_src_install() { + waf-utils_src_install + default +} diff --git a/dev-libs/sord/sord-0.16.8.ebuild b/dev-libs/sord/sord-0.16.8.ebuild deleted file mode 100644 index 26bfc0bacf6b..000000000000 --- a/dev-libs/sord/sord-0.16.8.ebuild +++ /dev/null @@ -1,59 +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} ) -PYTHON_REQ_USE='threads(+)' -inherit python-any-r1 waf-utils multilib-build multilib-minimal - -DESCRIPTION="Library for storing RDF data in memory" -HOMEPAGE="http://drobilla.net/software/sord/" -SRC_URI="http://download.drobilla.net/${P}.tar.bz2" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" -IUSE="doc static-libs test" -RESTRICT="!test? ( test )" - -BDEPEND=" - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" -RDEPEND=" - dev-libs/libpcre - dev-libs/serd -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} -" -DOCS=( "AUTHORS" "NEWS" "README.md" ) - -src_prepare() { - sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die - default - multilib_copy_sources -} - -multilib_src_configure() { - waf-utils_src_configure \ - --docdir=/usr/share/doc/${PF} \ - $(multilib_native_usex doc --docs "") \ - $(usex test --test "") \ - $(usex static-libs --static "") -} - -multilib_src_test() { - ./waf test || die -} - -multilib_src_compile() { - waf-utils_src_compile - default -} - -multilib_src_install() { - waf-utils_src_install - default -} -- cgit v1.2.3