Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-02-29 21:48:23 +00:00
14 changed files with 322 additions and 4 deletions

View File

@@ -2,7 +2,7 @@ DIST doublecmd-1.0.11.gtk2.i386.tar.xz 7555420 BLAKE2B 7b80c8eac6d561b054375ea89
DIST doublecmd-1.0.11.gtk2.x86_64.tar.xz 8315448 BLAKE2B 74ae77064382a76bb743bf63c3f152788156e9e178ab3fd7e2fb4e645e2cd6f1c34365b350490e45521c6d550bad543b94d9ef226f64284b347c1a7f097e33f6 SHA512 edf881df859e6ea4f7de9b65111b9ff4bc4dc0bd1c5a84e1ac218c0ffbf76fcf6ea99f3e412f037a591ee9401261afb95312ba95f197bb3d974f07868bf88f04
DIST doublecmd-1.0.11.qt.i386.tar.xz 7946756 BLAKE2B 828f0925da2939f9234eb587628ec6b038942b26d96d1372e2985055e176a3970048c1e25c0f44a9bde72afc5120215e5534a61d8530f3a64a4ee890657ffc82 SHA512 25fe8d71df7172e64915db2e3a025f5e3e45582f20893bab53db62968d810ddc4c4e9801a9c320821e4bbc22130944d40a7e81fa8cf5d4ce3fe641956990ead8
DIST doublecmd-1.0.11.qt.x86_64.tar.xz 8649332 BLAKE2B 5009b9b001a5605bf130485ee92a39c1310ab2abe543e39278dccca3240a4558e53d2fd9f1fe6010f01da2f82fe625da5ebd1d7aff326e81dcf82abb83e93582 SHA512 2dd4088ea9b7309bf5d9f9bee2bf590d11e1e96690393fae17f04a8b59d7e245fc1c43c6e92a2a44a37e59c54448d42b562ff98fe36eeab85999013ba1719da6
DIST doublecmd-1.1.9.gtk2.i386.tar.xz 7978664 BLAKE2B 1cd05e9c4ec4e486b93bb86aec29de5d173eddfe4974a43e77deba092ed9bfda56eb09ea81514430d9045efef12aeca61b7a4404370a42321d4d3a17d69e79ab SHA512 963189a68af3299c7c9cac406d2c43bc47edaf40e6a1539038b93c018996db8f801d1526ef40c9bc73facbf7292b0f9c030d2a1e54da9fe72bedbf8ad707427e
DIST doublecmd-1.1.9.gtk2.x86_64.tar.xz 8758468 BLAKE2B 66f0afa620d3e1d0f318a15fbd98dd6c0361c7a5fa014a8ae625261740f4cf4db5cfd5479a73e136652b5be9d64bc7a031569586bfc5ab6e9946ab9044877830 SHA512 121ddbb9bb65494036d58936611f265325eb2d01fa482b3420aba48cc2cfa0d8b6417538d31db238477135a89068acb252109b3ed98fe6369fb67f9ce9df4562
DIST doublecmd-1.1.9.qt.i386.tar.xz 8369640 BLAKE2B 6d832d9560e6bb74b1c0fb351894df26d14e00b8c46ae81d59878188fa65c8c1c5865b7eb9ac891b3a461dbba4deffa294b6f885f78d91e852f8117263be7c15 SHA512 bc246c55be94e219ee2a3028939f877790de52d8c2608413bbee750c9e0946510b5bbcc829b2f4fc1bc3a012c87155e73ff6619906b925c48aed0b660325d71d
DIST doublecmd-1.1.9.qt.x86_64.tar.xz 9088508 BLAKE2B 9ed8ae59c711531326615341dc710ed14783c93ac86acd4f4f2eb4d73c4f992b10bd9ddb916585b4181357be7a93f6998495cd308fba4142554a18f9272fd09b SHA512 8aacc2465d34858e76999e9677741d538dc120794463310c2fe2a2c4b56f869d961c01e9fbbdaee3d3a67603099e9ba7443fa72bd584f93a1b604bbca2c6c802
DIST doublecmd-1.1.10.gtk2.i386.tar.xz 7980476 BLAKE2B c178c136ef12608c0cf4d96f8124adfb17a475dbbcef5214ff3f66607e2670e6ebb96b4079cfb3d7879683828688375fb33c96cee42ac11e10e2cd26f3ba6c69 SHA512 f1111d994a3fc1e30831f4c665e200b3efc69684fc0f43ca3723459db99cb794e528c84dc805c6f53a88b0e73ef6cd3e75378226d4b9cd142595fb579e04140f
DIST doublecmd-1.1.10.gtk2.x86_64.tar.xz 8759092 BLAKE2B 75ddd5590522f22b8bacc9a5da163029fba4e724cc0861e85be2ea5420d32fe3f6cd455948a3cc5385d3045139f5ab69627e23589971e94b7a7b49528d3146f4 SHA512 252a6e1bb2c3a19b9263b23f68a6ea0d90a6f23fc45375a99f27fee3daedfb7abdefb93bca6b3464e47bd2f7e9dda05ba23017771f7206fd434106fc7cbe2cff
DIST doublecmd-1.1.10.qt.i386.tar.xz 8374580 BLAKE2B 2dba36f1df2d6aeb2f98c6eab583e259ae6f809ee27462fe5541583a3156a6ecda6f18dec81ef443c936439f00a23c615166792c917cd3c6931a283eb28ae5a9 SHA512 a563b998554794b236093e984f5e93d3ab533b6e19fbc3fad75d20ce3315487b91089c7a5bb66aeb290fcd58c592afa52631ddfcf53cf47b4a7bd8d9305aae69
DIST doublecmd-1.1.10.qt.x86_64.tar.xz 9088508 BLAKE2B 0832449570b618e11304f15fda181e5ade7ecfd5cfd4ab9c054cd1cccea566e4e7a6cdcb6a0d0e5e7ad29adb901bba8e8e97e3135aba95802e5024dae5a74dc5 SHA512 0d6f39bb943db35801861dde6b631c87a882429f4479982a36c740127c756b95ba440559c7e1687f79e0006203e22d5c3e6bbd07f1addd18bb159c424599a606

View File

@@ -1 +1,2 @@
DIST FORD-6.2.5.tar.gz 6140012 BLAKE2B 261ddf8901c53732feb46e5ec9adefd689e10db0e1a674b45c9757f49658d57f1c6d3d0a5ba12bbc9d1d7d0a48031b29c772f438aea2069a5451d7e3b4aaa82b SHA512 1f47ddd45804af3c9d99576e542795f91a1833d816ceccb5e81f8f71710e0c79a4ba769b95b85771365d8c4392d1c812e247a5b82cfee6cc023f61eeedd86d75
DIST FORD-7.0.5.tar.gz 6091408 BLAKE2B 29e2ac05d69c023afa3134e278cb7832caeffa39381a8bbf9412a2aa6ec813d76fbc9d3fde23860337088075ccf467e320a4c9789139c73c63eabe67829b7299 SHA512 b3f9cf8df34fdea5430a4123d7d40cbd07e4d0c9b528c9a5fc509df456651b0576fbae97469ebdc4f1aa8347434622b5c0abcffd1b55ec5f5e7d2fe8e860b35d

View File

@@ -0,0 +1,46 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1 pypi toolchain-funcs
MY_PN="FORD"
DESCRIPTION="FORD, automatic documentation generator for modern Fortran programs"
HOMEPAGE="https://github.com/Fortran-FOSS-Programmers/ford"
SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN^}" "${PV}")"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
RESTRICT="!test? ( test )"
S="${WORKDIR}/${MY_PN}-${PV}"
RDEPEND="
dev-python/beautifulsoup4[${PYTHON_USEDEP}]
>=dev-python/graphviz-0.20[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
>=dev-python/markdown-3.4[${PYTHON_USEDEP}]
>=dev-python/markdown-include-0.8.1[${PYTHON_USEDEP}]
>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
dev-python/python-markdown-math[${PYTHON_USEDEP}]
>=dev-python/rich-12.0.0
>=dev-python/toposort-1.7[${PYTHON_USEDEP}]
>=dev-python/tqdm-4.64.0[${PYTHON_USEDEP}]
>=dev-util/pcpp-1.30
test? ( dev-python/tomli-w )
"
DEPEND="${RDEPEND}"
DOCS=( CHANGELOG.md README.md )
distutils_enable_tests pytest
src_prepare() {
default
sed -i -e 's/"cpp /"'"$(tc-getCPP)"' /' ford/__init__.py || die # bug: 839300
}

1
dev-util/pcpp/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST pcpp-1.30.tar.gz 94283 BLAKE2B d491640ae5ea2c7212d47a015ddb589644f20bafb29365e91e8c58ae4265ae2b2f6b13d85c89af62dfdba4276436c7baff7b6021733b119823dd4de4fca0cdd1 SHA512 1b85a83ccf0a8122bcff6cc66a3eaf498d8cf6ebab10d120c8151f6337276f74910d4e9ff4ac9ecbef5ade1ce22b37f00bbb5eb061f6399ee79eeee889e86b2b

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>torokhov-s-a@yandex.ru</email>
<name>Sergey Torokhov</name>
</maintainer>
<upstream>
<remote-id type="pypi">pcpp</remote-id>
<remote-id type="github">ned14/pcpp</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -0,0 +1,27 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{10..12} pypy3 )
inherit distutils-r1 pypi
DESCRIPTION="A C99 preprocessor written in pure Python"
HOMEPAGE="
https://pypi.org/project/pcpp/
https://github.com/ned14/pcpp/
"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
DOCS=( LICENSE.txt README.rst )
src_prepare() {
sed -i "s:../LICENSE.txt:LICENSE.txt:" setup.py || die
distutils-r1_src_prepare
}

View File

@@ -1 +1,2 @@
DIST WebPlotDigitizer-4.6-linux-x64.zip 109834831 BLAKE2B 5ec14e9498796c28d191023ca9688a5b581033e75607588357e9320614dd02a3098e76cbaa45ab16508273799afaab16c334f50e40b189f8d7cbf70a09f941ab SHA512 635e3c040a42d13c1ac4a83d7e76f5e20b3329dbd375c2177446a4b4232a0edfb3de725c912efc072a9ae5c0bae8ffcb4d6998be40ede554fec8a105f9e654d9
DIST WebPlotDigitizer-4.7-linux-x64.zip 121001396 BLAKE2B 5130b27e2afff22cd2df571076cf3d809708261d6338ea9693527d75faf82e16009195aa9e7418e49ed7693a58c9a2638e19b2be581fc73c5a0702509412ce3a SHA512 264eae05f8087b1533480a1b31b9de330287b0be8761413ac13de09b1df1d115f2acc7170a2785fc8102ded78b231962728318972a71b1f076f39e6d4f894881

View File

@@ -0,0 +1,53 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
MY_PN=${PN%-*}
inherit desktop python-single-r1 xdg
DESCRIPTION="Web based tool to extract data from plots, images, and maps"
HOMEPAGE="https://automeris.io/WebPlotDigitizer/"
SRC_URI="https://automeris.io/downloads/${MY_PN}-${PV}-linux-x64.zip"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64"
#RESTRICT="strip"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
QA_PREBUILT="*"
## RDEPEND is still required to be filled with actual runtime-deps:
## python is just assumed runtime-dependency.
RDEPEND="
${PYTHON_DEPS}
dev-libs/nss
x11-libs/gtk+:3[X,cups,introspection]
"
BDEPEND="app-arch/unzip"
S="${WORKDIR}/${MY_PN}-${PV}-linux-x64"
QA_FLAGS_IGNORED="*"
## It seems media-libs/alsa-lib is required by chrome-sandbox.
## Actually this library isn't required to work.
QA_SONAME="*"
src_install() {
insinto "/opt/${P}"
doins -r "${S}/."
exeinto "/opt/${P}"
doexe "/${S}/${MY_PN}-${PV}"
dosym ../../opt/"${MY_PN}"-bin-"${PV}/${MY_PN}-${PV}" /usr/bin/"${PN}"
newicon "/${S}/resources/app/images/icon/icon.png" ${PN}-icon.png
make_desktop_entry "/opt/${P}/${MY_PN}-${PV}" "${MY_PN}" "${PN}-icon" "Graphics"
## After opening via xdg-open the js scripts could not work (i.e. "File - Load Image" menu)
make_desktop_entry "/usr/bin/xdg-open /opt/${P}/resources/app/index.html" "${MY_PN} html" "viewhtml" "Graphics"
}

View File

@@ -1 +1,2 @@
DIST candy-3.9.1.tar.gz 37847 BLAKE2B af7c857a8a41f0e98bd744162be563b973e20a630fb505de91155ab9fb7a17679a2bb9f69db8c737258d1293c5d77ad96a65a2b22455512b8f97390a7368165f SHA512 aa9727c74ab7c9536331098f11a2837daa51aa58503cbf5b43536afedf5eea8d30db296f515c4689cf44c980eea5a88e06ad161836fe64d4146de4fdce9d99ac
DIST candy-4.0.tar.gz 43112 BLAKE2B 84c3fbab30dc1d40ba73e7c90a02bf6c13b9bb0de2339fe128c958242213986dc2c490c680032c98f9a3a849e237f1f22274b600e55ed94aea91d9529bf972bf SHA512 9f76ab338cec381e1421040055ba73882a32f6b2b9bebe8fbc289c1c0e418506a57698fa8e551a31a918dfbcfa668dbb6c1d82390a2496a7fe35d6a17adacd64

View File

@@ -0,0 +1,43 @@
# Copyright 2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake systemd
DESCRIPTION="Another virtual private network that supports peer-to-peer connections"
HOMEPAGE="https://github.com/lanthora/candy"
SRC_URI="https://github.com/lanthora/candy/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
DEPEND="
dev-libs/uriparser
dev-libs/libconfig
net-libs/ixwebsocket[ws]
dev-libs/openssl
sys-libs/zlib
dev-libs/libfmt
dev-libs/spdlog
"
RDEPEND="${DEPEND}"
src_prepare() {
eapply "${FILESDIR}/${P}-show-version-and-use-cflags-env.patch"
cmake_src_prepare
default
}
src_install(){
cmake_src_install
default
insinto /etc
doins candy.conf
fperms 0644 /etc/candy.conf
systemd_dounit candy.service
systemd_dounit candy@.service
}

View File

@@ -0,0 +1,80 @@
From de8f5a3109ee3bdc472fbc7fcb1572aaad0b8cb9 Mon Sep 17 00:00:00 2001
From: lanthora <lanthora@outlook.com>
Date: Thu, 29 Feb 2024 05:16:53 +0000
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CMakeLists.txt | 10 ++++++----
src/main/main.cc | 13 +++++++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ebf2c0..dffc31d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,12 @@
cmake_minimum_required(VERSION 3.18.4)
-project(candy CXX)
+project(candy LANGUAGES CXX VERSION 4.0)
-set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++2b -Wall -Werror -Wfatal-errors -Wno-unknown-pragmas")
-set(CMAKE_CXX_FLAGS_DEBUG_INIT "-g -fsanitize=address")
-set(CMAKE_CXX_FLAGS_RELEASE_INIT "-O2")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++2b -Wall -Werror -Wfatal-errors -Wno-unknown-pragmas")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
+
+add_compile_definitions(VERSION="${CMAKE_PROJECT_VERSION}")
include_directories(${CMAKE_SOURCE_DIR}/src)
diff --git a/src/main/main.cc b/src/main/main.cc
index 286d24d..65cdc4f 100644
--- a/src/main/main.cc
+++ b/src/main/main.cc
@@ -21,6 +21,10 @@
#include <argp.h>
+#ifndef VERSION
+#define VERSION "unknown"
+#endif
+
namespace {
struct arguments {
@@ -54,6 +58,7 @@ struct argp_option options[] = {
{"config", 'c', "PATH", 0, "Configuration file path"},
{"discovery", OPT_DISCOVERY_INTERVAL, "SECONDS", 0, "Active discovery broadcast interval"},
{"route", 'r', "COST", 0, "Cost of routing"},
+ {"version", 'v', 0, 0, "Show version"},
{"no-timestamp", OPT_NO_TIMESTAMP, 0, 0, "Log does not show time"},
{"debug", OPT_LOG_LEVEL_DEBUG, 0, 0, "Show debug level logs"},
{"auto-restart", OPT_AUTO_RESTART, 0, 0, "Automatic restart"},
@@ -72,6 +77,11 @@ int setLogLevelDebug() {
return 0;
}
+void showVersion() {
+ std::cout << VERSION << std::endl;
+ exit(0);
+}
+
bool needShowUsage(struct arguments *arguments, struct argp_state *state) {
if (state->arg_num > 0)
return true;
@@ -141,6 +151,9 @@ int parseOption(int key, char *arg, struct argp_state *state) {
case 'c':
parseConfigFile(arguments, arg);
break;
+ case 'v':
+ showVersion();
+ break;
case OPT_NO_TIMESTAMP:
disableLogTimestamp();
break;

View File

@@ -1,3 +1,4 @@
DIST OpenCoarrays-2.9.3.tar.gz 326779 BLAKE2B 3ef2262f1047db596bbebf96f5f9b1770056eede05a358dc307fbff290e319827fb7894bf841d77fafc195a865b4acb09efb4da0becca936a5a89131c37245b8 SHA512 4e313e3cb6dcdf309dbc37b96756d69812b2867f4cd3325439746b0f6059c29ff6160a538704c872bb6f55c63be3c4c0ca04294946ac8abc5c36cfc1cdf7b460
DIST OpenCoarrays-2.10.0.tar.gz 329486 BLAKE2B 33df3f8d78f6b763ff16ae61fad6ef0c9d3dbc443b9c0b665ba090158d192607d481fdd4900b2eb1e08e07363ac4f0cc6cbed3f9b4f0d0bd99dcabd8e3ec43d5 SHA512 0316e27e7b644736ea01407b1f1d430a3d01d34dd75a85378fac7bf0db19a370f360976bc8d148791b62206d8f42bbf4197570ea75aa5a318ce07b2ce05042b2
DIST OpenCoarrays-2.10.1.tar.gz 338927 BLAKE2B f3a357c44ca0f2ca9b676afd04490936795b4f208ce8d27e1da3d578ccea40cf3dfed2a81c2a06fe423ef9f74ee3344e0f587bcbb3e7e57898d7bb1c112801f7 SHA512 f90e1f5d9a558730a81efacb5075346fe8f69e2469a5f691c0132fbb8753f0ff41d651cc2c38a4a62cbeea3fb7d8b47b3f6a927f75838f3f0b917e17e7cef017
DIST OpenCoarrays-2.10.2.tar.gz 339400 BLAKE2B 622e4be72d41f3b3749dac920bc4e0b257b07650b0f6a3192a87b1a30a01d56a7eb832d951588f08d70764d55a7d744be945fef37b76785de5da93f544d62ab7 SHA512 941dc192dd5d55f5413e6b05d1cb468d376e3bd481788829dac206ef6f18b9882f7f57704df513f3a2dae4fd4428832308d87ae523b96c164e732ab6f1bbde91

View File

@@ -0,0 +1,52 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
CMAKE_MAKEFILE_GENERATOR=emake
FORTRAN_STANDARD="2003"
inherit cmake flag-o-matic fortran-2
MY_PN="OpenCoarrays"
DESCRIPTION="A parallel application binary interface for Fortran 2018 compilers"
HOMEPAGE="http://www.opencoarrays.org/"
SRC_URI="https://github.com/sourceryinstitute/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.gz"
S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
# Tests fail with FEATURES="network-sandbox" for most versions of openmpi and mpich it with error:
# "No network interfaces were found for out-of-band communications.
# We require at least one available network for out-of-band messaging."
IUSE="static-libs test"
PROPERTIES="test_network"
RESTRICT="!test? ( test )"
# >=sys-cluster/openmpi-4.1.2[fortran] is dropped due to
# multiple test failures issue:
# https://github.com/sourceryinstitute/OpenCoarrays/issues/769
RDEPEND="
>=sys-cluster/mpich-3.4.3[fortran,mpi-threads,threads]
"
DEPEND="
${RDEPEND}
"
src_configure() {
filter-lto # Bug 860765
cmake_src_configure
}
src_install() {
cmake_src_install
if ! use static-libs ; then
find "${ED}" -name '*.a' -delete || die # Bug 901423
fi
}