diff --git a/.github/Dockerfile b/.github/Dockerfile index ed6f00c7..57dd7986 100644 --- a/.github/Dockerfile +++ b/.github/Dockerfile @@ -2,7 +2,14 @@ FROM registry.gitlab.gnome.org/world/phosh/phosh/debian:v0.0.2024-11-04 -ARG PHOSH_TAG=v0.43.1 +ARG PHOSH_REMOTE=https://gitlab.gnome.org/World/Phosh/phosh.git +ARG PHOSH_REF=v0.44.0 + +# Workaround for https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1161 +# Official upstream can be used when phoc 0.45 is released +#ARG PHOC_REMOTE=https://gitlab.gnome.org/World/Phosh/phoc.git +ARG PHOC_REMOTE=https://gitlab.gnome.org/guidog/phoc.git +ARG PHOC_REF=05f9cfbe4c4c0e74732d8817e1e2959053d40e6d RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -y update \ @@ -10,9 +17,18 @@ RUN export DEBIAN_FRONTEND=noninteractive \ dh-cargo \ rust-clippy \ wf-recorder \ - && eatmydata git clone -b ${PHOSH_TAG} https://gitlab.gnome.org/World/Phosh/phosh.git \ + && eatmydata git clone ${PHOC_REMOTE} \ + && cd phoc \ + && git checkout ${PHOC_REF} \ + && DEB_BUILD_PROFILES=pkg.phoc.embedwlroots eatmydata apt-get --no-install-recommends -y build-dep . \ + && eatmydata meson setup --prefix=/usr -Dembed-wlroots=enabled _build . \ + && eatmydata meson compile -C _build \ + && eatmydata meson install -C _build \ + && cd .. \ + && eatmydata git clone ${PHOSH_REMOTE} \ && cd phosh \ - && eatmydata apt-get -y build-dep . \ + && git checkout ${PHOSH_REF} \ + && eatmydata apt-get --no-install-recommends -y build-dep . \ && eatmydata meson setup --prefix=/usr -Dbindings-lib=true _build . \ && eatmydata meson compile -C _build \ && eatmydata meson install -C _build \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 56d4e012..20989d9d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,6 @@ concurrency: env: CARGO_TERM_COLOR: always RUSTFLAGS: "-Dwarnings" - PHOSH_TAG: v0.43.1 permissions: contents: write diff --git a/.packit.yaml b/.packit.yaml index 0c7befb9..b5c17065 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -9,7 +9,9 @@ jobs: # Build PRs - job: copr_build trigger: pull_request - additional_repos: [copr://samcday/phrog-nightly] + additional_repos: + - copr://samcday/phosh-nightly + - copr://samcday/phrog-nightly targets: - fedora-41-aarch64 - fedora-41-x86_64 diff --git a/Cargo.lock b/Cargo.lock index 12fdaeda..d280b6d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1063,9 +1063,9 @@ dependencies = [ [[package]] name = "libphosh" -version = "0.0.4" +version = "0.0.5" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "fe123fc484331be2a8e148321cdf71750c541cf81d32b056b3cb79cdad24a7d5" +checksum = "74e31a3ccaba362abf6bc2b461e569226cb2f37b161b44f7101b218f0232c955" dependencies = [ "gdk", "gio 0.18.4", @@ -1077,9 +1077,9 @@ dependencies = [ [[package]] name = "libphosh-sys" -version = "0.0.4" +version = "0.0.5" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "dd0a352ce928b225da90ba3f6fe75c378399b4d1a8700d4ded1f4922853d4760" +checksum = "2839ca41063b7e44107cb27101eb48268ad035b20b7719d55cd5cae3f7f4dfa4" dependencies = [ "gdk-pixbuf-sys", "gdk-sys", diff --git a/Cargo.toml b/Cargo.toml index 3a45024a..0742af20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ glob = "0.3.1" greetd_ipc = { version = "0.10.0", features = ["sync-codec"] } async-channel = "2.2.1" anyhow = "1.0.82" -libphosh = "0.0.4" +libphosh = "0.0.5" clap = { version = "4.5.4", features = ["derive"] } wayland-client = "0.31" zbus = { version = "4", default-features = false, features = ["blocking", "async-io"] } diff --git a/phrog.spec b/phrog.spec index 601e2d13..aff49c79 100644 --- a/phrog.spec +++ b/phrog.spec @@ -1,8 +1,8 @@ %global cargo_install_lib 0 -%global phosh_ver 0.43 +%global phosh_ver 0.44 Name: phrog -Version: 0.43.0 +Version: 0.44.0 Release: %autorelease Summary: Greetd-compatible greeter for mobile phones License: GPL-3.0-only