Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging / Packages / accountsservice
Commits: 203366fc by Jan Alexander Steffens (heftig) at 2024-06-23T03:30:41+02:00 Get it building again Fixes: https://gitlab.archlinux.org/archlinux/packaging/packages/accountsservice/-/issues/2 - - - - - 3 changed files: - .SRCINFO - + 0001-tests-Drop-check-format-test.patch - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -10,10 +10,10 @@ pkgbase = accountsservice checkdepends = python-gobject makedepends = docbook-xsl makedepends = git + makedepends = glib2-devel makedepends = gobject-introspection makedepends = gtk-doc makedepends = meson - makedepends = python-packaging makedepends = vala makedepends = xmlto depends = gcc-libs @@ -25,8 +25,10 @@ pkgbase = accountsservice depends = systemd source = git+https://gitlab.freedesktop.org/accountsservice/accountsservice.git#tag=23.13.9 source = accounts-daemon-restart.hook + source = 0001-tests-Drop-check-format-test.patch b2sums = d0e2166dc7232a9cc9f6b37b69bc8651486a85b5a98f98a9fdd39958142fec480cfc19e300c7fcc4becf9436282bd8b2f0141523347c748ee074a4bfec0029c4 b2sums = ac1892d814c9efca38daec5b34efdee6289089df515ceeb0f675794263879506e2b59894eef6a85f52570db3bd8e62cdf15a7d980538195c5af7cba016d6a533 + b2sums = b3d35224061a7e2c3654610d7c850b05b7c99cd0516f0a2d3ce1c49d7382b3c4ba2eefe80f50916ab1492cb42b666a6dc29f47b8cad73a9abbb8fa501822abd0 pkgname = accountsservice depends = gcc-libs ===================================== 0001-tests-Drop-check-format-test.patch ===================================== @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <hef...@archlinux.org> +Date: Sun, 23 Jun 2024 03:29:43 +0200 +Subject: [PATCH] tests: Drop check-format test + +It modifies the Git tree and prevents patches from being applied +correctly. + +This really should be part of a pre-commit check, not a Meson test. The +source directory should not be modified. +--- + tests/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index ff9004d6ad75..178a2f09f1aa 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -1,4 +1,3 @@ +-test('check-format', find_program('check-format.sh')) + + libmocklibc = subproject('mocklibc').get_variable('libmocklibc') + ===================================== PKGBUILD ===================================== @@ -20,10 +20,10 @@ depends=( makedepends=( docbook-xsl git + glib2-devel gobject-introspection gtk-doc meson - python-packaging vala xmlto ) @@ -35,12 +35,20 @@ checkdepends=( source=( "git+$url.git#tag=$pkgver" accounts-daemon-restart.hook + 0001-tests-Drop-check-format-test.patch ) b2sums=('d0e2166dc7232a9cc9f6b37b69bc8651486a85b5a98f98a9fdd39958142fec480cfc19e300c7fcc4becf9436282bd8b2f0141523347c748ee074a4bfec0029c4' - 'ac1892d814c9efca38daec5b34efdee6289089df515ceeb0f675794263879506e2b59894eef6a85f52570db3bd8e62cdf15a7d980538195c5af7cba016d6a533') + 'ac1892d814c9efca38daec5b34efdee6289089df515ceeb0f675794263879506e2b59894eef6a85f52570db3bd8e62cdf15a7d980538195c5af7cba016d6a533' + 'b3d35224061a7e2c3654610d7c850b05b7c99cd0516f0a2d3ce1c49d7382b3c4ba2eefe80f50916ab1492cb42b666a6dc29f47b8cad73a9abbb8fa501822abd0') prepare() { cd $pkgname + + # Fix build + # https://gitlab.archlinux.org/archlinux/packaging/packages/accountsservice/-/issues/2 + git cherry-pick -n da65bee12d9118fe1a49c8718d428fe61d232339 \ + ad0365b77b583da06bcd1e8da4c1bed74129895a + git apply -3 ../0001-tests-Drop-check-format-test.patch } build() { View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/accountsservice/-/commit/203366fcdb2681aa8336cd95fe4a124c6d722e1e -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/accountsservice/-/commit/203366fcdb2681aa8336cd95fe4a124c6d722e1e You're receiving this email because of your account on gitlab.archlinux.org.
