Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-02-17 12:17:59 +00:00
7 changed files with 74 additions and 5 deletions

View File

@@ -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

View File

@@ -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"

View File

@@ -1 +1 @@
DIST newsraft-0.19.tar.gz 175794 BLAKE2B 6d665c0bf56da68e123e4662cbdc857599206f9a90e753c7d0f16ffdea2b0f67d4a338f7954eb5f5f2426e1ae7238f64623939f11e5a07e37846e7c11d76c293 SHA512 d9f59f500891b37ef15796a8ec66a5249c3ef3cc5112d2230bf1f606d78f7332ccc17d5846bf9c30a268951059d3a805de651c2b8c3a607572f59126b3d308f0
DIST newsraft-0.23.tar.gz 139740 BLAKE2B 5a98c25b120f79d7ccf518545146ab8ec4e2c86772cc0fb9723b225ff15a8e86761f4d79ce25bdf5182a5fbf282b0ffa9b618e9265e589fc9fcbeac8fb75c325 SHA512 e55acd637d55dc5566fa5aed1b7c74b8f7f1b61b8ad4de0db08d0ab32a99d68bbbce2f5f47fdc0c43d7601cc1221fe7ae5ca41b1c3d2d7e44a3621d577dc4edc

View File

@@ -0,0 +1,25 @@
From 5484f2df40aa362f01859049782a467439325c20 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
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

View File

@@ -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"
@@ -32,10 +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

View File

@@ -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,9 +35,14 @@ BDEPEND="
"
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

View File

@@ -0,0 +1,26 @@
From 4be4a956ad1a1ff767dcc91c88fac103d5780578 Mon Sep 17 00:00:00 2001
From: Huang Rui <vowstar@gmail.com>
Date: Fri, 15 Sep 2023 19:38:34 +0800
Subject: [PATCHv1] external/CMakeLists.txt: fix gentoo libfmt depend
Signed-off-by: Huang Rui <vowstar@gmail.com>
---
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