mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-18 11:33:15 -04:00
Merge updates from master
This commit is contained in:
Repository mirror & CI
1
app-admin/himitsu-totp/Manifest
Normal file
1
app-admin/himitsu-totp/Manifest
Normal file
@@ -0,0 +1 @@
|
||||
DIST himitsu-totp-0.1.tar.gz 15188 BLAKE2B c5165556e67440e847f9ee6ab653705f22953b08a678e6a865e9d0fe2946b8ad755e685b62b0bdf5dc9c5f44698d85c8095bd8b2b43f5731721c26e407868955 SHA512 767dbfc0bee2942e4b2a75ea2e76ec39f06bcc979cd6f6f1e63d7e64d4f26c311458f47c282915f0e6f4ea39582510b4f516ac76251acb617105495f9bdfeb30
|
||||
32
app-admin/himitsu-totp/himitsu-totp-0.1.ebuild
Normal file
32
app-admin/himitsu-totp/himitsu-totp-0.1.ebuild
Normal file
@@ -0,0 +1,32 @@
|
||||
# Copyright 2022-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
if [[ "${PV}" = "9999" ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/himitsu-totp"
|
||||
else
|
||||
SRC_URI="https://git.sr.ht/~sircmpwn/himitsu-totp/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm64 ~riscv"
|
||||
fi
|
||||
|
||||
DESCRIPTION="TOTP support for Himitsu"
|
||||
HOMEPAGE="https://git.sr.ht/~sircmpwn/himitsu-totp"
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
|
||||
|
||||
RDEPEND="app-admin/himitsu:="
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
dev-lang/hare:=
|
||||
"
|
||||
BDEPEND="app-text/scdoc"
|
||||
|
||||
# hare binary
|
||||
QA_FLAGS_IGNORED="usr/bin/hitotp"
|
||||
|
||||
src_configure() {
|
||||
sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 2022 Gentoo Authors
|
||||
# Copyright 2022-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -27,17 +27,6 @@ BDEPEND="app-text/scdoc"
|
||||
# hare binary
|
||||
QA_FLAGS_IGNORED="usr/bin/hitotp"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i 's|^use query;|use himitsu::query;|' cmd/hitotp/main.ha || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
einstalldocs
|
||||
dobin hitotp
|
||||
}
|
||||
|
||||
@@ -16,5 +16,5 @@ src_install() {
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo: "How to use: run in terminal in a folder - and in another software create a file with space in name, in that folder"
|
||||
einfo "How to use: run in terminal in a folder - and in another software create a file with space in name, in that folder"
|
||||
}
|
||||
|
||||
1
games-rpg/heroes-of-might-and-magic-v-demo/Manifest
Normal file
1
games-rpg/heroes-of-might-and-magic-v-demo/Manifest
Normal file
@@ -0,0 +1 @@
|
||||
DIST heroes-of-might-and-magic-v-demo.tar.xz 692521392 BLAKE2B 7403495d8f303b68937c11ac7db3738f883ea4ccbeb08e4a9ea9566e458a2e90ca0766579d5323f16e30b2e8d83e09675d1ef743a7289f0dc392d2fbaccc3061 SHA512 dd2293f377426e29eb38939d2b934fcadb4491899df92656578e9385ef5de5b5107e5a6609c33a0e87f776e56b1e0a684d0248d587c56107d776211a7be82a3a
|
||||
@@ -0,0 +1,51 @@
|
||||
# Copyright 1999-2024 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit wrapper
|
||||
|
||||
DESCRIPTION="HoMM 5, a few maps included. Camera zoom looks like broken. Metacritic: 77"
|
||||
HOMEPAGE="https://en.wikipedia.org/wiki/Heroes_of_Might_and_Magic_V"
|
||||
|
||||
SRC_URI="https://archive.org/download/$PN.tar.xz/$PN.tar.xz"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
S="${WORKDIR}"
|
||||
|
||||
LICENSE="all-rights-reserved"
|
||||
SLOT="0"
|
||||
RESTRICT="strip"
|
||||
|
||||
RDEPEND="
|
||||
virtual/wine
|
||||
app-emulation/dxvk
|
||||
"
|
||||
|
||||
QA_PREBUILT="*"
|
||||
|
||||
src_install() {
|
||||
|
||||
mkdir -p "$ED$/opt"
|
||||
|
||||
mkdir "$ED/opt" || die
|
||||
mkdir -p "$ED/usr/bin/" || die
|
||||
cp -r "$PN" "$ED/opt/$PN" || die
|
||||
|
||||
make_wrapper "$PN" "env WINEPREFIX=/home/\$USER/.wine-homm5 wine /opt/$PN/bin/H5_Game.exe"
|
||||
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "Downloaded from https://www.moddb.com/games/heroes-of-might-and-magic-5/downloads/heroes-of-might-and-magic-v-demo"
|
||||
einfo "More about the game:"
|
||||
einfo "https://www.wikidata.org/wiki/Q2450"
|
||||
einfo "https://www.metacritic.com/game/heroes-of-might-and-magic-v/"
|
||||
einfo ""
|
||||
einfo "Buy the full game at"
|
||||
einfo "https://www.gog.com/en/game/heroes_of_might_and_magic_5_bundle"
|
||||
einfo "https://store.steampowered.com/app/15170/Heroes_of_Might__Magic_V/"
|
||||
einfo "https://www.humblebundle.com/store/heroes-of-might-magic-v"
|
||||
einfo ""
|
||||
einfo "The game is installed to /opt/$PN - if you want to run it by another Wine or operating system"
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>contact@hacktivis.me</email>
|
||||
<name>Haelwenn (lanodan) Monnier</name>
|
||||
<name>Vitaly Zdanevich</name>
|
||||
<email>zdanevich.vitaly@ya.ru</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
1
games-strategy/ground-control/Manifest
Normal file
1
games-strategy/ground-control/Manifest
Normal file
@@ -0,0 +1 @@
|
||||
DIST ground-control.tar.xz 476764820 BLAKE2B d417dd5ba655c0ad1cbfeba5f8d9649cd84b4f068ed45a008332aa2cde9de8b317f8be57928a176e5c4c8708298793a41400abe82d1cda18a78915531a446e95 SHA512 6e12b1ece587fcb78664a34010eed922c7e716b1df659d260e6a0c7e64828adeea34cfc02266e563f7566a9ff99503e6d8fa19c05117627e50ae57c9fc840602
|
||||
45
games-strategy/ground-control/ground-control-1011.ebuild
Normal file
45
games-strategy/ground-control/ground-control-1011.ebuild
Normal file
@@ -0,0 +1,45 @@
|
||||
# Copyright 1999-2024 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit wrapper
|
||||
|
||||
DESCRIPTION="From 2000, Metacritic is 75"
|
||||
HOMEPAGE="https://en.wikipedia.org/wiki/Ground_Control_(video_game)"
|
||||
|
||||
SRC_URI="https://archive.org/download/$PN.tar.xz/$PN.tar.xz"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
S="${WORKDIR}"
|
||||
|
||||
LICENSE="all-rights-reserved"
|
||||
SLOT="0"
|
||||
RESTRICT="strip"
|
||||
|
||||
RDEPEND="
|
||||
virtual/wine
|
||||
app-emulation/dxvk
|
||||
"
|
||||
|
||||
QA_PREBUILT="*"
|
||||
|
||||
src_install() {
|
||||
|
||||
mkdir -p "$ED$/opt"
|
||||
|
||||
mkdir "$ED/opt" || die
|
||||
mkdir -p "$ED/usr/bin/" || die
|
||||
cp -r "$PN" "$ED/opt/$PN" || die
|
||||
|
||||
make_wrapper "$PN" "env WINEPREFIX=/home/\$USER/.wine-ground-control wine /opt/$PN/gc.exe"
|
||||
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "Downloaded from https://www.moddb.com/games/ground-control/downloads/ground-control-install"
|
||||
einfo "More about the game:"
|
||||
einfo "https://www.wikidata.org/wiki/Q1547686"
|
||||
einfo "https://www.metacritic.com/game/1300002617/"
|
||||
einfo "The game is installed to /opt/$PN - if you want to run it by another Wine or operating system"
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">mlterm</remote-id>
|
||||
</upstream>
|
||||
<maintainer type="person">
|
||||
<name>Vitaly Zdanevich</name>
|
||||
<email>zdanevich.vitaly@ya.ru</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
1
games-strategy/swine/Manifest
Normal file
1
games-strategy/swine/Manifest
Normal file
@@ -0,0 +1 @@
|
||||
DIST swine.tar.xz 586370844 BLAKE2B 89ef83e0c0df58938f66aff096e281a9dedc26777afb560173bfa9d35f1a53bc0044f5974439cd2c012cd8912b77e19827489335f5349ac38a7c8bef85e4b4d6 SHA512 d58c3412d7ee7a49758b228ae1f7d91d11e2c997fc7a9497137657bd265f289cc9d09a8714a7309fbbcd0b115732edf7572d392b3361133228e86bf8f99b68fa
|
||||
8
games-strategy/swine/metadata.xml
Normal file
8
games-strategy/swine/metadata.xml
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<name>Vitaly Zdanevich</name>
|
||||
<email>zdanevich.vitaly@ya.ru</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
52
games-strategy/swine/swine-1.ebuild
Normal file
52
games-strategy/swine/swine-1.ebuild
Normal file
@@ -0,0 +1,52 @@
|
||||
# Copyright 1999-2024 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit wrapper
|
||||
|
||||
DESCRIPTION="Simple RTS from 2005, Metacritic is 65, user score is 8.2"
|
||||
HOMEPAGE="https://en.wikipedia.org/wiki/S.W.I.N.E."
|
||||
|
||||
SRC_URI="https://archive.org/download/$PN.tar.xz/$PN.tar.xz"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
S="${WORKDIR}"
|
||||
|
||||
LICENSE="all-rights-reserved"
|
||||
SLOT="0"
|
||||
RESTRICT="strip"
|
||||
|
||||
RDEPEND="
|
||||
virtual/wine
|
||||
"
|
||||
|
||||
QA_PREBUILT="*"
|
||||
|
||||
src_install() {
|
||||
|
||||
exec=swine.exe
|
||||
|
||||
mkdir -p "$ED$/opt"
|
||||
|
||||
mkdir "$ED/opt" || die
|
||||
mkdir -p "$ED/usr/bin/" || die
|
||||
cp -r "$PN" "$ED/opt/$PN" || die
|
||||
fperms o+w "/opt/$PN/$PN.log" # Will not start without it
|
||||
|
||||
echo "cd /opt/$PN; wine $exec; cd -" > "$ED/usr/bin/$PN"
|
||||
# I tried
|
||||
# make_wrapper "$PN" "env WINEPREFIX=/home/\$USER/.wine-swine wine /opt/$PN/swine.exe"
|
||||
# but game got error - because we need to run from the game directory
|
||||
fperms +x "/usr/bin/$PN"
|
||||
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "Downloaded from https://www.moddb.com/games/swn/downloads/s-w-i-n-e-full-game"
|
||||
einfo "More about the game:"
|
||||
einfo "https://www.youtube.com/channel/UCNtssCCyFCEr6N8N5T9kvHQ"
|
||||
einfo "https://www.wikidata.org/wiki/Q844994"
|
||||
einfo "https://www.metacritic.com/game/s-w-i-n-e/"
|
||||
einfo "The game is installed to /opt/$PN/ - if you want to run it by another Wine or operating system"
|
||||
}
|
||||
@@ -5,7 +5,7 @@ EAPI=8
|
||||
|
||||
inherit font
|
||||
|
||||
MY_PN="Firge"
|
||||
MY_PN="${PN^}"
|
||||
MY_PV="v${PV}"
|
||||
MY_P="${MY_PN}_${MY_PV}"
|
||||
MY_P_NF="${MY_PN}Nerd_${MY_PV}"
|
||||
@@ -16,6 +16,9 @@ SRC_URI="https://github.com/yuru7/Firge/releases/download/${MY_PV}/${MY_P}.zip
|
||||
nerdfonts? ( https://github.com/yuru7/Firge/releases/download/${MY_PV}/${MY_P_NF}.zip )
|
||||
"
|
||||
|
||||
S="${WORKDIR}"
|
||||
FONT_SUFFIX="ttf"
|
||||
|
||||
LICENSE="OFL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
@@ -23,9 +26,6 @@ IUSE="nerdfonts"
|
||||
|
||||
BDEPEND="app-arch/unzip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
FONT_SUFFIX="ttf"
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
mv ${MY_P}/*.${FONT_SUFFIX} . || die
|
||||
|
||||
@@ -16,6 +16,9 @@ SRC_URI="https://github.com/yuru7/HackGen/releases/download/${MY_PV}/${MY_P}.zip
|
||||
nerdfonts? ( https://github.com/yuru7/HackGen/releases/download/${MY_PV}/${MY_P_NF}.zip )
|
||||
"
|
||||
|
||||
S="${WORKDIR}"
|
||||
FONT_SUFFIX="ttf"
|
||||
|
||||
LICENSE="OFL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
@@ -23,9 +26,6 @@ IUSE="nerdfonts"
|
||||
|
||||
BDEPEND="app-arch/unzip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
FONT_SUFFIX="ttf"
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
mv ${MY_P}/*.${FONT_SUFFIX} . || die
|
||||
|
||||
2
media-fonts/moralerspace/Manifest
Normal file
2
media-fonts/moralerspace/Manifest
Normal file
@@ -0,0 +1,2 @@
|
||||
DIST MoralerspaceNF_v1.0.0.zip 58378905 BLAKE2B e8b55e978c7c278be27f227901b107fda4818ab950ab742f0cb92e8b7b36402717dfcd7fa5c0eff3acc2abf2894192d49c93d34cea215e1e2a949a95f924c03b SHA512 03baff0cc7322284b0d16343c1f38906fdf5ad97e9e733cb3592d66722759708e725d54a9ba3dcf050ac318daaa8dffc9ff7a561135f378e6ae10a59ca7c67ba
|
||||
DIST Moralerspace_v1.0.0.zip 39136796 BLAKE2B f8d3180827616a3862e72ec8b858b7e1b7f75672df57c44a9d803cdaa697505d0d75c333b31280a6970a80757863bc3b93fc4860c6cb03e717dafa41a9be1f04 SHA512 279493b993c80c0807db6111ea4e0dcfad3eaa83772791f9ccf04ae552e897cca7f468e6a84b7942309ac6cad4c3353648903ef18e2b9de2fd533f422cabc207
|
||||
15
media-fonts/moralerspace/metadata.xml
Normal file
15
media-fonts/moralerspace/metadata.xml
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>dev@dyama.net</email>
|
||||
<name>Daichi Yamamoto</name>
|
||||
</maintainer>
|
||||
<stabilize-allarches />
|
||||
<use>
|
||||
<flag name="nerdfonts">Install Nerd Fonts composite version</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="github">yuru7/moralerspace</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
35
media-fonts/moralerspace/moralerspace-1.0.0.ebuild
Normal file
35
media-fonts/moralerspace/moralerspace-1.0.0.ebuild
Normal file
@@ -0,0 +1,35 @@
|
||||
# Copyright 2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit font
|
||||
|
||||
MY_PN="${PN^}"
|
||||
MY_PV="v${PV}"
|
||||
MY_P="${MY_PN}_${MY_PV}"
|
||||
MY_P_NF="${MY_PN}NF_${MY_PV}"
|
||||
|
||||
DESCRIPTION="moralerspace is a composite font of Monaspace and IBM Plex Sans JP."
|
||||
HOMEPAGE="https://github.com/yuru7/moralerspace"
|
||||
SRC_URI="https://github.com/yuru7/moralerspace/releases/download/${MY_PV}/${MY_P}.zip
|
||||
nerdfonts? ( https://github.com/yuru7/moralerspace/releases/download/${MY_PV}/${MY_P_NF}.zip )
|
||||
"
|
||||
|
||||
S="${WORKDIR}"
|
||||
FONT_SUFFIX="ttf"
|
||||
|
||||
LICENSE="OFL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
IUSE="nerdfonts"
|
||||
|
||||
BDEPEND="app-arch/unzip"
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
mv ${MY_P}/*.${FONT_SUFFIX} . || die
|
||||
if use nerdfonts; then
|
||||
mv ${MY_P_NF}/*.${FONT_SUFFIX} . || die
|
||||
fi
|
||||
}
|
||||
@@ -18,6 +18,9 @@ SRC_URI="https://github.com/yuru7/PlemolJP/releases/download/${MY_PV}/${MY_P}.zi
|
||||
nerdfonts? ( https://github.com/yuru7/PlemolJP/releases/download/${MY_PV}/${MY_P_NF}.zip )
|
||||
"
|
||||
|
||||
S="${WORKDIR}"
|
||||
FONT_SUFFIX="ttf"
|
||||
|
||||
LICENSE="OFL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
@@ -25,9 +28,6 @@ IUSE="hiddenspace nerdfonts"
|
||||
|
||||
BDEPEND="app-arch/unzip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
FONT_SUFFIX="ttf"
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
mv ${MY_P}/*/*.${FONT_SUFFIX} . || die
|
||||
|
||||
@@ -16,6 +16,9 @@ SRC_URI="https://github.com/yuru7/udev-gothic/releases/download/${MY_PV}/${MY_P}
|
||||
nerdfonts? ( https://github.com/yuru7/udev-gothic/releases/download/${MY_PV}/${MY_P_NF}.zip )
|
||||
"
|
||||
|
||||
S="${WORKDIR}"
|
||||
FONT_SUFFIX="ttf"
|
||||
|
||||
LICENSE="OFL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
@@ -23,9 +26,6 @@ IUSE="nerdfonts"
|
||||
|
||||
BDEPEND="app-arch/unzip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
FONT_SUFFIX="ttf"
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
mv ${MY_P}/*.${FONT_SUFFIX} . || die
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
# Copyright 2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit git-r3 meson
|
||||
|
||||
DESCRIPTION="Terminal-based ALSA VU-meter with peaking"
|
||||
HOMEPAGE="https://git.sr.ht/~kennylevinsen/tavu"
|
||||
EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/tavu"
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
|
||||
DEPEND="media-libs/alsa-lib"
|
||||
RDEPEND="${DEPEND}"
|
||||
@@ -0,0 +1,37 @@
|
||||
From 2c1a891d5e11f0faf49e6a33a566342590ab62df Mon Sep 17 00:00:00 2001
|
||||
From: "mingang.he" <dustgle@gmail.com>
|
||||
Date: Thu, 22 Feb 2024 12:09:00 +0000
|
||||
Subject: [PATCH] Fix parallel build dependency, close #65
|
||||
|
||||
This commit corrects the dependency issue in the Makefile which was causing errors during parallel builds. Specifically, it addresses the following changes:
|
||||
|
||||
- Separate build rules for local/graftcp-local and local/mgraftcp to individually specify their dependencies and build commands.
|
||||
- Ensure local/mgraftcp explicitly depends on libgraftcp.a, and build it prior to local/mgraftcp to resolve potential race conditions.
|
||||
- The local/graftcp-local target does not depend on libgraftcp.a, hence a separate rule is created without this dependency.
|
||||
|
||||
These adjustments ensure that each binary is built correctly respecting their precise dependencies, and thus preventing errors that may occur due to incorrect builds when using the -j option for parallel execution in make.
|
||||
---
|
||||
Makefile | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 64d088a..22c46ab 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -67,8 +67,11 @@ libgraftcp.a: graftcp.o util.o cidr-trie.o conf.o
|
||||
%.o: %.c
|
||||
$(CC) $(CFLAGS) -c -o $@ $<
|
||||
|
||||
-$(GRAFTCP_LOCAL_BIN)::
|
||||
- $(MAKE) -C local VERSION=$(VERSION) CC=$(CC) CXX=$(CXX) AR=$(AR)
|
||||
+local/graftcp-local:
|
||||
+ $(MAKE) -C $(dir $@) VERSION=$(VERSION) CC=$(CC) CXX=$(CXX) AR=$(AR) $(notdir $@)
|
||||
+
|
||||
+local/mgraftcp: libgraftcp.a
|
||||
+ $(MAKE) -C $(dir $@) VERSION=$(VERSION) CC=$(CC) CXX=$(CXX) AR=$(AR) $(notdir $@)
|
||||
|
||||
install:: graftcp $(GRAFTCP_LOCAL_BIN)
|
||||
$(INSTALL) $< $(DESTDIR)$(BINDIR)/$<
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
From 17e60d1a6e9a1a8ee4e2c6016388a6ee5f1b2284 Mon Sep 17 00:00:00 2001
|
||||
From: unlsycn <unlsycn@unlsycn.com>
|
||||
Date: Mon, 1 Apr 2024 16:22:53 +0800
|
||||
Subject: [PATCH] let graftcp respect LDFLAGS
|
||||
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 22c46ab..a9a6776 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -59,7 +59,7 @@ all:: $(TARGET)
|
||||
|
||||
|
||||
graftcp: main.o graftcp.o util.o cidr-trie.o conf.o
|
||||
- $(CC) $^ -o $@
|
||||
+ $(CC) $^ -o $@ $(LDFLAGS)
|
||||
|
||||
libgraftcp.a: graftcp.o util.o cidr-trie.o conf.o
|
||||
$(AR) rcs $@ $^
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@@ -33,9 +33,15 @@ PATCHES="
|
||||
${FILESDIR}/0001-build-not-enabling-service-in-install_systemd.patch
|
||||
${FILESDIR}/0002-build-no-longer-strip-symbols.patch
|
||||
${FILESDIR}/0003-version-v0.7.patch
|
||||
${FILESDIR}/0004-fix-parallel-build-dependency.patch
|
||||
${FILESDIR}/0005-let-graftcp-respect-LDFLAGS.patch
|
||||
"
|
||||
|
||||
MAKEOPTS="${MAKEOPTS} -j1"
|
||||
# Generated by nim
|
||||
QA_FLAGS_IGNORED="
|
||||
/usr/bin/graftcp-local
|
||||
/usr/bin/mgraftcp
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DIST mlterm-3.9.3.tar.gz 4272090 BLAKE2B 8f71a8c5cd63b7caa803e699a7e42b8d11cb18324595a7a255c7542df6fad6b968bf56a03a2d19a2381d103232685e3c3cd62388ac036a024870fbe3d222d081 SHA512 67c22ee8411cef499620a37e43af5609bb52cf8be6b617f0dfa6605217eb7f66227bfe073ca9b878606392fac26f94299221b5890fba1d90a3afc35a0f3132a1
|
||||
@@ -1,111 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
MYPN="mlterm"
|
||||
MYP="${MYPN}-${PV}"
|
||||
|
||||
DESCRIPTION="canna plugin for mlterm"
|
||||
HOMEPAGE="https://mlterm.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${MYPN}/${MYP}.tar.gz"
|
||||
S="${WORKDIR}/${MYP}"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="cairo fbcon wayland X xft"
|
||||
|
||||
DEPEND="
|
||||
app-i18n/canna
|
||||
cairo? ( x11-libs/cairo[X(+)] )
|
||||
wayland? (
|
||||
dev-libs/wayland
|
||||
x11-libs/libxkbcommon
|
||||
)
|
||||
X? (
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libX11
|
||||
)
|
||||
xft? ( x11-libs/libXft )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
~x11-terms/mlterm-${PV}[cairo=,fbcon=,wayland=,X=,xft=]
|
||||
"
|
||||
|
||||
REQUIRED_USE="|| ( X fbcon wayland )"
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--disable-brlapi
|
||||
--disable-debug
|
||||
--disable-fcitx
|
||||
--disable-fribidi
|
||||
--disable-ibus
|
||||
--disable-m17nlib
|
||||
--disable-nls
|
||||
--disable-optimize-redrawing
|
||||
--disable-otl
|
||||
--disable-scim
|
||||
--disable-skk
|
||||
--disable-ssh2
|
||||
--disable-static
|
||||
--disable-uim
|
||||
--disable-vt52
|
||||
--disable-wnn
|
||||
--enable-canna
|
||||
--with-gui=$(usex X "xlib" "")$(usex fbcon ",fb" "")$(usex wayland ",wayland" "")
|
||||
--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
|
||||
--without-gtk
|
||||
--without-utmp
|
||||
|
||||
$(use_with X x)
|
||||
)
|
||||
|
||||
addpredict /dev/ptmx
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
pushd baselib/src || die
|
||||
emake collect-headers libpobl.la
|
||||
popd || die
|
||||
pushd encodefilter/src || die
|
||||
emake collect-headers
|
||||
popd || die
|
||||
pushd inputmethod/canna || die
|
||||
emake
|
||||
popd || die
|
||||
pushd gui/fb/inputmethod/canna/ || die
|
||||
emake
|
||||
popd || die
|
||||
|
||||
if use wayland; then
|
||||
pushd gui/wayland/inputmethod/canna/ || die
|
||||
emake
|
||||
popd || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
:
|
||||
}
|
||||
|
||||
src_install() {
|
||||
pushd inputmethod/canna || die
|
||||
DESTDIR="${D}" emake install
|
||||
popd || die
|
||||
pushd gui/fb/inputmethod/canna/ || die
|
||||
DESTDIR="${D}" emake install
|
||||
popd || die
|
||||
|
||||
if use wayland; then
|
||||
pushd gui/wayland/inputmethod/canna/ || die
|
||||
DESTDIR="${D}" emake install
|
||||
popd || die
|
||||
fi
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
}
|
||||
Reference in New Issue
Block a user