From 450e3a618422c0a43237d61299b0cca6ff87b8f3 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sat, 19 Oct 2024 19:18:28 +0500 Subject: [PATCH] phosh-base/phosh-shell: add 0.42.0, drop old Signed-off-by: Anna (cybertailor) Vyalkova --- phosh-base/phosh-shell/Manifest | 6 +- .../phosh-shell/phosh-shell-0.38.0.ebuild | 138 ------------------ ....40.0.ebuild => phosh-shell-0.42.0.ebuild} | 16 +- 3 files changed, 13 insertions(+), 147 deletions(-) delete mode 100644 phosh-base/phosh-shell/phosh-shell-0.38.0.ebuild rename phosh-base/phosh-shell/{phosh-shell-0.40.0.ebuild => phosh-shell-0.42.0.ebuild} (90%) diff --git a/phosh-base/phosh-shell/Manifest b/phosh-base/phosh-shell/Manifest index 4cc7a387bd..d9228bf8b2 100644 --- a/phosh-base/phosh-shell/Manifest +++ b/phosh-base/phosh-shell/Manifest @@ -1,6 +1,4 @@ -DIST phosh-0.38.0.tar.xz 866816 BLAKE2B 22be8e8a673494da7795270d7fb7fff2bfb87762b8cce9540d2f8644ded760ee2ac8a75d8052eb46172d6f5764e020ef949330ed14f5cc645cef586e26b5a398 SHA512 dfde54b64ea6edba2b66dfe2f5ff0f4b3edbb192b1a37fbc8c98d9365bdedc5d19ddb1464673e516cb8e436a6c0ea00c84087cc6431b6c1862019f90e02b73ce -DIST phosh-0.38.0.tar.xz.asc 833 BLAKE2B d9c49a42bc5083678e3195eb6fded80455312887b0c0f99dd03c6662d3c01bec228b0c68f7044dfe86fe1473b8ddbaf797729a5a92fbbbb5c8d18302149376dd SHA512 8007c2f58c311659310d06962ad825c51fb90f4da864f110db5b1f0f5d7c70b0ef69ddbfa169489657b3088ed6b89dbdf7e910101267ccd307578d75f9301b46 -DIST phosh-0.40.0.tar.xz 910888 BLAKE2B 9bf1da29af73387b4f080f580dc29422d6f113c19b52c72596bcf2dd1f3e4e61da4270f3798f07148f8a197f8b076b67e51108c08af503c0a4a5566c8ef13669 SHA512 e82e1955b708f01827f5ce8e31cd5b6449e66b527dd9a1bc6300a70c6c90ccffa14ae9d569bfa8627f995d96437ef4d063e7ebd7e20556a273dc75902a1e9538 -DIST phosh-0.40.0.tar.xz.asc 833 BLAKE2B e45a7726d4f94cabd98f36d9de2c870d51a480f8b4b10f1ea046fa4cffbef165caf3c701892a7cd80e63753fc791556da854dfd24c8f80bd70b2a19ce63c9508 SHA512 9bb24e6f0ccf3534a9a28711e82b5aa8b2a10bcbe3b99b7d7329476ed2916b53ce9dc31c0c06aaec7d67370bc05dc35199da60f191d6706bb636f7a6b7ecffb8 DIST phosh-0.41.0.tar.xz 930812 BLAKE2B ab2c7aeb3aedbfa449f2cabc552ab2e6315b7ab84e8aeed6f896dc1d8e0b4672870768602ee10b0c9af1f190e61e033f7e2d62f0e9fb45e16e1c96ed1ddecf55 SHA512 4309b348dc798124803d2fd3fe61eb68d4d1820d9ba88b503998110f8b422e7174da9d85e1a5212b768019b2c76e3fad1eb38aa4c37f70bba4a377a49f807781 DIST phosh-0.41.0.tar.xz.asc 833 BLAKE2B c69ef72836cfca0698d64a9c8914b8f01da3d70300867167dda981f3a1b81f0a91c30671d4d8ed17f34c1ddd1e05f95078377627da6788bb34445a729bf33e83 SHA512 7b17328b9369dc74c1f4cc55f0f3f4d42687742e112c4e9732a5d273e9c6b43b58c2ba52188687fa5bc7c497dc7aee6a3dd2df975023bedad5e3d854d2395a3c +DIST phosh-0.42.0.tar.xz 940212 BLAKE2B 91935d095102320823283968861563b93d1c558137307cbaf934a293dcb29c720692e4b4ca810209a2347761c15b466a9d6612cb3ad9fdd36ce4cbceb1d641f4 SHA512 e5f8817cd8fcf5cc07faa687aa7411c9af2cfe2b09a4f7332691184eb69cc106d5685b6951e2c66a1ef639ba7e074e603771fcedad6e62dc75771084a442f0ff +DIST phosh-0.42.0.tar.xz.asc 833 BLAKE2B 9dc5771e5650bc30b8b72b048eb5cccc137152be1e51afc30dab82569890a18aab932defcc6ca4a3bc8ce31af9b9659c56b792119b042c2f6490b1a9eb8e828c SHA512 8d5dd2eb60ae369da18fd79de8a696835f7ce94a39c20a597bfa9ed2a4ed44af606123f994a6040d96c6a7b52a28418eb4e066e64858b8f8c15c2e2395f08b50 diff --git a/phosh-base/phosh-shell/phosh-shell-0.38.0.ebuild b/phosh-base/phosh-shell/phosh-shell-0.38.0.ebuild deleted file mode 100644 index 8a824cb298..0000000000 --- a/phosh-base/phosh-shell/phosh-shell-0.38.0.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome2-utils meson pam systemd verify-sig virtualx xdg - -MY_PN="${PN%-shell}" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="Pure Wayland shell for mobile devices" -HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phosh/" -SRC_URI="https://sources.phosh.mobi/releases/${MY_PN}/${MY_P}.tar.xz - verify-sig? ( https://sources.phosh.mobi/releases/${MY_PN}/${MY_P}.tar.xz.asc )" -S="${WORKDIR}/${MY_P}" - -LICENSE="CC0-1.0 CC-BY-SA-4.0 GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+ MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="elogind gtk-doc +lockscreen-plugins man test test-full" -REQUIRED_USE="test? ( lockscreen-plugins )" - -COMMON_DEPEND=" - >=app-crypt/gcr-3.7.5:0 - app-crypt/libsecret - >=dev-libs/feedbackd-0.2.0 - dev-libs/fribidi - >=dev-libs/glib-2.76:2 - >=dev-libs/json-glib-1.6.2 - dev-libs/libgudev:= - >=dev-libs/wayland-1.14 - >=gnome-base/gnome-desktop-3.26:3 - >=gnome-base/gsettings-desktop-schemas-42 - >=gnome-extra/evolution-data-server-3.33.1:= - >=gui-libs/libhandy-1.1.90:1 - media-libs/libpulse[glib] - media-sound/callaudiod - net-libs/libsoup:3.0 - >=net-misc/networkmanager-1.14 - sys-apps/dbus - >=sys-auth/polkit-0.105 - sys-libs/pam - >=sys-power/upower-0.99.1:= - >=x11-libs/gtk+-3.22:3[wayland] - elogind? ( >=sys-auth/elogind-241 ) - !elogind? ( >=sys-apps/systemd-241:= ) - lockscreen-plugins? ( - app-text/evince:= - gui-libs/gtk:4 - gui-libs/libadwaita:1 - ) -" -RUNTIME_DEPEND=" - gnome-base/gnome-shell - virtual/freedesktop-icon-theme - x11-themes/gnome-themes-standard -" - -DEPEND=" - ${COMMON_DEPEND:?} - >=dev-libs/wayland-protocols-1.12 - test-full? ( ${RUNTIME_DEPEND:?} ) -" -RDEPEND=" - ${COMMON_DEPEND:?} - ${RUNTIME_DEPEND:?} - !elogind? ( sys-libs/libcap ) -" -BDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2 - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/wayland-scanner - sys-devel/gettext - gtk-doc? ( dev-util/gi-docgen ) - man? ( dev-python/docutils ) - test-full? ( >=gui-wm/phoc-0.36.0-r1 ) - verify-sig? ( sec-keys/openpgp-keys-phosh ) -" - -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc" - -src_configure() { - local emesonargs=( - -Dcompositor="${EPREFIX}"/usr/bin/phoc - -Dtools=true - -Dquick-setting-plugins=true - $(meson_use !elogind systemd) - $(meson_use gtk-doc gtk_doc) - $(meson_use lockscreen-plugins) - $(meson_use man) - $(meson_use test tests) - $(meson_feature test-full phoc_tests) - ) - meson_src_configure -} - -src_test() { - local -x LC_ALL="C.UTF-8" - local -x WLR_RENDERER="pixman" - - virtx meson_src_test --suite unit - if use test-full; then - virtx meson_src_test --suite integration - fi -} - -src_install() { - meson_src_install --skip-subprojects gmobile - pamd_mimic system-local-login phosh auth account session - systemd_douserunit data/phosh.service - - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/${MY_PN}-${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die - fi -} - -phosh_giomodule_cache_update() { - local plugins_dir - plugins_dir=$(pkg-config --variable=lockscreen_plugins_dir phosh-plugins) || return 1 - - ebegin "Updating GIO modules cache" - gio-querymodules "${plugins_dir}" - eend $? -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - phosh_giomodule_cache_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update - phosh_giomodule_cache_update -} diff --git a/phosh-base/phosh-shell/phosh-shell-0.40.0.ebuild b/phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild similarity index 90% rename from phosh-base/phosh-shell/phosh-shell-0.40.0.ebuild rename to phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild index e5f76f4ea9..8065339517 100644 --- a/phosh-base/phosh-shell/phosh-shell-0.40.0.ebuild +++ b/phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild @@ -25,7 +25,7 @@ REQUIRED_USE=" COMMON_DEPEND=" >=app-crypt/gcr-3.7.5:0[introspection?] app-crypt/libsecret - >=dev-libs/feedbackd-0.2.0 + >=dev-libs/feedbackd-0.4.0 dev-libs/fribidi >=dev-libs/glib-2.76:2 dev-libs/gmobile @@ -39,9 +39,11 @@ COMMON_DEPEND=" media-libs/libpulse[glib] media-sound/callaudiod net-libs/libsoup:3.0 + net-misc/modemmanager:= >=net-misc/networkmanager-1.14[introspection?] + >=net-wireless/gnome-bluetooth-46.0:3 sys-apps/dbus - >=sys-auth/polkit-0.105 + >=sys-auth/polkit-0.122 sys-libs/pam >=sys-power/upower-0.99.1:= x11-libs/cairo @@ -52,8 +54,8 @@ COMMON_DEPEND=" !elogind? ( >=sys-apps/systemd-241:= ) lockscreen-plugins? ( app-text/evince:= - gui-libs/gtk:4 - gui-libs/libadwaita:1 + >=gui-libs/gtk-4.12:4 + >=gui-libs/libadwaita-1.5:1 ) " RUNTIME_DEPEND=" @@ -90,6 +92,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc" src_configure() { local emesonargs=( -Dcompositor="${EPREFIX}"/usr/bin/phoc + -Dbindings-lib=true -Dtools=true -Dquick-setting-plugins=true $(meson_use gtk-doc gtk_doc) @@ -108,12 +111,15 @@ src_test() { virtx meson_src_test --suite unit if use test-full; then - virtx meson_src_test --suite integration + # Passing "-j 1" because "phosh:integration / shell" test is flaky + virtx meson_src_test --suite integration -j 1 fi } src_install() { meson_src_install + rm -f "${ED}"/usr/$(get_libdir)/libphosh*.a + pamd_mimic system-local-login phosh auth account session systemd_douserunit data/phosh.service