Hi, …and now with the debdiff attached (thanks Santiago Vila). Cheers, -- Guido
On Wed, Jun 25, 2025 at 01:07:56PM +0200, Guido Günther wrote: > Package: release.debian.org > Severity: normal > X-Debbugs-Cc: [email protected] > Control: affects -1 + src:xdg-desktop-portal-phosh > User: [email protected] > Usertags: unblock > > Please unblock package xdg-desktop-portal-phosh > > [ Reason ] > Fixes a FTBFS (#1107898) > > [ Impact ] > None besides the issue fixed. > > [ Tests ] > The code produced doesn't change, it's a mere > build system fix (adding an additional dependency) > > [ Risks ] > The change is an additional depdency on meson and > has been used upstream for two releases so the risks > should be minimal. > > [ Checklist ] > [x] all changes are documented in the d/changelog > [x] I reviewed all changes and I approve them > [x] attach debdiff against the package in testing > > [ Other info ] > I didn't see the original report and just became aware due to the > phosh-mobile-settings 0.46.0-1 is marked for autoremoval from testing on > 2025-07-30 > mail so sorry for the short notice. > > Cheers, > -- Guido > > unblock xdg-desktop-portal-phosh/0.46.0-2 > > _______________________________________________ > Debian-on-mobile-maintainers mailing list > [email protected] > https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-on-mobile-maintainers >
diff --git a/debian/changelog b/debian/changelog index 8af5a03..e1ecaac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xdg-desktop-portal-phosh (0.46.0-2) unstable; urgency=medium + + * pfs: build: Ensure resources get compiled before the lib + (Closes: #1107898) + * d/gbp.conf: Switch to trixie + + -- Guido Günther <[email protected]> Wed, 25 Jun 2025 12:09:52 +0200 + xdg-desktop-portal-phosh (0.46.0-1) unstable; urgency=medium * New upstream release diff --git a/debian/gbp.conf b/debian/gbp.conf index 1caaaa8..e3d472f 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/latest +debian-branch = debian/trixie debian-tag = debian/%(version)s upstream-branch = upstream/latest upstream-tag=upstream/%(version)s diff --git a/debian/patches/pfs-build-Ensure-resources-get-compiled-before-the-lib.patch b/debian/patches/pfs-build-Ensure-resources-get-compiled-before-the-lib.patch new file mode 100644 index 0000000..955ef1e --- /dev/null +++ b/debian/patches/pfs-build-Ensure-resources-get-compiled-before-the-lib.patch @@ -0,0 +1,45 @@ +From: =?utf-8?q?Guido_G=C3=BCnther?= <[email protected]> +Date: Wed, 25 Jun 2025 12:09:04 +0200 +Subject: pfs: build: Ensure resources get compiled before the lib +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Closes: #1107898 +Signed-off-by: Guido Günther <[email protected]> +--- + subprojects/pfs/src/meson.build | 9 ++++++++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +--- a/subprojects/pfs/src/meson.build ++++ b/subprojects/pfs/src/meson.build +@@ -1,7 +1,12 @@ + pkgdatadir = get_option('prefix') / get_option('datadir') / meson.project_name() + gnome = import('gnome') + +-gnome.compile_resources('pfs', 'pfs.gresource.xml', gresource_bundle: true, install_dir: pkgdatadir) ++compiled_resources = gnome.compile_resources( ++ 'pfs', ++ 'pfs.gresource.xml', ++ gresource_bundle: true, ++ install_dir: pkgdatadir, ++) + + conf = configuration_data() + conf.set_quoted('VERSION', meson.project_version()) +@@ -54,6 +59,7 @@ cargo_static_lib_build = custom_target( + meson.project_build_root() / 'src' / get_option('deb_triplet') / rust_target / 'libpfs.a', + '@OUTPUT@', + ], ++ depends: compiled_resources, + ) + + if get_option('shared-lib') +@@ -92,6 +98,7 @@ if get_option('shared-lib') + 'libpfs-0.so', + '@OUTPUT@', + ], ++ depends: compiled_resources, + ) + + pkg = pkgconfig.generate( diff --git a/debian/patches/series b/debian/patches/series index 86fc84c..a833d59 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ Don-t-override-CARGO_HOME-dir.patch build-Add-rust-triplet-to-path.patch +pfs-build-Ensure-resources-get-compiled-before-the-lib.patch
