diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-06-03 00:07:26 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-03 00:07:26 +0100 |
commit | a3bb28551df94028000fb72308a9e9baa01458b0 (patch) | |
tree | 33b14c7bf0dffbd5bb04dbd5b395514ebdda4896 /app-misc/piper | |
parent | 6657c680376cedf378fcf328e5fa03ed3b41d580 (diff) |
gentoo auto-resync : 03:06:2024 - 00:07:25
Diffstat (limited to 'app-misc/piper')
-rw-r--r-- | app-misc/piper/Manifest | 7 | ||||
-rw-r--r-- | app-misc/piper/files/piper-0.6-fix-tests.patch | 68 | ||||
-rw-r--r-- | app-misc/piper/piper-0.6.ebuild | 66 | ||||
-rw-r--r-- | app-misc/piper/piper-0.7-r1.ebuild | 2 | ||||
-rw-r--r-- | app-misc/piper/piper-9999.ebuild | 2 |
5 files changed, 4 insertions, 141 deletions
diff --git a/app-misc/piper/Manifest b/app-misc/piper/Manifest index 860bf6b15ffa..513f5335692b 100644 --- a/app-misc/piper/Manifest +++ b/app-misc/piper/Manifest @@ -1,8 +1,5 @@ -AUX piper-0.6-fix-tests.patch 3225 BLAKE2B 17c04a07581ee097ab828bcff67dac74d236ba6b3f6f35307fb51bbbd6b5331f4d2bb49a1605f5bb92c1dfe03d0815c66d449c579d59f66511f6b42faa099168 SHA512 5767a9a4745c9ff8c0d44f69d10c843d8494eeff2c1281809d356d6854652a73e2d713c3376733de9afc2413b5c6faaaf6995a1092f777ddcbb7341f42700342 AUX piper-0.7-fix-tests.patch 3238 BLAKE2B 289ef09b85964cee3085403e1f26dca52ee29e685c67f46cebf393798712e24b68eec1e325ce506a0961501064e888d7babd4c2a2159b8a5cbc8674fe08531c9 SHA512 0075e11f27172b753977eec0f94a3197a9cd68e3f55c6e18b91a0577440555bc940bb61eae56a778fa943e2a3c54ef21dee8c619efde49653b71fc436c5b1ce8 -DIST piper-0.6.tar.gz 254653 BLAKE2B ea621e556e2ee6a98e334f2e61df70d700a9cb371dcd5bddc690b4a4c97543a6957bc339bddbde2cf91ac3b201d3bd70fe336974f17e36cfdcbb4895257af993 SHA512 9d76cbc5f3a91c68d10355a1b429c05873effcaa80086fb51c7d4a7bdbbb3e0faf42ec8ccad611a15f5c954d3014a8416e4a497c86167c227818771a24d108a0 DIST piper-0.7.tar.gz 271658 BLAKE2B 8d3d411cc771a286ae0d7654b6d70f394e11edb182924619195b947d0d54df4db308e94aceebe0754ddd446538f1dce2ccb88dbf1cd44595b614d852e7394698 SHA512 fcbc30a4954ea6b0aa67c66052eab1e6b2d3039c927eeddcfc8b03d00f1c91e8f0ae80788ba0e4f053a612b03f594e74fd119dd11f52dd47608c99602e7e4940 -EBUILD piper-0.6.ebuild 1307 BLAKE2B ee3b8d47a1e3eca421244319196af651bf7cd8735332349100bb80cb0f40306a3ad8f01867ca3bbc81322fbb886737e29114415e6a4dcab657892c6f0e7e1e2e SHA512 f439dc02bf480a173409bd1cb0f5828b6546724a51de24721d7cc38e551830d9d5f6bf6412cace499fb4c5e9e7a9ca12c07116f5f00e5541692ad5a44fa97a50 -EBUILD piper-0.7-r1.ebuild 1505 BLAKE2B fa7d49c3b254523cca097faca0bb9e9d2677753b6224a45109d065ff6eec1daf7ae70a12fdea821f6d8628f4db6a5e21de04ca7a898b5df9ce2d7e6d619517e2 SHA512 60a98d1e9dd2a424ac889587d9b859e9d46d6e2fd9782dd24348fb8ab7a006e77e86a04fb0105002e517a059116bb46f8ff4815d93ec76f2d855e7439c1ae927 -EBUILD piper-9999.ebuild 1405 BLAKE2B 84dbe91fc7e295d35fdecb2e09bc37d66990b5ae545f92f1a2530855a16b401415d1ea8ee678398d1f3493cee7cf15a5845967e7c6a6b490d25f404ea734b18c SHA512 1ffb37ac0a22dd30ff7c68179fd2311f8decdb40f9d16ef39e58e738c342188c3f1bc40d0010a56d83420ab74302384db8a3619b6ddf549180469474623ddda6 +EBUILD piper-0.7-r1.ebuild 1505 BLAKE2B 92ccae5f689fb0fbb733da2435f288b1c707ea83911064af3e720249430e98b6d5ecac8712e36ff6b2f136f5c8081ca6121dbe7e4e2ca4124ea26f96dd3bdc56 SHA512 6b14cee36f57bd0b2f1ba9a647304009d9ecd31befdad84e956f4cff6a3328aee11543fc696b031a68119ef957311227cf2755c47d63aa364ed9b1a8ecf4b0de +EBUILD piper-9999.ebuild 1406 BLAKE2B 43d8334feaa6eed0e53480947609f73117de3e32a5801f190bf864f2d61b8703dd7f4033b7779d2b8e90a6cb53efc862cc323f9eba3eeae7da3f60f8651277ef SHA512 f3d9be4fc0b1e739c6d67dfc483268ee09e4a3a273f21ba2dc50e6b7b2d3407c148746514f5780edf73853a35dd2fea468485b0f1653c87b7a79d4936224d3cb MISC metadata.xml 1076 BLAKE2B 4c00bb84f4267ec8cad1f915ca0ed6ef35144aa8039eb8fde7a0674dde5320eb29ffc0ed840dd8dcf68af5663ab9816e779f05b492863bdc73305e878cf90e71 SHA512 44c9ef8d2171a168a116425d05832b58bd8490348e00d3d875fca2a957008cbc154fb7b66add99a4b1ff323aaf4cca716e25d47e3376b12188c85c67971ee70e diff --git a/app-misc/piper/files/piper-0.6-fix-tests.patch b/app-misc/piper/files/piper-0.6-fix-tests.patch deleted file mode 100644 index e4a358e0ab59..000000000000 --- a/app-misc/piper/files/piper-0.6-fix-tests.patch +++ /dev/null @@ -1,68 +0,0 @@ -Upstream commit https://github.com/libratbag/piper/commit/603d68726364cea5e71ef1f0153e3641ec889063, backported to 0.6 -Bug: https://bugs.gentoo.org/827510 -Bug: https://bugs.gentoo.org/834967 - -From 603d68726364cea5e71ef1f0153e3641ec889063 Mon Sep 17 00:00:00 2001 -From: Tobias Kortkamp <tobias.kortkamp@gmail.com> -Date: Mon, 1 Aug 2022 15:57:28 +0200 -Subject: [PATCH] Fix tests for out-of-source builds -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When the build directory is not _under_ the source directory then -flake8 cannot find the local config file and it will try to check -piper.in which fails per 1ed66262b77ebd9fe188894d36842527da39508a - -To fix this I propose to - -1. pass the config to flake8 explicitly -2. remove piper.in from the args list since it is excluded in the - flake8 config anyway -3. check the generated $build/piper.devel and $build/piper too per - 1ed66262b77ebd9fe188894d36842527da39508a -4. merge the --ignore in meson.build with the config - -Steps to reproduce: - -``` -$ meson ../build -$ ninja -C../build test -... -[17/18] Running all tests. -1/5 piper:all / files-in-git SKIP 0.01s exit status 77 -2/5 piper / validate appdata file OK 0.04s -3/5 piper / svg-lookup-check OK 0.10s -4/5 piper / check-svg OK 0.18s -5/5 piper / flake8 FAIL 1.00s exit status 1 ->>> MALLOC_PERTURB_=32 /gnu/store/yhhvrj6bns3ws85d338ah3bsc8jv4x64-profile/bin/flake8 --ignore=E501,W504 /home/tobias/ghq/github.com/libratbag/piper/piper /home/tobias/ghq/github.com/libratbag/piper/piper.in -――――――――――――――――――――――――――――――――――――――――――――――― ✀ ――――――――――――――――――――――――――――――――――――――――――――――― -/home/tobias/ghq/github.com/libratbag/piper/piper.in:11:19: E999 SyntaxError: invalid syntax -―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― -``` - -diff --git a/.flake8 b/.flake8 -index 8f1ba6f..170b294 100644 ---- a/.flake8 -+++ b/.flake8 -@@ -1,3 +1,3 @@ - [flake8] --ignore = E402,E501 -+ignore = E402,E501,W504 - exclude = .git,__pycache__,build,data,piper/piper.py,piper.in -diff --git a/meson.build b/meson.build -index 180a552..a4c73a1 100644 ---- a/meson.build -+++ b/meson.build -@@ -135,8 +135,9 @@ if enable_tests - flake8 = find_program('flake8') - if flake8.found() - test('flake8', flake8, -- args: ['--ignore=E501,W504', -+ args: ['--config=' + join_paths(meson.current_source_dir(), '.flake8'), - join_paths(meson.source_root(), 'piper'), -- join_paths(meson.source_root(), 'piper.in')]) -+ join_paths(meson.current_build_dir(), 'piper'), -+ join_paths(meson.current_build_dir(), 'piper.devel')]) - endif - endif diff --git a/app-misc/piper/piper-0.6.ebuild b/app-misc/piper/piper-0.6.ebuild deleted file mode 100644 index 5b9840cc142a..000000000000 --- a/app-misc/piper/piper-0.6.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit meson python-single-r1 xdg - -DESCRIPTION="GTK application to configure gaming devices" -HOMEPAGE="https://github.com/libratbag/piper" -SRC_URI="https://github.com/libratbag/piper/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - test? ( - $(python_gen_cond_dep ' - dev-python/flake8[${PYTHON_USEDEP}] - ') - ) -" -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/gobject-introspection - >=dev-libs/libratbag-0.13 - gnome-base/librsvg[introspection] - x11-libs/gdk-pixbuf[introspection] - x11-libs/gtk+:3[introspection] - $(python_gen_cond_dep ' - dev-python/evdev[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - ') -" -DEPEND=" - ${RDEPEND} - dev-libs/libevdev - virtual/libudev -" - -PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" ) - -src_configure() { - python_setup - - local emesonargs=( - $(meson_use test tests) - ) - - meson_src_configure -} - -src_install() { - meson_src_install - python_optimize - python_fix_shebang "${ED}"/usr/bin/ -} diff --git a/app-misc/piper/piper-0.7-r1.ebuild b/app-misc/piper/piper-0.7-r1.ebuild index e4a385f02dd2..ec2d208c5f69 100644 --- a/app-misc/piper/piper-0.7-r1.ebuild +++ b/app-misc/piper/piper-0.7-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-single-r1 xdg diff --git a/app-misc/piper/piper-9999.ebuild b/app-misc/piper/piper-9999.ebuild index 108c83fbd968..0631b1a08ae6 100644 --- a/app-misc/piper/piper-9999.ebuild +++ b/app-misc/piper/piper-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-single-r1 xdg |