mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-09 23:23:00 -04:00
www-client/badwolf: add 1.4.0, drop 1.3.0-r2
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
This commit is contained in:
Haelwenn (lanodan) Monnier
@@ -1,2 +1,2 @@
|
||||
DIST badwolf-1.3.0.tar.gz 114477 BLAKE2B e79c223b597b08acdc5d090a47c179a8ab27727d3cb7b7f842c021b5f1d1f25c2e5604bf8b1cea986270ec97f3a8e25eeae866a124e72df7a7aaf876ecff9b08 SHA512 f83884f9a1c4d12d641f68697d7fab7885803975ead6cb78e88b0b8d2f7b6f9da116f72e39f02c47e8dca89e4ced9b932524338a6211c7d4509c12206c10cdeb
|
||||
DIST badwolf-1.3.0.tar.gz.sign 308 BLAKE2B aced82f92e7721a297c1989394a1e5588180ae6c97923892c8bc6d379efc3e6a67957d4b5c10e9ca5786230b7576d7553687adaa2042f1eb341358efb7089072 SHA512 0568e25c6602cad1fbe1e3521ca19e45b9e67e561515e9e43a3a75fb80a08b1e2c0d42b95b6125a743095a6dcaed8d45ea908075c886111c52f32c53df844081
|
||||
DIST badwolf-1.4.0.tar.gz 129205 BLAKE2B d805793f7d8252f9fc0d84b40af43bdec0cad7e0e054f3b827d458fa7acb920942d80c5e6df49e0f5d6f98deb8b6ddba47289d7905216062f7cc5752fb07656e SHA512 5528572fab02b36727b90dce5ec758862c684777bef291c70b99bae0941debd20f717a7d50942152e3f7017c900a5c8fec8e825c86a18f499e7f35bb37c02d0c
|
||||
DIST badwolf-1.4.0.tar.gz.sign 141 BLAKE2B 384490fda871d255a9419d1113e6de85b752d5e31a7dd9c55b58371879d25ac1c0ecc75296ca90cbbd345e7924d24f7625d72b7379bc3cc9c2734e9bdffdd4e5 SHA512 6f2b24a0b0a1453a707dd75a737baf41091f1bb5909dadcdee0010dda3e5b0d3bc800afba71dce2c305092c59d2db874ff6f40d5871f125f59d14af2f9815cb6
|
||||
|
||||
@@ -15,8 +15,8 @@ else
|
||||
|
||||
MY_P="${PN}-$(ver_rs 3 - 4 .)"
|
||||
SRC_URI="
|
||||
https://distfiles.hacktivis.me/releases/${MY_P}.tar.gz
|
||||
verify-sig? ( https://distfiles.hacktivis.me/releases/${MY_P}.tar.gz.sign )
|
||||
https://distfiles.hacktivis.me/releases/badwolf/${MY_P}.tar.gz
|
||||
verify-sig? ( https://distfiles.hacktivis.me/releases/badwolf/${MY_P}.tar.gz.sign )
|
||||
"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc64"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
@@ -42,14 +42,14 @@ RDEPEND="${DEPEND}"
|
||||
BDEPEND="test? ( app-text/mandoc )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/badwolf-1.3.0-configure_missing_ed.patch"
|
||||
"${FILESDIR}/badwolf-1.4.0-configure-rename-ED-variable-to-CMD_ED.patch"
|
||||
)
|
||||
|
||||
if [[ "${PV}" != "9999" ]]
|
||||
then
|
||||
BDEPEND="${BDEPEND} verify-sig? ( sec-keys/signify-keys-lanodan:2021-04 )"
|
||||
BDEPEND="${BDEPEND} verify-sig? ( sec-keys/signify-keys-lanodan:2025 )"
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/signify-keys-lanodan-2021.04.pub"
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/signify-keys-lanodan-2025.pub"
|
||||
|
||||
src_unpack() {
|
||||
if use verify-sig; then
|
||||
@@ -67,7 +67,7 @@ src_configure() {
|
||||
[[ "${PV}" == "9999" ]] || restore_config config.h
|
||||
|
||||
CC="${CC:-cc}" \
|
||||
ED="false" \
|
||||
CMD_ED="false" \
|
||||
CFLAGS="${CFLAGS:--02 -Wall -Wextra}" \
|
||||
LDFLAGS="${LDFLAGS}" \
|
||||
DOCDIR="/usr/share/doc/${PF}" \
|
||||
@@ -15,8 +15,8 @@ else
|
||||
|
||||
MY_P="${PN}-$(ver_rs 3 - 4 .)"
|
||||
SRC_URI="
|
||||
https://distfiles.hacktivis.me/releases/${MY_P}.tar.gz
|
||||
verify-sig? ( https://distfiles.hacktivis.me/releases/${MY_P}.tar.gz.sign )
|
||||
https://distfiles.hacktivis.me/releases/badwolf/${MY_P}.tar.gz
|
||||
verify-sig? ( https://distfiles.hacktivis.me/releases/badwolf/${MY_P}.tar.gz.sign )
|
||||
"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc64"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
@@ -43,9 +43,9 @@ BDEPEND="test? ( app-text/mandoc )"
|
||||
|
||||
if [[ "${PV}" != "9999" ]]
|
||||
then
|
||||
BDEPEND="${BDEPEND} verify-sig? ( sec-keys/signify-keys-lanodan:2021-04 )"
|
||||
BDEPEND="${BDEPEND} verify-sig? ( sec-keys/signify-keys-lanodan:2025 )"
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/signify-keys-lanodan-2021.04.pub"
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/signify-keys-lanodan-2025.pub"
|
||||
|
||||
src_unpack() {
|
||||
if use verify-sig; then
|
||||
@@ -63,7 +63,7 @@ src_configure() {
|
||||
[[ "${PV}" == "9999" ]] || restore_config config.h
|
||||
|
||||
CC="${CC:-cc}" \
|
||||
ED="false" \
|
||||
CMD_ED="false" \
|
||||
CFLAGS="${CFLAGS:--02 -Wall -Wextra}" \
|
||||
LDFLAGS="${LDFLAGS}" \
|
||||
DOCDIR="/usr/share/doc/${PF}" \
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
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"
|
||||
@@ -0,0 +1,90 @@
|
||||
From 0f62f0deffd9c6720dcfbe2b0478a5c35a954037 Mon Sep 17 00:00:00 2001
|
||||
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
|
||||
Date: Thu, 14 Aug 2025 21:14:07 +0200
|
||||
Subject: [PATCH] configure: rename ED variable to CMD_ED
|
||||
|
||||
Avoids conflicting with gentoo environment which already used the ED variable.
|
||||
---
|
||||
configure | 20 ++++++++++----------
|
||||
1 file changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index df5db7a..17b3c67 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -41,7 +41,7 @@ usage()
|
||||
INKSCAPE=BIN
|
||||
CC=BIN
|
||||
CFLAGS=OPTIONS
|
||||
- ED=BIN
|
||||
+ CMD_ED=BIN
|
||||
LDFLAGS=OPTIONS
|
||||
EXTRA_CFLAGS=OPTIONS
|
||||
XGETTEXT=BIN
|
||||
@@ -91,7 +91,7 @@ pkg_config_check()
|
||||
INKSCAPE="${INKSCAPE:-inkscape}"
|
||||
CC="${CC:-cc}"
|
||||
CFLAGS="${CFLAGS:--g -O2 -D_FORTIFY_SOURCE=2}"
|
||||
-ED="${ED:-ed}"
|
||||
+CMD_ED="${CMD_ED:-ed}"
|
||||
XGETTEXT="${XGETTEXT:-xgettext}"
|
||||
MSGMERGE="${MSGMERGE:-msgmerge}"
|
||||
MANDOC="${MANDOC:-mandoc}"
|
||||
@@ -143,13 +143,13 @@ pkg_config_check()
|
||||
printf 'Checking %s command existence ...' "${CC}"
|
||||
command -v "${CC}" >/dev/null ; required
|
||||
|
||||
-printf 'Checking %s command existence ...' "${ED}"
|
||||
-if command -v "${ED}" >/dev/null ; is_ok
|
||||
+printf 'Checking %s command existence ...' "${CMD_ED}"
|
||||
+if command -v "${CMD_ED}" >/dev/null ; is_ok
|
||||
then
|
||||
:
|
||||
else
|
||||
echo 'Warning: Updating of *.pot translation files disabled, you may want to install ed(1)'
|
||||
- ED="false"
|
||||
+ CMD_ED="false"
|
||||
fi
|
||||
|
||||
printf 'Checking %s command existence ...' "${MANDOC}"
|
||||
@@ -315,7 +315,7 @@ get_libs()
|
||||
CC = ${CC}
|
||||
CFLAGS = ${CFLAGS}
|
||||
LDFLAGS = ${LDFLAGS}
|
||||
-ED = ${ED}
|
||||
+CMD_ED = ${CMD_ED}
|
||||
MANDOC = ${MANDOC}
|
||||
XGETTEXT = ${XGETTEXT}
|
||||
MSGMERGE = ${MSGMERGE}
|
||||
@@ -329,7 +329,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 && \$CMD_ED -s \$out <po/pot_license.ed
|
||||
|
||||
rule msgmerge
|
||||
# touch: msgmerge doesn't always updates timestamps
|
||||
@@ -337,8 +337,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 && \$CMD_ED -s \$out <po/pot_license.ed;$
|
||||
+else po4a-gettextize --format man -M utf-8 --master \$in \$GETTEXT_OPTS --po \$out && \$CMD_ED -s \$out <po/pot_license.ed;$
|
||||
fi
|
||||
|
||||
rule cc_exe
|
||||
@@ -359,7 +359,7 @@ get_libs()
|
||||
echo
|
||||
done >>config.ninja
|
||||
|
||||
-if [ "$ED" != "false" ]; then
|
||||
+if [ "$CMD_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
|
||||
--
|
||||
2.49.1
|
||||
|
||||
Reference in New Issue
Block a user