Merge updates from master

This commit is contained in:
Repository mirror & CI
2023-10-11 08:03:37 +00:00
13 changed files with 114 additions and 34 deletions

View File

@@ -1 +1 @@
DIST superfluous-returnz-d11-data-only.zip 215947120 BLAKE2B fdbf6b90d21f2daf22cec946edbb98ea7362916499e67afcac6af127ecf8b1bd3112ab86d658ea99568a0003bfbcbf776d93532936f6344fdd837553037d56e1 SHA512 6e2265cdb97df01ad84b0ff51d23e6eb83d8b4af448d853b620b20fef49d02d02231911f3e16b02d7fef3b5cecfc4e70b27216bc4cac0be09fcb3c970d5f78ea
DIST superfluous-returnz-d12-data-only.zip 215813573 BLAKE2B 4c1cfa63156edbed91b759ec8dd227a4843ebc784970d05075847a7cbbf466a2adc193772a0377ac28afae5a5d9862abcd174b11598a8413becb74af678561a3 SHA512 40864b01f2dca279427097f68ee3a4408e601ec265375014ea3ff78a51e082110fc2d9128e07cc5e16551bdefc93ebf27a185e536fa649a18be096ede40cd288

View File

@@ -10,7 +10,7 @@ HOMEPAGE="https://studios.ptilouk.net/superflu-riteurnz/ https://ptilouk.itch.io
SRC_URI="${MY_P}-only.zip"
S="${WORKDIR}/"
LICENSE="all-rights-reserved"
SLOT="0"
SLOT="0/${PV}"
KEYWORDS="~amd64"
RESTRICT="bindist fetch"

View File

@@ -1 +1 @@
DIST sosage-v1.5.4.tar.gz 295842 BLAKE2B 12f90fe168222777a7b7c4ab53f1348169743940cac21e9a83779ddff48194cd8a70f2a673a429a1c970148ecd5b9fc96ae258941e30326fe4c5882e43daf981 SHA512 78b0208e28178e8c14bcee03ca9d980d85f384d8a7b3903647a64a7ec5cd6408a34885b71d47a56acf5adc3bcab059e63db58d1289248fb74a8746f8b01a1c2a
DIST sosage-v1.5.5.tar.gz 295931 BLAKE2B 66814c3a0a89d0fbb62db479589ed491f526411d03f186a2653836ce7eaba987a79788db5a2a9c3069d7b511c3f77d7e5be6c1dcb779b3b427f7c78f6cc2ad2c SHA512 a4a4e255baddde6ff8b22ce687bb57d33a49335189581b789d0cc13c6b3ff6fa0ef82aa1783d68f7b7f2f78664dc33309485b285d2193eac62ca65dbd751cd76

View File

@@ -9,7 +9,7 @@ MY_P="sosage-v${PV}"
DESCRIPTION="Artisanal video-game about Superflu, the useless super-hero"
HOMEPAGE="https://studios.ptilouk.net/superflu-riteurnz/"
SRC_URI="https://framagit.org/Gee/sosage/-/archive/v${MY_PV}/${MY_P}.tar.gz"
SRC_URI="https://framagit.org/Gee/sosage/-/archive/v${PV}/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
# Engine under GPL-3+ + assets under all-rights-reserved are combined together
LICENSE="GPL-3+ all-rights-reserved"
@@ -31,7 +31,7 @@ DEPEND="
media-libs/sdl2-mixer
media-libs/sdl2-image
media-libs/sdl2-ttf
>=games-puzzle/superflu-riteurnz-data-11
>=games-puzzle/superflu-riteurnz-data-11:=
"
RDEPEND="${DEPEND}"

View File

@@ -1 +1 @@
DIST teams-for-linux-1.3.1.tar.gz 93146221 BLAKE2B 085d34709ec5069aff1a25dbd6fc9973778b5373cba58e24e2c556f8d49485d9ca76f45a3436f2e299efa156b81780136730fca4d883fa5e6b3a52615c820f65 SHA512 9b64677cb17536e52b1c2cea11dd161953704f69e8bdc7c69c642fc61bf6815081f8efa0c0650cd0ccb210103d5ec28bf1ecab80b3334c29f30b713886d613c3
DIST teams-for-linux-1.3.13.tar.gz 93135861 BLAKE2B 6c72f8d60358546bd67321810517e1a19dd97e03a186e4fab85668c3081ff07562f5a02713279861b3549cf9b5b942ca347635612249ffb216568f45da3c1e4f SHA512 d9e46005e7577247c5d1351d566231e2f63a1a99ba49dec80b94f84e47718ad521fa63cfb3b725b6ab5ac7466e6dd44d6c6a504ea4888d93f8f599742df6665e

View File

@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2228.833 2073.333">
<path fill="#5059C9" d="M1554.637,777.5h575.713c54.391,0,98.483,44.092,98.483,98.483c0,0,0,0,0,0v524.398 c0,199.901-162.051,361.952-361.952,361.952h0h-1.711c-199.901,0.028-361.975-162-362.004-361.901c0-0.017,0-0.034,0-0.052V828.971 C1503.167,800.544,1526.211,777.5,1554.637,777.5L1554.637,777.5z"/>
<path fill="#5059C9" d="M1554.637,777.5h575.713c54.391,0,98.483,44.092,98.483,98.483c0,0,0,0,0,0v524.398 c0,199.901-162.051,361.952-361.952,361.952h0h-1.711c-199.901,0.028-361.975-162-362.004-361.901c0-0.017,0-0.034,0-0.052V828.971 C1503.167,800.544,1526.211,777.5,1554.637,777.5L1554.637,777.5z"/>
<circle fill="#5059C9" cx="1943.75" cy="440.583" r="233.25"/>
<circle fill="#7B83EB" cx="1218.083" cy="336.917" r="336.917"/>
<path fill="#7B83EB" d="M1667.323,777.5H717.01c-53.743,1.33-96.257,45.931-95.01,99.676v598.105 c-7.505,322.519,247.657,590.16,570.167,598.053c322.51-7.893,577.671-275.534,570.167-598.053V877.176 C1763.579,823.431,1721.066,778.83,1667.323,777.5z"/>
<path opacity=".1" d="M1244,777.5v838.145c-0.258,38.435-23.549,72.964-59.09,87.598 c-11.316,4.787-23.478,7.254-35.765,7.257H667.613c-6.738-17.105-12.958-34.21-18.142-51.833 c-18.144-59.477-27.402-121.307-27.472-183.49V877.02c-1.246-53.659,41.198-98.19,94.855-99.52H1244z"/>
<path opacity=".2" d="M1192.167,777.5v889.978c-0.002,12.287-2.47,24.449-7.257,35.765 c-14.634,35.541-49.163,58.833-87.598,59.09H691.975c-8.812-17.105-17.105-34.21-24.362-51.833 c-7.257-17.623-12.958-34.21-18.142-51.833c-18.144-59.476-27.402-121.307-27.472-183.49V877.02 c-1.246-53.659,41.198-98.19,94.855-99.52H1192.167z"/>
<path opacity=".2" d="M1192.167,777.5v786.312c-0.395,52.223-42.632,94.46-94.855,94.855h-447.84 c-18.144-59.476-27.402-121.307-27.472-183.49V877.02c-1.246-53.659,41.198-98.19,94.855-99.52H1192.167z"/>
<path opacity=".2" d="M1140.333,777.5v786.312c-0.395,52.223-42.632,94.46-94.855,94.855H649.472 c-18.144-59.476-27.402-121.307-27.472-183.49V877.02c-1.246-53.659,41.198-98.19,94.855-99.52H1140.333z"/>
<path opacity=".1" d="M1244,509.522v163.275c-8.812,0.518-17.105,1.037-25.917,1.037 c-8.812,0-17.105-0.518-25.917-1.037c-17.496-1.161-34.848-3.937-51.833-8.293c-104.963-24.857-191.679-98.469-233.25-198.003 c-7.153-16.715-12.706-34.071-16.587-51.833h258.648C1201.449,414.866,1243.801,457.217,1244,509.522z"/>
<path opacity=".2" d="M1192.167,561.355v111.442c-17.496-1.161-34.848-3.937-51.833-8.293 c-104.963-24.857-191.679-98.469-233.25-198.003h190.228C1149.616,466.699,1191.968,509.051,1192.167,561.355z"/>
<path opacity=".2" d="M1192.167,561.355v111.442c-17.496-1.161-34.848-3.937-51.833-8.293 c-104.963-24.857-191.679-98.469-233.25-198.003h190.228C1149.616,466.699,1191.968,509.051,1192.167,561.355z"/>
<path opacity=".2" d="M1140.333,561.355v103.148c-104.963-24.857-191.679-98.469-233.25-198.003 h138.395C1097.783,466.699,1140.134,509.051,1140.333,561.355z"/>
<path fill="#7B83EB" d="M1667.323,777.5H717.01c-53.743,1.33-96.257,45.931-95.01,99.676v598.105 c-7.505,322.519,247.657,590.16,570.167,598.053c322.51-7.893,577.671-275.534,570.167-598.053V877.176 C1763.579,823.431,1721.066,778.83,1667.323,777.5z"/>
<path opacity=".1" d="M1244,777.5v838.145c-0.258,38.435-23.549,72.964-59.09,87.598 c-11.316,4.787-23.478,7.254-35.765,7.257H667.613c-6.738-17.105-12.958-34.21-18.142-51.833 c-18.144-59.477-27.402-121.307-27.472-183.49V877.02c-1.246-53.659,41.198-98.19,94.855-99.52H1244z"/>
<path opacity=".2" d="M1192.167,777.5v889.978c-0.002,12.287-2.47,24.449-7.257,35.765 c-14.634,35.541-49.163,58.833-87.598,59.09H691.975c-8.812-17.105-17.105-34.21-24.362-51.833 c-7.257-17.623-12.958-34.21-18.142-51.833c-18.144-59.476-27.402-121.307-27.472-183.49V877.02 c-1.246-53.659,41.198-98.19,94.855-99.52H1192.167z"/>
<path opacity=".2" d="M1192.167,777.5v786.312c-0.395,52.223-42.632,94.46-94.855,94.855h-447.84 c-18.144-59.476-27.402-121.307-27.472-183.49V877.02c-1.246-53.659,41.198-98.19,94.855-99.52H1192.167z"/>
<path opacity=".2" d="M1140.333,777.5v786.312c-0.395,52.223-42.632,94.46-94.855,94.855H649.472 c-18.144-59.476-27.402-121.307-27.472-183.49V877.02c-1.246-53.659,41.198-98.19,94.855-99.52H1140.333z"/>
<path opacity=".1" d="M1244,509.522v163.275c-8.812,0.518-17.105,1.037-25.917,1.037 c-8.812,0-17.105-0.518-25.917-1.037c-17.496-1.161-34.848-3.937-51.833-8.293c-104.963-24.857-191.679-98.469-233.25-198.003 c-7.153-16.715-12.706-34.071-16.587-51.833h258.648C1201.449,414.866,1243.801,457.217,1244,509.522z"/>
<path opacity=".2" d="M1192.167,561.355v111.442c-17.496-1.161-34.848-3.937-51.833-8.293 c-104.963-24.857-191.679-98.469-233.25-198.003h190.228C1149.616,466.699,1191.968,509.051,1192.167,561.355z"/>
<path opacity=".2" d="M1192.167,561.355v111.442c-17.496-1.161-34.848-3.937-51.833-8.293 c-104.963-24.857-191.679-98.469-233.25-198.003h190.228C1149.616,466.699,1191.968,509.051,1192.167,561.355z"/>
<path opacity=".2" d="M1140.333,561.355v103.148c-104.963-24.857-191.679-98.469-233.25-198.003 h138.395C1097.783,466.699,1140.134,509.051,1140.333,561.355z"/>
<linearGradient id="a" gradientUnits="userSpaceOnUse" x1="198.099" y1="1683.0726" x2="942.2344" y2="394.2607" gradientTransform="matrix(1 0 0 -1 0 2075.3333)">
<stop offset="0" stop-color="#5a62c3"/>
<stop offset=".5" stop-color="#4d55bd"/>
<stop offset="1" stop-color="#3940ab"/>
</linearGradient>
<path fill="url(#a)" d="M95.01,466.5h950.312c52.473,0,95.01,42.538,95.01,95.01v950.312c0,52.473-42.538,95.01-95.01,95.01 H95.01c-52.473,0-95.01-42.538-95.01-95.01V561.51C0,509.038,42.538,466.5,95.01,466.5z"/>
<path fill="url(#a)" d="M95.01,466.5h950.312c52.473,0,95.01,42.538,95.01,95.01v950.312c0,52.473-42.538,95.01-95.01,95.01 H95.01c-52.473,0-95.01-42.538-95.01-95.01V561.51C0,509.038,42.538,466.5,95.01,466.5z"/>
<path fill="#FFF" d="M820.211,828.193H630.241v517.297H509.211V828.193H320.123V727.844h500.088V828.193z"/>
</svg>
</svg>

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@@ -14,7 +14,13 @@ SLOT="0"
KEYWORDS="-* ~amd64"
IUSE=""
DEPEND=">=app-accessibility/at-spi2-core-2.46.0:2[${MULTILIB_USEDEP}]
QA_PREBUILT="*"
DEPEND="
app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
dev-libs/nspr[${MULTILIB_USEDEP}]
dev-libs/nss[${MULTILIB_USEDEP}]
media-libs/alsa-lib[${MULTILIB_USEDEP}]
media-libs/freetype:2[${MULTILIB_USEDEP}]
media-gfx/graphite2[${MULTILIB_USEDEP}]
net-print/cups[${MULTILIB_USEDEP}]

View File

@@ -286,6 +286,9 @@ SRC_URI="
${CARGO_CRATE_URIS}
"
S="${WORKDIR}/${PN}-v${PV}"
BUILD_DIR="${S}-build"
ECARGO_HOME="${S}-build/cargo-home"
LICENSE="GPL-3+"
SLOT="0"
@@ -312,19 +315,16 @@ BDEPEND="
dev-util/blueprint-compiler
"
BUILD_DIR=${WORKDIR}/${P}/_build
src_unpack() {
unpack ${P}.tar.bz2
mv "${WORKDIR}/${PN}-v${PV}/" "${WORKDIR}/${P}"
unpack nvtop-${NVTOP_COMMIT}.tar.gz
mv nvtop-${NVTOP_COMMIT} "${WORKDIR}/${P}/subprojects"
mv nvtop-${NVTOP_COMMIT} "${S}/subprojects"
cargo_src_unpack
}
src_prepare() {
eapply_user
cd "${WORKDIR}/${P}/subprojects/nvtop-${NVTOP_COMMIT}"
cd "${S}/subprojects/nvtop-${NVTOP_COMMIT}"
find ../packagefiles -type f -name 'nvtop-*' -exec sh -c 'patch -p1 < {}' \;
}
@@ -334,16 +334,13 @@ src_configure() {
--prefix=/usr
)
meson_src_configure
cp -r "${WORKDIR}/cargo_home" "${WORKDIR}/${P}/_build/cargo-home"
cp -r "${WORKDIR}/cargo_home" "${WORKDIR}/${P}/_build/src/sys_info_v2/gatherer/cargo-home"
cp -r "${ECARGO_HOME}" "${BUILD_DIR}/src/sys_info_v2/gatherer/cargo-home"
}
src_compile() {
meson_src_compile -C _build
}
src_install() {
meson_src_install -C _build
src_test() {
# patch the appstream-util validate command to use --nonet when validating the urls
sed -i "s/args: \['validate',/args: \['validate', '--nonet',/g" "${S}/data/meson.build"
meson_src_test
}
pkg_postinst() {
@@ -357,3 +354,7 @@ pkg_postrm() {
xdg_icon_cache_update
xdg_desktop_database_update
}
# rust does not use *FLAGS from make.conf, silence portage warning
# update with proper path to binaries this crate installs, omit leading /
QA_FLAGS_IGNORED="usr/bin/${PN}"

View File

@@ -1,3 +1,3 @@
DIST forgejo-1.19.4.0.tar.gz 60635393 BLAKE2B 7fe8e10f7aae8371c4a540290bb24c67a0521080eb58c7749c95d977320781e2e11ba754a42a333c706d243cf0170178dd62da5338540576d214f281b3da6daa SHA512 4870a7804c3cefab4aac38f30ac60874d9a7359b29e8f765ee9a1f41bc543fdd445a21c6e808f864c56ce22f79f6038b15eec4325c556ef6288ad6635977533f
DIST forgejo-1.20.4.0.tar.gz 55536470 BLAKE2B d7cc2c1a056a33b07f33c2366b839dff314fc66b3b98b59738aa932416255a48637f5631e7443f1f53fe3650563269abf255906112b222fd5c430d9704a1f70d SHA512 b8861e47f700d4d4850295d0ef53b2f8255a5023e2ca48e9bc72a705b13033d0b4d8ad10279417b0a21c03ebdd1b86c25c3b8d06902b2cff4000592cc7b34283
DIST forgejo-1.20.4.1.tar.gz 55536581 BLAKE2B b9eb85a2483670b61f410c6a855fbb57f41bcd1305279d479493453bdbba538a0b4101312135b33967cda618f6ac4339c21055e67b9ace4e0f78248bd39f4452 SHA512 5ec5a20d169d7c684332ef413fdf79280259ad3bd981dadecc752be7308f3372a47803f15c57fbb36b3357e7a85081093c4e5e9d1ba3e6a5939807640e0cb582
DIST forgejo-1.20.5.0.tar.gz 55539985 BLAKE2B 09830af9cfac13e3ca790cd54fd884f1d3cfa1e18b7d8c07517c669fe15e28a3074777ad2f031533aab4a9812fd9e580eeaa6be7d88b68fce2ccfdfbd258d37e SHA512 db42ae29fb5005a2ebf3474784fbec15bbae25c255ead00c7aa6227f844a608cd52c146b215ffec6b7e6ead5f001c37d459b01695c224c0edb519cb71c249eb5

View File

@@ -35,10 +35,15 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="test? ( app-text/mandoc )"
PATCHES=(
"${FILESDIR}/badwolf-1.3.0-configure_missing_ed.patch"
)
src_configure() {
[[ "${PV}" == "9999" ]] || restore_config config.h
CC="${CC:-cc}" \
ED="false" \
CFLAGS="${CFLAGS:--02 -Wall -Wextra}" \
LDFLAGS="${LDFLAGS}" \
DOCDIR="/usr/share/doc/${PF}" \

View File

@@ -39,6 +39,7 @@ src_configure() {
[[ "${PV}" == "9999" ]] || restore_config config.h
CC="${CC:-cc}" \
ED="false" \
CFLAGS="${CFLAGS:--02 -Wall -Wextra}" \
LDFLAGS="${LDFLAGS}" \
DOCDIR="/usr/share/doc/${PF}" \

View File

@@ -0,0 +1,67 @@
Combination of c1e09df4bda8fa4752e4cbd54474594eda7bcf88 and c8881b03457573b34c00ea8041b197241dda5c0b from upstream
diff --git a/build.ninja b/build.ninja
index ddc9223..9b3361b 100644
--- a/build.ninja
+++ b/build.ninja
@@ -23,7 +23,6 @@ rule install
include config.ninja
-build po/manpage.pot: xgettext_man badwolf.1 | po/pot_license.ed
build icons/hicolor/scalable/apps/badwolf.svg: scour badwolf.svg
build uri_test: cc_exe uri_test.c uri.o
diff --git a/configure b/configure
index b145a3b..4ad8f12 100755
--- a/configure
+++ b/configure
@@ -148,7 +148,7 @@ pkg_config_check()
then
:
else
- echo 'Warning: Fixing copyright in po/*.pot files via ed(1) disabled'
+ echo 'Warning: Updating of *.pot translation files disabled, you may want to install ed(1)'
ED="false"
fi
@@ -342,7 +342,7 @@ get_libs()
GETTEXT_OPTS = --copyright-holder="Badwolf Authors <https://hacktivis.me/projects/badwolf>" --package-name="Badwolf" --package-version="${VERSION_FULL}" --msgid-bugs-address="contact+badwolf-msgid@hacktivis.me"
rule xgettext
- command = \$XGETTEXT --keyword=_ --language=C --from-code=UTF-8 -o \$out --add-comments --sort-output --foreign-user --no-location --no-wrap \$GETTEXT_OPTS \$in && ed -s \$out <po/pot_license.ed
+ command = \$XGETTEXT --keyword=_ --language=C --from-code=UTF-8 -o \$out --add-comments --sort-output --foreign-user --no-location --no-wrap \$GETTEXT_OPTS \$in && \$ED -s \$out <po/pot_license.ed
rule msgmerge
# touch: msgmerge doesn't always updates timestamps
@@ -350,8 +350,8 @@ get_libs()
rule xgettext_man
command = if test -e \$out; $
-then po4a-updatepo --format man -M utf-8 --master \$in \$GETTEXT_OPTS --po \$out && ed -s \$out <po/pot_license.ed;$
-else po4a-gettextize --format man -M utf-8 --master \$in \$GETTEXT_OPTS --po \$out && ed -s \$out <po/pot_license.ed;$
+then po4a-updatepo --format man -M utf-8 --master \$in \$GETTEXT_OPTS --po \$out && \$ED -s \$out <po/pot_license.ed;$
+else po4a-gettextize --format man -M utf-8 --master \$in \$GETTEXT_OPTS --po \$out && \$ED -s \$out <po/pot_license.ed;$
fi
rule cc_exe
@@ -360,7 +360,6 @@ get_libs()
rule cc_obj
command = \$CC -std=c11 \$CFLAGS -include configure.h \$DEPS_cflags -c -o \$out \$in
-build po/messages.pot: xgettext ${SRCS} | po/pot_license.ed
build badwolf: cc_exe ${OBJS}
EOF
@@ -373,6 +372,11 @@ get_libs()
echo
done >>config.ninja
+if [ "$ED" != "false" ]; then
+ echo "build po/messages.pot: xgettext ${SRCS} | po/pot_license.ed"
+ echo 'build po/manpage.pot: xgettext_man badwolf.1 | po/pot_license.ed'
+fi >>config.ninja
+
for trans in ${TRANS}; do
echo "build po/${trans}.po: msgmerge po/messages.pot"
echo "build locale/${trans}/LC_MESSAGES/Badwolf.mo: po2mo po/${trans}.po"