From a48a81f17457fefef2dbc21b4c5397cb14863da6 Mon Sep 17 00:00:00 2001 From: Sam Day Date: Wed, 17 Jun 2026 12:49:36 +1000 Subject: [PATCH 1/3] copr: rust-toml-edit0.19 + rust-winnow0.5 --- copr/README.md | 6 + .../rust-toml_edit0.19.spec | 106 +++++++++++++ copr/rust-toml-edit0.19/rust2rpm.toml | 3 + copr/rust-winnow0.5/no-term-transcript.patch | 12 ++ copr/rust-winnow0.5/rust-winnow0.5.spec | 149 ++++++++++++++++++ copr/rust-winnow0.5/rust2rpm.toml | 3 + copr/rust-winnow0.5/winnow-fix-metadata.diff | 137 ++++++++++++++++ 7 files changed, 416 insertions(+) create mode 100644 copr/rust-toml-edit0.19/rust-toml_edit0.19.spec create mode 100644 copr/rust-toml-edit0.19/rust2rpm.toml create mode 100644 copr/rust-winnow0.5/no-term-transcript.patch create mode 100644 copr/rust-winnow0.5/rust-winnow0.5.spec create mode 100644 copr/rust-winnow0.5/rust2rpm.toml create mode 100644 copr/rust-winnow0.5/winnow-fix-metadata.diff diff --git a/copr/README.md b/copr/README.md index 611dc37a..8f6c2171 100644 --- a/copr/README.md +++ b/copr/README.md @@ -3,6 +3,11 @@ Build order: * rust-glib-sys0.18 * rust-gobject-sys0.18 * rust-gio-sys0.18 + * rust-winnow0.5 + * rust-toml-datetime0.6 + * rust-toml-edit0.19 + * rust-toml-edit0.20 + * rust-proc-macro-crate2 * rust-glib-macros0.18 * rust-glib0.18 * rust-pango-sys0.18 @@ -17,6 +22,7 @@ Build order: * rust-pango0.18 * rust-atk * rust-cairo-rs0.18 + * rust-proc-macro-crate1 * rust-gtk3-macros * rust-gdk * rust-gtk diff --git a/copr/rust-toml-edit0.19/rust-toml_edit0.19.spec b/copr/rust-toml-edit0.19/rust-toml_edit0.19.spec new file mode 100644 index 00000000..aa570b08 --- /dev/null +++ b/copr/rust-toml-edit0.19/rust-toml_edit0.19.spec @@ -0,0 +1,106 @@ +# Generated by rust2rpm 25 +# * missing dev-dependencies: snapbox, toml-test-data, toml-test-harness +%bcond_with check +%global debug_package %{nil} + +%global crate toml_edit + +Name: rust-toml_edit0.19 +Version: 0.19.15 +Release: %autorelease +Summary: Yet another format-preserving TOML parser + +License: MIT OR Apache-2.0 +URL: https://crates.io/crates/toml_edit +Source: %{crates_source} + +BuildRequires: cargo-rpm-macros >= 24 + +%global _description %{expand: +Yet another format-preserving TOML parser.} + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages which +use the "%{crate}" crate. + +%files devel +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+perf-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+perf-devel %{_description} + +This package contains library source intended for building other packages which +use the "perf" feature of the "%{crate}" crate. + +%files -n %{name}+perf-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+serde-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+serde-devel %{_description} + +This package contains library source intended for building other packages which +use the "serde" feature of the "%{crate}" crate. + +%files -n %{name}+serde-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+unbounded-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+unbounded-devel %{_description} + +This package contains library source intended for building other packages which +use the "unbounded" feature of the "%{crate}" crate. + +%files -n %{name}+unbounded-devel +%ghost %{crate_instdir}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep + +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +%autochangelog diff --git a/copr/rust-toml-edit0.19/rust2rpm.toml b/copr/rust-toml-edit0.19/rust2rpm.toml new file mode 100644 index 00000000..39c571ea --- /dev/null +++ b/copr/rust-toml-edit0.19/rust2rpm.toml @@ -0,0 +1,3 @@ +[tests] +run = ["none"] +comments = ["missing test-only dependencies in COPR"] diff --git a/copr/rust-winnow0.5/no-term-transcript.patch b/copr/rust-winnow0.5/no-term-transcript.patch new file mode 100644 index 00000000..1c2283d3 --- /dev/null +++ b/copr/rust-winnow0.5/no-term-transcript.patch @@ -0,0 +1,12 @@ +diff -Naur winnow-0.7.13-original/src/combinator/debug/mod.rs winnow-0.7.13/src/combinator/debug/mod.rs +--- winnow-0.7.13-original/src/combinator/debug/mod.rs 2006-07-24 02:21:28.000000000 +0100 ++++ winnow-0.7.13/src/combinator/debug/mod.rs 2025-10-06 10:03:56.377548889 +0100 +@@ -77,6 +77,8 @@ + #[cfg_attr(miri, ignore)] + #[cfg(unix)] + #[cfg(feature = "debug")] ++// Downstream: requires term-transcript crate, not packaged ++#[cfg(any())] + fn example() { + use term_transcript::{test::TestConfig, ShellOptions}; + diff --git a/copr/rust-winnow0.5/rust-winnow0.5.spec b/copr/rust-winnow0.5/rust-winnow0.5.spec new file mode 100644 index 00000000..944149ab --- /dev/null +++ b/copr/rust-winnow0.5/rust-winnow0.5.spec @@ -0,0 +1,149 @@ +# Generated by rust2rpm 27 +%bcond_with check +%global debug_package %{nil} + +%global crate winnow + +Name: rust-winnow0.5 +Version: 0.5.40 +Release: %autorelease +Summary: Byte-oriented, zero-copy, parser combinators library + +License: MIT +URL: https://crates.io/crates/winnow +Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * remove references to benchmark and example binaries from Cargo.toml +# * drop unused, benchmark-only criterion dev-dependency +# * drop dev-dependencies which are only needed for example binaries +# * update anstream dependency from 0.3 to 0.6: +# https://github.com/winnow-rs/winnow/commit/2314765d68fbceb80d8249ec2095a6d4448deb3e +Patch: winnow-fix-metadata.diff +# * Omit a test that would require term-transcript, not packaged +Patch11: no-term-transcript.patch + +BuildRequires: cargo-rpm-macros >= 24 + +%global _description %{expand: +A byte-oriented, zero-copy, parser combinators library.} + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages which +use the "%{crate}" crate. + +%files devel +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+alloc-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+alloc-devel %{_description} + +This package contains library source intended for building other packages which +use the "alloc" feature of the "%{crate}" crate. + +%files -n %{name}+alloc-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+debug-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+debug-devel %{_description} + +This package contains library source intended for building other packages which +use the "debug" feature of the "%{crate}" crate. + +%files -n %{name}+debug-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+simd-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+simd-devel %{_description} + +This package contains library source intended for building other packages which +use the "simd" feature of the "%{crate}" crate. + +%files -n %{name}+simd-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+std-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+std-devel %{_description} + +This package contains library source intended for building other packages which +use the "std" feature of the "%{crate}" crate. + +%files -n %{name}+std-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+unstable-doc-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+unstable-doc-devel %{_description} + +This package contains library source intended for building other packages which +use the "unstable-doc" feature of the "%{crate}" crate. + +%files -n %{name}+unstable-doc-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+unstable-recover-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+unstable-recover-devel %{_description} + +This package contains library source intended for building other packages which +use the "unstable-recover" feature of the "%{crate}" crate. + +%files -n %{name}+unstable-recover-devel +%ghost %{crate_instdir}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep + +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +%autochangelog diff --git a/copr/rust-winnow0.5/rust2rpm.toml b/copr/rust-winnow0.5/rust2rpm.toml new file mode 100644 index 00000000..926a55ff --- /dev/null +++ b/copr/rust-winnow0.5/rust2rpm.toml @@ -0,0 +1,3 @@ +[tests] +run = ["none"] +comments = ["avoid pulling optional debug/test dependency stack into COPR"] diff --git a/copr/rust-winnow0.5/winnow-fix-metadata.diff b/copr/rust-winnow0.5/winnow-fix-metadata.diff new file mode 100644 index 00000000..254295c5 --- /dev/null +++ b/copr/rust-winnow0.5/winnow-fix-metadata.diff @@ -0,0 +1,137 @@ +--- winnow-0.5.40/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ winnow-0.5.40/Cargo.toml 2025-10-06T09:12:18.746767+00:00 +@@ -90,106 +90,8 @@ + replace = "blob/v{{version}}/CHANGELOG.md" + search = 'blob/v.+\..+\..+/CHANGELOG.md' + +-[profile.bench] +-lto = true +-codegen-units = 1 +-debug = 2 +- +-[[example]] +-name = "arithmetic" +-test = true +-required-features = ["alloc"] +- +-[[example]] +-name = "css" +-test = true +-required-features = ["alloc"] +- +-[[example]] +-name = "custom_error" +-test = true +-required-features = ["alloc"] +- +-[[example]] +-name = "http" +-required-features = ["alloc"] +- +-[[example]] +-name = "ini" +-test = true +-required-features = ["std"] +- +-[[example]] +-name = "json" +-test = true +-required-features = ["std"] +- +-[[example]] +-name = "ndjson" +-test = true +-required-features = ["std"] +- +-[[example]] +-name = "json_iterator" +-required-features = ["std"] +- +-[[example]] +-name = "iterator" +- +-[[example]] +-name = "s_expression" +-required-features = ["alloc"] +- +-[[example]] +-name = "string" +-required-features = ["alloc"] +- +-[[bench]] +-name = "arithmetic" +-path = "examples/arithmetic/bench.rs" +-harness = false +-required-features = ["alloc"] +- +-[[bench]] +-name = "contains_token" +-harness = false +- +-[[bench]] +-name = "find_slice" +-harness = false +- +-[[bench]] +-name = "iter" +-harness = false +- +-[[bench]] +-name = "next_slice" +-harness = false +- +-[[bench]] +-name = "number" +-harness = false +- +-[[bench]] +-name = "http" +-path = "examples/http/bench.rs" +-harness = false +-required-features = ["alloc"] +- +-[[bench]] +-name = "ini" +-path = "examples/ini/bench.rs" +-harness = false +-required-features = ["std"] +- +-[[bench]] +-name = "json" +-path = "examples/json/bench.rs" +-harness = false +-required-features = ["std"] +- + [dependencies.anstream] +-version = "0.3.2" ++version = "0.6.15" + optional = true + + [dependencies.anstyle] +@@ -209,12 +111,6 @@ + version = "0.2.6" + optional = true + +-[dev-dependencies.circular] +-version = "0.3.0" +- +-[dev-dependencies.criterion] +-version = "0.5.1" +- + [dev-dependencies.doc-comment] + version = "0.3" + +@@ -229,13 +125,6 @@ + + [dev-dependencies.rustc-hash] + version = "1.1.0" +- +-[dev-dependencies.snapbox] +-version = "0.4.11" +-features = ["examples"] +- +-[dev-dependencies.term-transcript] +-version = "0.2.0" + + [features] + alloc = [] From 39eb13b584e4f7da1b9188ba2981208084c66e25 Mon Sep 17 00:00:00 2001 From: Sam Day Date: Wed, 17 Jun 2026 13:10:10 +1000 Subject: [PATCH 2/3] rpm: fix xtask invocation --- phrog.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phrog.spec b/phrog.spec index b0e7523d..238d47ba 100644 --- a/phrog.spec +++ b/phrog.spec @@ -71,7 +71,7 @@ tar -xf %{SOURCE1} %build %{gettext_sys_env} %cargo_build -%{__cargo} run --frozen --quiet --package xtask -- dist-data greetd-config.toml --greetd-vt 1 --greetd-user greetd +%{__cargo} run --offline --quiet --package xtask -- dist-data greetd-config.toml --greetd-vt 1 --greetd-user greetd %cargo_vendor_manifest %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies From 020ab11f39cedd0402aa66f17bd4866122efd0a5 Mon Sep 17 00:00:00 2001 From: Phrogbot Date: Mon, 27 Apr 2026 10:13:12 +0000 Subject: [PATCH 3/3] release: v0.53.0-rc.8 --- APKBUILD | 2 +- Cargo.lock | 2 +- Cargo.toml | 2 +- debian/changelog | 6 ++++++ phrog.spec | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/APKBUILD b/APKBUILD index 460b53ad..3e56297f 100644 --- a/APKBUILD +++ b/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Sam Day pkgname=greetd-phrog -pkgver=0.53.0_rc7_git +pkgver=0.53.0_rc8_git pkgrel=0 pkgdesc="Mobile device greeter" url=https://github.com/samcday/phrog diff --git a/Cargo.lock b/Cargo.lock index 6e2217b0..4fd5cd7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1239,7 +1239,7 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "phrog" -version = "0.53.0-rc.7" +version = "0.53.0-rc.8" dependencies = [ "anyhow", "async-channel", diff --git a/Cargo.toml b/Cargo.toml index a51c3cb6..8e8f6e3d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "phrog" description = "Mobile-friendly greeter for greetd" -version = "0.53.0-rc.7" +version = "0.53.0-rc.8" edition = "2021" license = "GPL-3.0-only" exclude = ["/demo-video"] diff --git a/debian/changelog b/debian/changelog index 34783e7f..346948d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +phrog (0.53.0~rc8-1) unstable; urgency=medium + + * Release 0.53.0-rc.8 + + -- Phrogbot Mon, 27 Apr 2026 10:13:12 +0000 + phrog (0.53.0~rc7-1) unstable; urgency=medium * Release 0.53.0-rc.7 diff --git a/phrog.spec b/phrog.spec index 238d47ba..ff48c47f 100644 --- a/phrog.spec +++ b/phrog.spec @@ -11,7 +11,7 @@ %global gettext_sys_env export GETTEXT_SYSTEM=1 Name: phrog -Version: 0.53.0_rc7 +Version: 0.53.0_rc8 Release: %autorelease Summary: Mobile-friendly greeter for greetd License: GPL-3.0-only