commit: d800158747d9cdc3076c28323d84407d6a7d2a96 Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Sun Aug 24 13:23:16 2025 +0000 Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> CommitDate: Sun Aug 24 17:21:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d8001587
phosh-base/phosh-shell: add 0.49.0, drop 0.42.0 Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> phosh-base/phosh-shell/Manifest | 4 +- phosh-base/phosh-shell/files/pam_phosh | 5 -- .../phosh-shell-0.49.0-fix-test-source-root.patch | 29 ++++++++++ phosh-base/phosh-shell/files/phosh.service | 56 ------------------ phosh-base/phosh-shell/files/sm.puri.OSK0.desktop | 12 ---- ...ell-0.42.0.ebuild => phosh-shell-0.49.0.ebuild} | 66 +++++++++++++++------- 6 files changed, 76 insertions(+), 96 deletions(-) diff --git a/phosh-base/phosh-shell/Manifest b/phosh-base/phosh-shell/Manifest index f3837d262a..39795ac865 100644 --- a/phosh-base/phosh-shell/Manifest +++ b/phosh-base/phosh-shell/Manifest @@ -1,6 +1,6 @@ -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 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 diff --git a/phosh-base/phosh-shell/files/pam_phosh b/phosh-base/phosh-shell/files/pam_phosh deleted file mode 100644 index 0580d9841c..0000000000 --- a/phosh-base/phosh-shell/files/pam_phosh +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 - -auth include system-local-login -account include system-local-login -session include system-local-login diff --git a/phosh-base/phosh-shell/files/phosh-shell-0.49.0-fix-test-source-root.patch b/phosh-base/phosh-shell/files/phosh-shell-0.49.0-fix-test-source-root.patch new file mode 100644 index 0000000000..7df5004a2e --- /dev/null +++ b/phosh-base/phosh-shell/files/phosh-shell-0.49.0-fix-test-source-root.patch @@ -0,0 +1,29 @@ +From d100f2f9f2aac2cba7aa18e5e9fcdb9a9674c6ce Mon Sep 17 00:00:00 2001 +From: "Anna (cybertailor) Vyalkova" <[email protected]> +Date: Sun, 24 Aug 2025 18:06:58 +0500 +Subject: [PATCH] tests: Don't assume build directory is inside source + directory + +Signed-off-by: Anna (cybertailor) Vyalkova <[email protected]> +--- + tests/services/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/services/meson.build b/tests/services/meson.build +index 080c7c57..b1044a94 100644 +--- a/tests/services/meson.build ++++ b/tests/services/meson.build +@@ -2,8 +2,8 @@ service_data = configuration_data() + service_data.set('ABS_BUILDDIR', meson.project_build_root()) + + dbus_interface = join_paths( +- meson.project_build_root(), +- '../src/dbus/org.gnome.Shell.SearchProvider2.xml', ++ meson.project_source_root(), ++ 'src/dbus/org.gnome.Shell.SearchProvider2.xml', + ) + service = 'org.gnome.Phosh.MockSearchProvider.service' + +-- +2.51.0 + diff --git a/phosh-base/phosh-shell/files/phosh.service b/phosh-base/phosh-shell/files/phosh.service deleted file mode 100644 index 6a1bda33c0..0000000000 --- a/phosh-base/phosh-shell/files/phosh.service +++ /dev/null @@ -1,56 +0,0 @@ -[Unit] -Description=Phosh, a shell for mobile phones -Documentation=https://gitlab.gnome.org/World/Phosh/phosh - -# Make sure we are started after logins are permitted. -After=systemd-user-sessions.service -# If Plymouth is used, we want to start when it is on its way out. -After=plymouth-quit-wait.service - -# D-Bus is necessary for contacting logind. Logind is required. -Wants=dbus.socket -After=dbus.socket - -# This scope is created by pam_systemd when logging in as the user. -# This directive is a workaround to a systemd bug, where the setup of the -# user session by PAM has some race condition, possibly leading to a failure. -# See README for more details. -After=session-c1.scope - -# Since we are part of the graphical session, make sure we are started before -# it is complete. -Before=graphical.target - -# Prevent starting on systems without virtual consoles -ConditionPathExists=/dev/tty0 - -[Service] -Environment=LANG=C.UTF-8 -Environment=XDG_CURRENT_DESKTOP=GNOME:Phosh -Environment=XDG_SESSION_DESKTOP=phosh -Environment=XDG_SESSION_TYPE=wayland -ExecStart=/usr/bin/phosh -TimeoutStartSec=30 -User=1000 -PAMName=login -WorkingDirectory=~ -Restart=always -RestartSec=5s - -# A virtual terminal is needed. -TTYPath=/dev/tty7 -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes - -# Fail to start if not controlling the tty. -StandardInput=tty-fail -StandardOutput=journal -StandardError=journal - -# Log this user with utmp, letting it show up with commands 'w' and 'who'. -UtmpIdentifier=tty7 -UtmpMode=user - -[Install] -WantedBy=graphical.target diff --git a/phosh-base/phosh-shell/files/sm.puri.OSK0.desktop b/phosh-base/phosh-shell/files/sm.puri.OSK0.desktop deleted file mode 100644 index e4a8753400..0000000000 --- a/phosh-base/phosh-shell/files/sm.puri.OSK0.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Name=On-screen keyboard -Comment=Default on-screen keyboard -Exec=/usr/bin/phosh-osk-stub -Categories=GNOME;Core; -OnlyShowIn=GNOME; -NoDisplay=true -X-GNOME-Autostart-Phase=Panel -X-GNOME-Provides=inputmethod -X-GNOME-Autostart-Notify=true -X-GNOME-AutoRestart=true diff --git a/phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild b/phosh-base/phosh-shell/phosh-shell-0.49.0.ebuild similarity index 66% rename from phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild rename to phosh-base/phosh-shell/phosh-shell-0.49.0.ebuild index 8d09302fc2..0af859dda5 100644 --- a/phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild +++ b/phosh-base/phosh-shell/phosh-shell-0.49.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 2021-2025 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 +inherit gnome2-utils meson pam systemd toolchain-funcs vala verify-sig virtualx xdg MY_PN="${PN%-shell}" MY_P="${MY_PN}-${PV}" @@ -16,46 +16,51 @@ 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 systemd test test-full" +IUSE="gtk-doc introspection +lockscreen-plugins man +plugins systemd test test-full vala" REQUIRED_USE=" gtk-doc? ( introspection ) - test? ( lockscreen-plugins ) + lockscreen-plugins? ( plugins ) + test? ( plugins lockscreen-plugins ) + 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/feedbackd-0.4.0 + >=dev-libs/appstream-1.0.0:= + >=dev-libs/feedbackd-0.7.0 dev-libs/fribidi >=dev-libs/glib-2.76:2 dev-libs/gmobile dev-libs/libgudev:= dev-libs/libical:= >=dev-libs/wayland-1.14 - >=gnome-base/gnome-desktop-3.26:3 - >=gnome-base/gsettings-desktop-schemas-42 + >=gnome-base/gnome-desktop-3.26:3=[introspection?] + >=gnome-base/gsettings-desktop-schemas-47 >=gnome-extra/evolution-data-server-3.33.1:= >=gui-libs/libhandy-1.1.90:1[introspection?] media-libs/libpulse[glib] media-sound/callaudiod - net-libs/libsoup:3.0 - net-misc/modemmanager:= + >=net-libs/libsoup-3.6:3.0 + >=net-misc/modemmanager-1.24.0:= >=net-misc/networkmanager-1.14[introspection?] - >=net-wireless/gnome-bluetooth-46.0:3 + >=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:= ) !systemd? ( >=sys-auth/elogind-241 ) - lockscreen-plugins? ( - app-text/evince:= + plugins? ( >=gui-libs/gtk-4.12:4 >=gui-libs/libadwaita-1.5:1 + lockscreen-plugins? ( + app-text/evince:= + ) ) " RUNTIME_DEPEND=" @@ -68,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:?} @@ -81,26 +90,41 @@ BDEPEND=" dev-util/glib-utils dev-util/wayland-scanner sys-devel/gettext + virtual/pkgconfig gtk-doc? ( dev-util/gi-docgen ) + introspection? ( dev-libs/gobject-introspection ) man? ( dev-python/docutils ) - test-full? ( >=gui-wm/phoc-0.36.0-r1 ) + test-full? ( >=gui-wm/phoc-0.45.0 ) verify-sig? ( sec-keys/openpgp-keys-phosh ) " +PATCHES=( "${FILESDIR}"/${PN}-0.49.0-fix-test-source-root.patch ) + 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 - -Dbindings-lib=true -Dtools=true - -Dquick-setting-plugins=true + -Dsearchd=true $(meson_use gtk-doc gtk_doc) $(meson_use introspection) + $(meson_use introspection bindings-lib) $(meson_use lockscreen-plugins) + $(meson_use plugins quick-setting-plugins) $(meson_use man) $(meson_use test tests) $(meson_feature test-full phoc_tests) + $(meson_use vala vapi) ) meson_src_configure } @@ -113,7 +137,7 @@ src_test() { meson_src_test --suite unit || return 1 if use test-full; then - meson_src_test --suite integration || return 1 + meson_src_test --suite integration --timeout-multiplier 2 || return 1 fi } @@ -128,7 +152,7 @@ src_test() { src_install() { meson_src_install - rm -f "${ED}"/usr/$(get_libdir)/libphosh*.a + find "${ED}/usr/$(get_libdir)" -name '*.a' -delete || die pamd_mimic system-local-login phosh auth account session systemd_douserunit data/phosh.service @@ -141,7 +165,7 @@ src_install() { phosh_giomodule_cache_update() { local plugins_dir - plugins_dir=$(pkg-config --variable=lockscreen_plugins_dir phosh-plugins) || return 1 + plugins_dir=$("$(tc-getPKG_CONFIG)" --variable=lockscreen_plugins_dir phosh-plugins) || return 1 ebegin "Updating GIO modules cache" gio-querymodules "${plugins_dir}"
