From 890d08ba07f1add4906f8ab1e1bb4e578c084579 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 10 Oct 2023 17:36:24 +0200 Subject: [PATCH 1/7] www-client/badwolf: Disable usage of ed Closes: https://bugs.gentoo.org/915518 Signed-off-by: Haelwenn (lanodan) Monnier --- www-client/badwolf/badwolf-1.3.0.ebuild | 5 ++ www-client/badwolf/badwolf-9999.ebuild | 1 + .../badwolf-1.3.0-configure_missing_ed.patch | 67 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 www-client/badwolf/files/badwolf-1.3.0-configure_missing_ed.patch diff --git a/www-client/badwolf/badwolf-1.3.0.ebuild b/www-client/badwolf/badwolf-1.3.0.ebuild index 4b6ebbec3b..2b92bf406f 100644 --- a/www-client/badwolf/badwolf-1.3.0.ebuild +++ b/www-client/badwolf/badwolf-1.3.0.ebuild @@ -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}" \ diff --git a/www-client/badwolf/badwolf-9999.ebuild b/www-client/badwolf/badwolf-9999.ebuild index 4b6ebbec3b..1c1de32eff 100644 --- a/www-client/badwolf/badwolf-9999.ebuild +++ b/www-client/badwolf/badwolf-9999.ebuild @@ -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}" \ diff --git a/www-client/badwolf/files/badwolf-1.3.0-configure_missing_ed.patch b/www-client/badwolf/files/badwolf-1.3.0-configure_missing_ed.patch new file mode 100644 index 0000000000..11b47f2ce6 --- /dev/null +++ b/www-client/badwolf/files/badwolf-1.3.0-configure_missing_ed.patch @@ -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 " --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 >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" From 120624d663fed98ae732f7c46125715d9fb6605d Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 10 Oct 2023 19:42:02 +0200 Subject: [PATCH 2/7] games-puzzle/superflu-riteurnz: add 1.5.5, drop 1.5.4 Signed-off-by: Haelwenn (lanodan) Monnier --- games-puzzle/superflu-riteurnz/Manifest | 2 +- ...flu-riteurnz-1.5.4.ebuild => superflu-riteurnz-1.5.5.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename games-puzzle/superflu-riteurnz/{superflu-riteurnz-1.5.4.ebuild => superflu-riteurnz-1.5.5.ebuild} (92%) diff --git a/games-puzzle/superflu-riteurnz/Manifest b/games-puzzle/superflu-riteurnz/Manifest index 34efc0334c..003c001a8d 100644 --- a/games-puzzle/superflu-riteurnz/Manifest +++ b/games-puzzle/superflu-riteurnz/Manifest @@ -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 diff --git a/games-puzzle/superflu-riteurnz/superflu-riteurnz-1.5.4.ebuild b/games-puzzle/superflu-riteurnz/superflu-riteurnz-1.5.5.ebuild similarity index 92% rename from games-puzzle/superflu-riteurnz/superflu-riteurnz-1.5.4.ebuild rename to games-puzzle/superflu-riteurnz/superflu-riteurnz-1.5.5.ebuild index d6378cdd17..80718dadf2 100644 --- a/games-puzzle/superflu-riteurnz/superflu-riteurnz-1.5.4.ebuild +++ b/games-puzzle/superflu-riteurnz/superflu-riteurnz-1.5.5.ebuild @@ -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" From 482d3c2ffa4196aba9b5de3b959ac8584b6ef18f Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 10 Oct 2023 19:52:03 +0200 Subject: [PATCH 3/7] games-puzzle/superflu-riteurnz-data: add 12, drop 11 Signed-off-by: Haelwenn (lanodan) Monnier --- games-puzzle/superflu-riteurnz-data/Manifest | 2 +- ...riteurnz-data-11.ebuild => superflu-riteurnz-data-12.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename games-puzzle/superflu-riteurnz-data/{superflu-riteurnz-data-11.ebuild => superflu-riteurnz-data-12.ebuild} (98%) diff --git a/games-puzzle/superflu-riteurnz-data/Manifest b/games-puzzle/superflu-riteurnz-data/Manifest index 9926427292..c64c4920c7 100644 --- a/games-puzzle/superflu-riteurnz-data/Manifest +++ b/games-puzzle/superflu-riteurnz-data/Manifest @@ -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 diff --git a/games-puzzle/superflu-riteurnz-data/superflu-riteurnz-data-11.ebuild b/games-puzzle/superflu-riteurnz-data/superflu-riteurnz-data-12.ebuild similarity index 98% rename from games-puzzle/superflu-riteurnz-data/superflu-riteurnz-data-11.ebuild rename to games-puzzle/superflu-riteurnz-data/superflu-riteurnz-data-12.ebuild index ee7e5ea7dc..40c2db18d7 100644 --- a/games-puzzle/superflu-riteurnz-data/superflu-riteurnz-data-11.ebuild +++ b/games-puzzle/superflu-riteurnz-data/superflu-riteurnz-data-12.ebuild @@ -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" From a2791bdc431c52bce77a9411b7c34f0362b09b47 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 10 Oct 2023 19:52:40 +0200 Subject: [PATCH 4/7] games-puzzle/superflu-riteurnz: rebuild on data file changes Signed-off-by: Haelwenn (lanodan) Monnier --- games-puzzle/superflu-riteurnz/superflu-riteurnz-1.5.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-puzzle/superflu-riteurnz/superflu-riteurnz-1.5.5.ebuild b/games-puzzle/superflu-riteurnz/superflu-riteurnz-1.5.5.ebuild index 80718dadf2..ce549f4374 100644 --- a/games-puzzle/superflu-riteurnz/superflu-riteurnz-1.5.5.ebuild +++ b/games-puzzle/superflu-riteurnz/superflu-riteurnz-1.5.5.ebuild @@ -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}" From 7b558129bb24e7be7a13149c9f529140f9c8947e Mon Sep 17 00:00:00 2001 From: brettalcox Date: Tue, 10 Oct 2023 21:14:15 -0500 Subject: [PATCH 5/7] sys-apps/mission-center: clean up ebuild adding a --nonet flag to the appstream validate tests simplifying the ebuild and removing some unnecessary moves/copys adding qa flag because rust doesn't use make.conf *FLAGS Signed-off-by: brettalcox --- .../mission-center-0.3.2.ebuild | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/sys-apps/mission-center/mission-center-0.3.2.ebuild b/sys-apps/mission-center/mission-center-0.3.2.ebuild index bead8ac09b..ddddd1ce40 100644 --- a/sys-apps/mission-center/mission-center-0.3.2.ebuild +++ b/sys-apps/mission-center/mission-center-0.3.2.ebuild @@ -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}" From ca7069b2b735ec4307d2da9a6d8930d30ef2d28e Mon Sep 17 00:00:00 2001 From: Artemis Everfree Date: Tue, 10 Oct 2023 20:07:44 -0700 Subject: [PATCH 6/7] www-apps/forgejo: add 1.20.5.0, drop 1.20.4.0 Signed-off-by: Artemis Everfree --- www-apps/forgejo/Manifest | 2 +- .../{forgejo-1.20.4.0.ebuild => forgejo-1.20.5.0.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename www-apps/forgejo/{forgejo-1.20.4.0.ebuild => forgejo-1.20.5.0.ebuild} (100%) diff --git a/www-apps/forgejo/Manifest b/www-apps/forgejo/Manifest index 76a7875472..149381bb75 100644 --- a/www-apps/forgejo/Manifest +++ b/www-apps/forgejo/Manifest @@ -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 diff --git a/www-apps/forgejo/forgejo-1.20.4.0.ebuild b/www-apps/forgejo/forgejo-1.20.5.0.ebuild similarity index 100% rename from www-apps/forgejo/forgejo-1.20.4.0.ebuild rename to www-apps/forgejo/forgejo-1.20.5.0.ebuild From 317a8ffa9c8c1d637752518033c3e26fd709b651 Mon Sep 17 00:00:00 2001 From: Yixun Lan Date: Wed, 11 Oct 2023 07:10:15 +0000 Subject: [PATCH 7/7] net-im/teams-for-linux: add 1.3.13, drop 1.3.1 Signed-off-by: Yixun Lan --- net-im/teams-for-linux/Manifest | 2 +- .../teams-for-linux/files/teams-for-linux.svg | 26 +++++++++---------- ...1.ebuild => teams-for-linux-1.3.13.ebuild} | 8 +++++- 3 files changed, 21 insertions(+), 15 deletions(-) rename net-im/teams-for-linux/{teams-for-linux-1.3.1.ebuild => teams-for-linux-1.3.13.ebuild} (86%) diff --git a/net-im/teams-for-linux/Manifest b/net-im/teams-for-linux/Manifest index 108ff2b261..f0b6bb9b26 100644 --- a/net-im/teams-for-linux/Manifest +++ b/net-im/teams-for-linux/Manifest @@ -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 diff --git a/net-im/teams-for-linux/files/teams-for-linux.svg b/net-im/teams-for-linux/files/teams-for-linux.svg index 34be9847d2..3409e6cfae 100644 --- a/net-im/teams-for-linux/files/teams-for-linux.svg +++ b/net-im/teams-for-linux/files/teams-for-linux.svg @@ -1,22 +1,22 @@ - + - + - - - - - - - - - + + + + + + + + + - + - \ No newline at end of file + diff --git a/net-im/teams-for-linux/teams-for-linux-1.3.1.ebuild b/net-im/teams-for-linux/teams-for-linux-1.3.13.ebuild similarity index 86% rename from net-im/teams-for-linux/teams-for-linux-1.3.1.ebuild rename to net-im/teams-for-linux/teams-for-linux-1.3.13.ebuild index 16ca12749f..a20ee9241e 100644 --- a/net-im/teams-for-linux/teams-for-linux-1.3.1.ebuild +++ b/net-im/teams-for-linux/teams-for-linux-1.3.13.ebuild @@ -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}]