From 8e581cee8bdae0151aa8adc830471c46ff8e62a9 Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Thu, 15 May 2025 16:29:04 +0200 Subject: [PATCH] Version bump --- dev-libs/feedbackd-device-themes/Manifest | 3 ++- .../feedbackd-device-themes-0.4.0.ebuild | 17 ------------ .../feedbackd-device-themes-0.8.3.ebuild | 23 ++++++++++++++++ dev-libs/feedbackd/Manifest | 4 +-- ...kd-0.8.1.ebuild => feedbackd-0.8.2.ebuild} | 27 ++++++++++++++----- 5 files changed, 47 insertions(+), 27 deletions(-) delete mode 100644 dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.4.0.ebuild create mode 100644 dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.8.3.ebuild rename dev-libs/feedbackd/{feedbackd-0.8.1.ebuild => feedbackd-0.8.2.ebuild} (68%) diff --git a/dev-libs/feedbackd-device-themes/Manifest b/dev-libs/feedbackd-device-themes/Manifest index 59000b2..ebcb353 100644 --- a/dev-libs/feedbackd-device-themes/Manifest +++ b/dev-libs/feedbackd-device-themes/Manifest @@ -1 +1,2 @@ -DIST feedbackd-device-themes-v0.4.0.tar.bz2 16548 BLAKE2B 25f2f9135cab824df2de905f7329caaeb9b2f1a678777e1573925c8fd2b3fc70d33242038099798c182ab7d5d65c3a150c6263c95c1fef288d22746963aa2626 SHA512 19b5f42368adae67561591588efe17e89325ff7a8bf1dd203c7ceff72df900306ac8bd56c35ba4c8fd33d653e5b51b6de4841604208f9ae89fe871f04f26a217 +DIST feedbackd-device-themes-0.8.3.tar.xz 22868 BLAKE2B 529ecc44b5eb2b80b4faaa176867630a9eaacb3072a39222c2407c23e8e856b656b443afd7abaf6c3ac64ae043dd064c5a916d637a392078257a39734dd1f58c SHA512 3b0540a43da211c4ac2bcda1420d4bc8c034b2a61b97d73da8b2b27466a1dc033f8515b12e5d076de3b80ab36be521b02fccdbf03f9b0d49ff3c98327a10a9e6 +DIST feedbackd-device-themes-0.8.3.tar.xz.asc 833 BLAKE2B 827b47feb5c9c6cf424c7f601eae08a53cacefe0f6315a0b83479a586d5f733d1517fdd1895de4c6baffbf1109cf14b0528a16d78a5441927d8d808615f86168 SHA512 953d83fcf64054f7fd41fa1835b11543642c0de3f6a344921bba2ad20cdb060aaf4726238393384fe59e1716afeb98340ff6c81276f5e5eb600c72cceb983e7d diff --git a/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.4.0.ebuild b/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.4.0.ebuild deleted file mode 100644 index 605c748..0000000 --- a/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.4.0.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -MY_PV="v${PV}" -MY_P="${PN}-${MY_PV}" -DESCRIPTION="A daemon to provide haptic feedback on events (themes package)" -HOMEPAGE="https://source.puri.sm/Librem5/feedbackd-device-themes" -SRC_URI="https://source.puri.sm/Librem5/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="LGPL-3" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -SLOT="0" diff --git a/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.8.3.ebuild b/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.8.3.ebuild new file mode 100644 index 0000000..d0665c6 --- /dev/null +++ b/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.8.3.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson verify-sig + +DESCRIPTION="Device specific themes for Feedbackd" +HOMEPAGE="https://gitlab.freedesktop.org/agx/feedbackd-device-themes" +SRC_URI="https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz + verify-sig? ( https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz.asc )" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +BDEPEND=" + verify-sig? ( + sec-keys/openpgp-keys-phosh + ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc" diff --git a/dev-libs/feedbackd/Manifest b/dev-libs/feedbackd/Manifest index 85903cb..b751648 100644 --- a/dev-libs/feedbackd/Manifest +++ b/dev-libs/feedbackd/Manifest @@ -1,2 +1,2 @@ -DIST feedbackd-0.8.1.tar.xz 107412 BLAKE2B 438b45005683af5ff7a78c803afcb7299c74a661dc1ee90de14a78ea5a092a8eac061a9d2396ad9f77b8265c27a80a56b98e1d3a42aa344b50ecbcc7d6905791 SHA512 14ff7d357940aa1478b709cc64b9ee6d8f72b464e3df69dc872f6efc943b264e4f5679f8a760e5aa29c3c37213f8b1555a8557b3fd1a1627c381b210c0268e1b -DIST feedbackd-0.8.1.tar.xz.asc 833 BLAKE2B ee1b0560b74bf61006bfa1313e272c334b75a1ea3af0e9b0b95dccab2cd67342cac1ea665176cb74141af385b98cbadc292391ff613a034aa8e27f7bd16fd0e1 SHA512 610578881009ac61215d9d1b87ba2b840481b7dd454098637b0604f0623e4fd93c395260de57afc568a3b8f7d26c4d68739e586dfd617a0fba30644eb1759e29 +DIST feedbackd-0.8.2.tar.xz 109408 BLAKE2B 4e090d7196eae5603facf132454e6fdfb5e93630b1370f8a3cb823ea2c8f28907c5aadfc2fe87cbcd30a2a55ceabb93e76c7ae8c20c16fc2b5da90c5167d324a SHA512 06fe4d2188d56549ff884d73a544dc9edc5fad2894f5bb59eb4fd1363eae6ed9b1feebcbf952d7db358b807a34ddf8ee0f8b3c7c46bafe9a6c44f0237013be1d +DIST feedbackd-0.8.2.tar.xz.asc 833 BLAKE2B 19d9362612eead71ffb170c30df1914aff7ee3b336745dbd220dcfe870809114ef430040e2adc8b72abbb3879c96dc6524de7265b4994a82272ef2793f954038 SHA512 64ec00bb90169b294093a11b0a868954ac3d928943d3f6eebe5fd1abcd0977179ad6769d28d7a37465ed21d4987102be45e34256da76aee112942d7c7efa725e diff --git a/dev-libs/feedbackd/feedbackd-0.8.1.ebuild b/dev-libs/feedbackd/feedbackd-0.8.2.ebuild similarity index 68% rename from dev-libs/feedbackd/feedbackd-0.8.1.ebuild rename to dev-libs/feedbackd/feedbackd-0.8.2.ebuild index 2a6f5b1..903f3b9 100644 --- a/dev-libs/feedbackd/feedbackd-0.8.1.ebuild +++ b/dev-libs/feedbackd/feedbackd-0.8.2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 VALA_USE_DEPEND="vapigen" -inherit meson udev vala verify-sig +inherit meson systemd udev vala verify-sig -DESCRIPTION="A daemon to provide haptic feedback on events" -HOMEPAGE="https://source.puri.sm/Librem5/feedbackd" +DESCRIPTION="DBus service for haptic/visual/audio feedback" +HOMEPAGE="https://gitlab.freedesktop.org/agx/feedbackd" SRC_URI="https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz verify-sig? ( https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz.asc )" @@ -28,9 +28,11 @@ DEPEND=" media-libs/gsound ) introspection? ( dev-libs/gobject-introspection ) + test? ( dev-util/umockdev ) " RDEPEND="${DEPEND} - dev-libs/feedbackd-device-themes + acct-group/video + >=dev-libs/feedbackd-device-themes-0.8.0 " BDEPEND=" dev-util/gdbus-codegen @@ -39,13 +41,13 @@ BDEPEND=" vala? ( $(vala_depend) ) verify-sig? ( sec-keys/openpgp-keys-phosh ) " - VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc" src_prepare() { default - use vala && vala_setup + vala_setup + sed -i 's/-G feedbackd/-G video/g' data/90-feedbackd.rules || die } src_configure() { @@ -56,10 +58,17 @@ src_configure() { $(meson_use man) $(meson_use test tests) $(meson_use vala vapi) + -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" ) meson_src_configure } +src_test() { + ewarn "fbd-dev-led tests might fail if umockdev is broken on your system" + ewarn "See https://bugs.gentoo.org/868204" + meson_src_test +} + src_install() { meson_src_install @@ -70,9 +79,13 @@ src_install() { } pkg_postinst() { + use daemon || return 0 + udev_reload } pkg_postrm() { + use daemon || return 0 + udev_reload }