From 5bdc77adc9eed7ff16ea011b116a4a78a5939afd Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sat, 17 Feb 2024 11:32:14 +0100 Subject: [PATCH 1/6] net-news/newsraft: Fix tests without native-symlinks Signed-off-by: Haelwenn (lanodan) Monnier --- net-news/newsraft/newsraft-9999.ebuild | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net-news/newsraft/newsraft-9999.ebuild b/net-news/newsraft/newsraft-9999.ebuild index f2923dc3fc..4808d8d113 100644 --- a/net-news/newsraft/newsraft-9999.ebuild +++ b/net-news/newsraft/newsraft-9999.ebuild @@ -1,8 +1,10 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit toolchain-funcs + DESCRIPTION="A lightweight feed reader with ncurses user interface inspired by Newsboat." HOMEPAGE="https://codeberg.org/grisha/newsraft" @@ -36,6 +38,11 @@ src_compile() { emake CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } +src_test() { + tc-export CC # For run-check.sh + emake CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" check +} + src_install() { emake PREFIX="/usr" DESTDIR="${D}" install einstalldocs From 82246f1e39d1f222ccce4edd8bede0fbb79b69f1 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sat, 17 Feb 2024 11:39:01 +0100 Subject: [PATCH 2/6] net-news/newsraft: use toolchain-funcs for default $CC Closes: https://bugs.gentoo.org/911243 Closes: https://bugs.gentoo.org/911242 Closes: https://bugs.gentoo.org/911241 Signed-off-by: Haelwenn (lanodan) Monnier --- net-news/newsraft/newsraft-0.19.ebuild | 5 ++++- net-news/newsraft/newsraft-9999.ebuild | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net-news/newsraft/newsraft-0.19.ebuild b/net-news/newsraft/newsraft-0.19.ebuild index f2923dc3fc..462c5323d8 100644 --- a/net-news/newsraft/newsraft-0.19.ebuild +++ b/net-news/newsraft/newsraft-0.19.ebuild @@ -1,8 +1,10 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit toolchain-funcs + DESCRIPTION="A lightweight feed reader with ncurses user interface inspired by Newsboat." HOMEPAGE="https://codeberg.org/grisha/newsraft" @@ -33,6 +35,7 @@ BDEPEND=" " src_compile() { + tc-getCC emake CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } diff --git a/net-news/newsraft/newsraft-9999.ebuild b/net-news/newsraft/newsraft-9999.ebuild index 4808d8d113..5ba5912afb 100644 --- a/net-news/newsraft/newsraft-9999.ebuild +++ b/net-news/newsraft/newsraft-9999.ebuild @@ -35,11 +35,11 @@ BDEPEND=" " src_compile() { + tc-getCC emake CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } src_test() { - tc-export CC # For run-check.sh emake CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" check } From 528ea8992ac1f2322daf9c1689e465e45ee8c8b5 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sat, 17 Feb 2024 11:46:34 +0100 Subject: [PATCH 3/6] net-news/newsraft: add 0.23, drop 0.19 Closes: https://bugs.gentoo.org/922032 Signed-off-by: Haelwenn (lanodan) Monnier --- net-news/newsraft/Manifest | 2 +- .../files/newsraft-0.23-hardcoded-CC.patch | 25 +++++++++++++++++++ ...sraft-0.19.ebuild => newsraft-0.23.ebuild} | 8 ++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 net-news/newsraft/files/newsraft-0.23-hardcoded-CC.patch rename net-news/newsraft/{newsraft-0.19.ebuild => newsraft-0.23.ebuild} (86%) diff --git a/net-news/newsraft/Manifest b/net-news/newsraft/Manifest index 12e2284641..0c66e2a827 100644 --- a/net-news/newsraft/Manifest +++ b/net-news/newsraft/Manifest @@ -1 +1 @@ -DIST newsraft-0.19.tar.gz 175794 BLAKE2B 6d665c0bf56da68e123e4662cbdc857599206f9a90e753c7d0f16ffdea2b0f67d4a338f7954eb5f5f2426e1ae7238f64623939f11e5a07e37846e7c11d76c293 SHA512 d9f59f500891b37ef15796a8ec66a5249c3ef3cc5112d2230bf1f606d78f7332ccc17d5846bf9c30a268951059d3a805de651c2b8c3a607572f59126b3d308f0 +DIST newsraft-0.23.tar.gz 139740 BLAKE2B 5a98c25b120f79d7ccf518545146ab8ec4e2c86772cc0fb9723b225ff15a8e86761f4d79ce25bdf5182a5fbf282b0ffa9b618e9265e589fc9fcbeac8fb75c325 SHA512 e55acd637d55dc5566fa5aed1b7c74b8f7f1b61b8ad4de0db08d0ab32a99d68bbbce2f5f47fdc0c43d7601cc1221fe7ae5ca41b1c3d2d7e44a3621d577dc4edc diff --git a/net-news/newsraft/files/newsraft-0.23-hardcoded-CC.patch b/net-news/newsraft/files/newsraft-0.23-hardcoded-CC.patch new file mode 100644 index 0000000000..5b04de4c99 --- /dev/null +++ b/net-news/newsraft/files/newsraft-0.23-hardcoded-CC.patch @@ -0,0 +1,25 @@ +From 5484f2df40aa362f01859049782a467439325c20 Mon Sep 17 00:00:00 2001 +From: "Haelwenn (lanodan) Monnier" +Date: Sat, 17 Feb 2024 11:11:48 +0100 +Subject: [PATCH] run-check.sh: Don't hardcode cc, don't assume a.out output + +--- + tests/run-check.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/run-check.sh b/tests/run-check.sh +index c152289..c24973b 100755 +--- a/tests/run-check.sh ++++ b/tests/run-check.sh +@@ -12,7 +12,7 @@ + for test_file in *.c + do + tests_count="$((tests_count + 1))" +- if cc -Isrc -L. "$test_file" -l:libnewsraft.so && env LD_LIBRARY_PATH=. ./a.out; then ++ if ${CC:-cc} -Isrc -o ./a.out "$test_file" -L. -l:libnewsraft.so && env LD_LIBRARY_PATH=. ./a.out; then + echo "[OKAY] $test_file" + okays_count="$((okays_count + 1))" + else +-- +2.43.0 + diff --git a/net-news/newsraft/newsraft-0.19.ebuild b/net-news/newsraft/newsraft-0.23.ebuild similarity index 86% rename from net-news/newsraft/newsraft-0.19.ebuild rename to net-news/newsraft/newsraft-0.23.ebuild index 462c5323d8..baeac03acc 100644 --- a/net-news/newsraft/newsraft-0.19.ebuild +++ b/net-news/newsraft/newsraft-0.23.ebuild @@ -34,11 +34,19 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/newsraft-0.23-hardcoded-CC.patch" +) + src_compile() { tc-getCC emake CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } +src_test() { + emake CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" check +} + src_install() { emake PREFIX="/usr" DESTDIR="${D}" install einstalldocs From a4c25685b8c3827d60dfcabd603df5cb3ea6b4d9 Mon Sep 17 00:00:00 2001 From: Vitaly Zdanevich Date: Sat, 17 Feb 2024 14:56:20 +0400 Subject: [PATCH 4/6] gui-apps/1password: fix LDFLAGS Closes: https://bugs.gentoo.org/924687 Signed-off-by: Vitaly Zdanevich --- gui-apps/1password/1password-8.10.16.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-apps/1password/1password-8.10.16.ebuild b/gui-apps/1password/1password-8.10.16.ebuild index c34eb18443..8db1760aab 100644 --- a/gui-apps/1password/1password-8.10.16.ebuild +++ b/gui-apps/1password/1password-8.10.16.ebuild @@ -32,7 +32,7 @@ src_unpack() { rpm_unpack ${P}.x86_64.rpm } -QA_PREBUILT="/usr/bin/${PN}" +QA_PREBUILT="opt/1Password/*" QA_SONAME=" /usr/lib64/libXcomposite.so.1 From c12d5217ab715d7e9f0ffc9affa8f886745f7811 Mon Sep 17 00:00:00 2001 From: NRK Date: Sat, 17 Feb 2024 10:58:28 +0000 Subject: [PATCH 5/6] mpv-plugin/thumbfast: fix license typpo Signed-off-by: NRK --- mpv-plugin/thumbfast/thumbfast-2023.12.08.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpv-plugin/thumbfast/thumbfast-2023.12.08.ebuild b/mpv-plugin/thumbfast/thumbfast-2023.12.08.ebuild index 0868818c77..0de62af727 100644 --- a/mpv-plugin/thumbfast/thumbfast-2023.12.08.ebuild +++ b/mpv-plugin/thumbfast/thumbfast-2023.12.08.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/po5/thumbfast" SRC_URI="https://github.com/po5/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" -LICENSE="MPL-2" +LICENSE="MPL-2.0" KEYWORDS="~amd64" RDEPEND="app-shells/bash" From fc45f8635b7ce82adfad6488ef2ee494c9bb2a9d Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 17 Feb 2024 20:07:05 +0800 Subject: [PATCH 6/6] sci-electronics/slang: add missing patch file to slang-5.0 Signed-off-by: Huang Rui --- .../slang-5.0-fix-gentoo-libfmt-depend.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 sci-electronics/slang/files/slang-5.0-fix-gentoo-libfmt-depend.patch diff --git a/sci-electronics/slang/files/slang-5.0-fix-gentoo-libfmt-depend.patch b/sci-electronics/slang/files/slang-5.0-fix-gentoo-libfmt-depend.patch new file mode 100644 index 0000000000..5a94a3058a --- /dev/null +++ b/sci-electronics/slang/files/slang-5.0-fix-gentoo-libfmt-depend.patch @@ -0,0 +1,26 @@ +From 4be4a956ad1a1ff767dcc91c88fac103d5780578 Mon Sep 17 00:00:00 2001 +From: Huang Rui +Date: Fri, 15 Sep 2023 19:38:34 +0800 +Subject: [PATCHv1] external/CMakeLists.txt: fix gentoo libfmt depend + +Signed-off-by: Huang Rui +--- + external/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +index 9341eb2e2ffa..4ea7429a69a8 100644 +--- a/external/CMakeLists.txt ++++ b/external/CMakeLists.txt +@@ -4,7 +4,7 @@ + # ~~~ + + # Required minimum versions for dependencies +-set(fmt_min_version "10.1") ++set(fmt_min_version "9.0") + set(mimalloc_min_version "2.1") + set(catch2_min_version "3.0") + +-- +2.42.0 +