diff options
author | 2021-01-04 01:35:02 +0000 | |
---|---|---|
committer | 2021-01-04 01:35:02 +0000 | |
commit | c7e44cc922580195b5e818a71d83c37b9c9a92ce (patch) | |
tree | 357bc13f1cca1008237968cdd1ef1bafadb9a766 | |
parent | 2021-01-04 00:35:14 UTC (diff) | |
parent | dev-util/cram: add github remote-id (diff) | |
download | gentoo-c7e44cc922580195b5e818a71d83c37b9c9a92ce.tar.gz gentoo-c7e44cc922580195b5e818a71d83c37b9c9a92ce.tar.bz2 gentoo-c7e44cc922580195b5e818a71d83c37b9c9a92ce.zip |
Merge updates from master
-rw-r--r-- | app-shells/zsh-completions/metadata.xml | 1 | ||||
-rw-r--r-- | dev-python/nose2/metadata.xml | 1 | ||||
-rw-r--r-- | dev-python/python-libevdev/python-libevdev-0.9.ebuild | 3 | ||||
-rw-r--r-- | dev-util/cram/cram-0.7-r1.ebuild | 4 | ||||
-rw-r--r-- | dev-util/cram/metadata.xml | 2 | ||||
-rw-r--r-- | www-client/seamonkey/seamonkey-2.53.6_beta1.ebuild | 5 | ||||
-rw-r--r-- | x11-apps/radeon-profile/Manifest | 1 | ||||
-rw-r--r-- | x11-apps/radeon-profile/files/radeon-profile-20200824-segfault.patch | 33 | ||||
-rw-r--r-- | x11-apps/radeon-profile/radeon-profile-20200824-r1.ebuild (renamed from x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild) | 3 |
9 files changed, 47 insertions, 6 deletions
diff --git a/app-shells/zsh-completions/metadata.xml b/app-shells/zsh-completions/metadata.xml index 5d5af9487f46..cf720fbf04ff 100644 --- a/app-shells/zsh-completions/metadata.xml +++ b/app-shells/zsh-completions/metadata.xml @@ -2,6 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <stabilize-allarches/> <upstream> <remote-id type="github">zsh-users/zsh-completions</remote-id> </upstream> diff --git a/dev-python/nose2/metadata.xml b/dev-python/nose2/metadata.xml index 507e890c359f..6663960b9413 100644 --- a/dev-python/nose2/metadata.xml +++ b/dev-python/nose2/metadata.xml @@ -2,6 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!--maintainer-needed--> + <stabilize-allarches/> <upstream> <remote-id type="github">nose-devs/nose2</remote-id> <remote-id type="pypi">nose2</remote-id> diff --git a/dev-python/python-libevdev/python-libevdev-0.9.ebuild b/dev-python/python-libevdev/python-libevdev-0.9.ebuild index a8f0ef742a66..53f8050717ce 100644 --- a/dev-python/python-libevdev/python-libevdev-0.9.ebuild +++ b/dev-python/python-libevdev/python-libevdev-0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,6 +19,7 @@ RESTRICT="!test? ( test )" DEPEND=" test? ( dev-libs/libevdev ) " +PDEPEND="dev-libs/libevdev" python_test() { esetup.py test diff --git a/dev-util/cram/cram-0.7-r1.ebuild b/dev-util/cram/cram-0.7-r1.ebuild index 008e8aa0cfd7..eabe8c69279f 100644 --- a/dev-util/cram/cram-0.7-r1.ebuild +++ b/dev-util/cram/cram-0.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86" python_test() { distutils_install_for_testing diff --git a/dev-util/cram/metadata.xml b/dev-util/cram/metadata.xml index 01f9e43464e1..6337c2272d02 100644 --- a/dev-util/cram/metadata.xml +++ b/dev-util/cram/metadata.xml @@ -2,6 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <stabilize-allarches/> <longdescription lang="en"> Cram is a functional testing framework for command line applications. Cram tests look like snippets of interactive shell sessions. Cram @@ -10,5 +11,6 @@ </longdescription> <upstream> <remote-id type="pypi">cram</remote-id> + <remote-id type="github">brodie/cram</remote-id> </upstream> </pkgmetadata> diff --git a/www-client/seamonkey/seamonkey-2.53.6_beta1.ebuild b/www-client/seamonkey/seamonkey-2.53.6_beta1.ebuild index 3a90d1a67e71..497d3aca8964 100644 --- a/www-client/seamonkey/seamonkey-2.53.6_beta1.ebuild +++ b/www-client/seamonkey/seamonkey-2.53.6_beta1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -380,6 +380,9 @@ src_configure() { mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" + # use startup-cache for faster startup time + mozconfig_annotate '' --enable-startupcache + # Use an objdir to keep things organized. echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig diff --git a/x11-apps/radeon-profile/Manifest b/x11-apps/radeon-profile/Manifest index 99d2ded170cb..46e512d14a68 100644 --- a/x11-apps/radeon-profile/Manifest +++ b/x11-apps/radeon-profile/Manifest @@ -1,2 +1 @@ -DIST radeon-profile-20200504.tar.gz 395674 BLAKE2B 6435dfcf9d2ce25789f429f12071cdb1c3f85050654b7fdec45c51a59d562d60369b28cfcd2854dfd5841e4af8f9166afed266e0a48d9010619972b653e0d4a8 SHA512 73f7eb59369af57aba5f067202fb1f772e48260c42ad194876926c29d278022daa86235f8d591bc763b8c6d80682553fe9a55f848137a8ec1de1bf9531c162c6 DIST radeon-profile-20200824.tar.gz 395416 BLAKE2B 0f1b9ac59c1e5da97cc0446d32f1fab6435d9049a5dc362d5896849e580382ede745e1759aef3ba659dec0f8f2ae12bb68f0f65313d24f9e3f4cdfa6f7d4887e SHA512 e3e9cf9aa46f81772406f7dc18a3768777b9f2ccdcda18094862183b31857099bf22e2a8b548ade5dedd04a38c8eab7a31127db3b7726adc901c7123a47f81de diff --git a/x11-apps/radeon-profile/files/radeon-profile-20200824-segfault.patch b/x11-apps/radeon-profile/files/radeon-profile-20200824-segfault.patch new file mode 100644 index 000000000000..141dd46d8f79 --- /dev/null +++ b/x11-apps/radeon-profile/files/radeon-profile-20200824-segfault.patch @@ -0,0 +1,33 @@ +From a98da7fd620a9b102a74affe16c0c0daccb97fc4 Mon Sep 17 00:00:00 2001 +From: Haakon Drews <fawz@negentropy.io> +Date: Mon, 4 Jan 2021 02:21:17 +0100 +Subject: [PATCH] Fix segfault when running as regular user + +Bug: https://github.com/marazmista/radeon-profile/issues/244 +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + radeon-profile/gpu.cpp | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/radeon-profile/gpu.cpp b/radeon-profile/gpu.cpp +index ccd99d3..f5e32a3 100644 +--- a/radeon-profile/gpu.cpp ++++ b/radeon-profile/gpu.cpp +@@ -69,7 +69,13 @@ void gpu::detectCards() { + + int pciIdx = ueventContents.indexOf(QRegExp("PCI_SLOT_NAME.+")); + if (pciIdx != -1) +- gsi.name = globalStuff::grabSystemInfo("lspci -s " + ueventContents[pciIdx].split('=')[1])[0].split(':')[2].trimmed(); ++ { ++ auto input = globalStuff::grabSystemInfo("lspci -s " + ueventContents[pciIdx].split('=')[1]); ++ if(input.size() < 3) ++ gsi.name = "UNKNOWN"; ++ else ++ gsi.name = input[0].split(':')[2].trimmed(); ++ } + + gpuList.append(gsi); + +-- +2.30.0 + diff --git a/x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild b/x11-apps/radeon-profile/radeon-profile-20200824-r1.ebuild index d836b3ad1f83..1024baeddcbe 100644 --- a/x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild +++ b/x11-apps/radeon-profile/radeon-profile-20200824-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -41,6 +41,7 @@ DEPEND=" PATCHES=( "${FILESDIR}/${PN}-20200504-run_subdir.patch" + "${FILESDIR}/${PN}-20200824-segfault.patch" ) src_prepare() { |