commit: a6779ce1b752730b2b9a63cf137b2b0ad72ba866 Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Fri Nov 7 14:47:46 2025 +0000 Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> CommitDate: Fri Nov 7 15:39:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a6779ce1
phosh-base/phosh-shell: add 0.50.1, drop 0.47.0-r1 Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> phosh-base/phosh-shell/Manifest | 4 +-- phosh-base/phosh-shell/metadata.xml | 10 +++++- ...-0.47.0-r1.ebuild => phosh-shell-0.50.1.ebuild} | 36 ++++++++++++++-------- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/phosh-base/phosh-shell/Manifest b/phosh-base/phosh-shell/Manifest index 39795ac865..243d9ae75e 100644 --- a/phosh-base/phosh-shell/Manifest +++ b/phosh-base/phosh-shell/Manifest @@ -1,6 +1,6 @@ -DIST phosh-0.47.0.tar.xz 1021352 BLAKE2B f48766e0f981e4ceda53302af9935e54db66b12be2169852473320f1e39d82d7cbd56aa38d59803b5115fbd4bcd10560020be28714441f41e93175806086cdcb SHA512 19c150d28921b383269e4c95d353b7ea69e62cc4075a7a1e1523aa0977b347898d16df7d88861e5d029469a881623e15673ee270c3c514db123aec683ec8194d -DIST phosh-0.47.0.tar.xz.asc 833 BLAKE2B 682bd67276f3f95eea1ab352195c38e292ca5175b0ac2415ae01c1acf597e8248477800a295842c99c1608043cccff1331604e0575f57a0dc70bb46183f29ffc SHA512 89293648f3b66db822e9bf368938b14253a6a00d7e051d5d238434a6b77f3eba0931ff9c6ed94b5f57c17f4dbf3dee1e7ebc20a1f186c3e8e82549cb4bcb8268 DIST phosh-0.48.0.tar.xz 1025860 BLAKE2B e09746ad13714599e3f5e59fa7ab1a24aad816d175c2f37edac25daab7619c3101167b31b0789c536f48f5b7d866dd2b0dbd2e904ad99f21bc3e2b4f9a35c5b2 SHA512 7d689b29d39aae0937fdcf22c8fe5267de6174487d75df67a3d71e7cb23b765ce138e8c7769256cb0ca006241692ec8376f5119f1c576c2ea2edc437abcda335 DIST phosh-0.48.0.tar.xz.asc 833 BLAKE2B b7c30f692f1db539d0175f996f0cf24a6e51067424fee3f106f3be9c5bbe9ef1f7ff2f413c9e2d8f7dd17ad89972e5e14bd6124995498d1aa1efec5f4d2059c3 SHA512 00d8a62f60cd9d0f2b4453cdf0a3422342c012693763d7f7d3f0500b80701e5c169d65b6f4d54220621e9dda9af5260dcb260b9fa1f1e6f8cb7a43e819b354ba DIST phosh-0.49.0.tar.xz 1048056 BLAKE2B 03df719cbcb95a1378b8f45c8a21dffcc188e4dfb43147b57e90edfe9be1321db56ae3dca2071365b4227b549bdddceecdeddaf3fe26d6168c82f0398ade9d19 SHA512 103fd004c3f9cd534842c52720dedd9faa83f6c16abf6b6a1b7af905fe992159ba3a5b6d0be40c75799c8cc492d484f07638fede1161257e504c9d65ccbb2afb DIST phosh-0.49.0.tar.xz.asc 833 BLAKE2B c9dd9ea6d3c11be14b7a1aecfeeb3bf083140f96e98bb2376cb951b0e3f1383c29e99ec6a6fe29fbd5674b5521977023dc40c381eb9d8c2a6159c06726617c03 SHA512 f4cfc61a73b5a8bbd9de67228a2d7beb4bf37632480d3be477b6ba5af1c9646cec8ca0c15570cc7de2c8f83d3403c4549ff7a232ebf98b04ba1aa62e1d077d36 +DIST phosh-0.50.1.tar.xz 1108616 BLAKE2B 3450c6df5059d5206bbfe7424d7efa24dced1f57a44d31cc68c105c16fe4b5d692c2ccdbf2b8f6911496b377682750f9cdb209f28e615e36d954e561d2509f94 SHA512 d9b4d05ecc7d287d75d514e1dc78e308d0e551486cb38e95ab645615469d1a84c5bd1ec2d98a5501f0f97eef0385aa82d96393bad4bd01e7cf7508c014b7af40 +DIST phosh-0.50.1.tar.xz.asc 833 BLAKE2B 35deb05b7333bd149326d99a4e59a96b985a69362f02549ce7c98df31905cf13af9fd76af62ff0511616590f81df84b8f9b912b1ab40d90f821372b4642c4bc0 SHA512 ab57dbd89838fe2d5b14046a44d296a854e3d0077a7014cbb690efa7be0af1b989fb875cba0d5262eeed1bb2d104410a412de9cb4c0a9a966518260cb0af8937 diff --git a/phosh-base/phosh-shell/metadata.xml b/phosh-base/phosh-shell/metadata.xml index 27b6b58430..a6b2dee450 100644 --- a/phosh-base/phosh-shell/metadata.xml +++ b/phosh-base/phosh-shell/metadata.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <maintainer type="person"> @@ -14,6 +14,14 @@ <bugs-to>https://gitlab.gnome.org/World/Phosh/phosh/-/issues</bugs-to> <doc>https://gitlab.gnome.org/World/Phosh/phosh/-/wikis/Home</doc> <remote-id type="gnome-gitlab">World/Phosh/phosh</remote-id> + <maintainer> + <name>Guido Günther</name> + <email>[email protected]</email> + </maintainer> + <maintainer> + <name>Zander Brown</name> + <email>[email protected]</email> + </maintainer> </upstream> <use> <flag name="lockscreen-plugins">Build lockscreen plugins and widgets</flag> diff --git a/phosh-base/phosh-shell/phosh-shell-0.47.0-r1.ebuild b/phosh-base/phosh-shell/phosh-shell-0.50.1.ebuild similarity index 84% rename from phosh-base/phosh-shell/phosh-shell-0.47.0-r1.ebuild rename to phosh-base/phosh-shell/phosh-shell-0.50.1.ebuild index b373f536b0..5447ce5c73 100644 --- a/phosh-base/phosh-shell/phosh-shell-0.47.0-r1.ebuild +++ b/phosh-base/phosh-shell/phosh-shell-0.50.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit gnome2-utils meson pam systemd toolchain-funcs verify-sig virtualx xdg +inherit gnome2-utils meson pam systemd toolchain-funcs vala verify-sig virtualx xdg MY_PN="${PN%-shell}" MY_P="${MY_PN}-${PV}" @@ -16,15 +16,16 @@ 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="gtk-doc introspection +lockscreen-plugins man +plugins systemd test test-full" +IUSE="gtk-doc introspection +lockscreen-plugins man +plugins systemd test test-full vala" REQUIRED_USE=" gtk-doc? ( introspection ) lockscreen-plugins? ( plugins ) - test? ( plugins lockscreen-plugins ) + test? ( plugins lockscreen-plugins test-full ) + vala? ( introspection ) " COMMON_DEPEND=" - >=app-crypt/gcr-3.7.5:0[introspection?] + >=app-crypt/gcr-3.7.5:0=[introspection?] app-crypt/libsecret >=dev-libs/appstream-1.0.0:= >=dev-libs/feedbackd-0.7.0 @@ -41,15 +42,15 @@ COMMON_DEPEND=" media-libs/libpulse[glib] media-sound/callaudiod >=net-libs/libsoup-3.6:3.0 - net-misc/modemmanager:= + >=net-misc/modemmanager-1.24.0:= >=net-misc/networkmanager-1.14[introspection?] >=net-wireless/gnome-bluetooth-46.0:3=[introspection?] sys-apps/dbus >=sys-auth/polkit-0.122 sys-libs/pam - >=sys-power/upower-0.99.1:= + >=sys-power/upower-1.90:= x11-libs/cairo - x11-libs/gdk-pixbuf + x11-libs/gdk-pixbuf:2 x11-libs/pango >=x11-libs/gtk+-3.22:3[introspection?,wayland] systemd? ( >=sys-apps/systemd-241:= ) @@ -72,6 +73,10 @@ DEPEND=" ${COMMON_DEPEND:?} >=dev-libs/wayland-protocols-1.12 test-full? ( ${RUNTIME_DEPEND:?} ) + vala? ( + $(vala_depend) + >=net-misc/networkmanager-1.14[vala] + ) " RDEPEND=" ${COMMON_DEPEND:?} @@ -90,19 +95,21 @@ BDEPEND=" introspection? ( dev-libs/gobject-introspection ) man? ( dev-python/docutils ) test-full? ( >=gui-wm/phoc-0.45.0 ) - verify-sig? ( sec-keys/openpgp-keys-phosh ) + verify-sig? ( >=sec-keys/openpgp-keys-phosh-2025 ) " VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc" -# https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1240 -# https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1733 -RESTRICT="test" +src_prepare() { + use vala && vala_setup + default +} src_configure() { local emesonargs=( -Dcompositor="${EPREFIX}"/usr/bin/phoc -Dtools=true + -Dsearchd=true $(meson_use gtk-doc gtk_doc) $(meson_use introspection) $(meson_use introspection bindings-lib) @@ -111,6 +118,7 @@ src_configure() { $(meson_use man) $(meson_use test tests) $(meson_feature test-full phoc_tests) + $(meson_use vala vapi) ) meson_src_configure } @@ -121,7 +129,11 @@ src_test() { local -x WLR_RENDERER="pixman" local -x PHOSH_TEST_PHOC_INI="${T}/phoc.ini" - meson_src_test --suite unit || return 1 + # XXX: app-grid-button tests segfaults + # https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1240 + # https://github.com/ximion/appstream/issues/720 + #meson_src_test --suite unit || return 1 + if use test-full; then meson_src_test --suite integration --timeout-multiplier 2 || return 1 fi
