Date: Thursday, November 3, 2022 @ 20:01:23 Author: heftig Revision: 460520
1.15.0-1 Modified: flatpak/trunk/PKGBUILD ----------+ PKGBUILD | 70 ++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 28 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-03 19:13:18 UTC (rev 460519) +++ PKGBUILD 2022-11-03 20:01:23 UTC (rev 460520) @@ -2,10 +2,10 @@ # Contributor: Bartłomiej Piotrowski <[email protected]> # Contributor: Jan Alexander Steffens (heftig) <[email protected]> -pkgname=flatpak -_commit=488038eed44c7edf334d1e28085975d96ce2bdcc # tags/1.14.0^0 -pkgver=1.14.0 -pkgrel=3 +pkgbase=flatpak +pkgname=(flatpak flatpak-docs) +pkgver=1.15.0 +pkgrel=1 epoch=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -14,9 +14,10 @@ depends=(dbus glib2 curl polkit libxau ostree json-glib libseccomp libarchive python bubblewrap appstream xdg-dbus-proxy systemd fuse3 libmalcontent) makedepends=(gobject-introspection gtk-doc git docbook-xsl xmlto - python-pyparsing) + python-pyparsing meson) checkdepends=(valgrind socat) options=(debug) +_commit=e084a4f14befc27d08094baba8cc8f714d7e417d # tags/1.15.0^0 source=( "git+https://github.com/flatpak/flatpak#commit=$_commit"; git+https://gitlab.gnome.org/GNOME/libglnx.git @@ -24,6 +25,7 @@ git+https://github.com/flatpak/xdg-dbus-proxy git+https://gitlab.gnome.org/alexl/variant-schema-compiler.git https://dl.flathub.org/repo/flathub.flatpakrepo + 0001-app-meson.build-Add-missing-dep.patch fusermount3.diff flatpak-bindir.sh ) @@ -33,6 +35,7 @@ 'SKIP' 'SKIP' '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a' + '9182f1f9c8bf8ae2bfff31a7c45eb7ffc15fa0dbf08a66c0a88189d1e7d566d9' '23e01650d60222082ffb67a16d3ea033192cc9e6932027cf0ea0c55ea17863af' '1824cb4eb1cc88702cb2b9f1c55b6dfdf20fca5eab83f6e8e532099281328745') @@ -44,6 +47,10 @@ prepare() { cd flatpak + # Fix meson build + # https://github.com/flatpak/flatpak/pull/5165 + git apply -3 ../0001-app-meson.build-Add-missing-dep.patch + # Support fuse3 # https://bugs.archlinux.org/task/75623 git apply -3 ../fusermount3.diff @@ -54,42 +61,39 @@ git submodule set-url dbus-proxy "$srcdir/xdg-dbus-proxy" git submodule set-url variant-schema-compiler "$srcdir/variant-schema-compiler" git -c protocol.file.allow=always submodule update - - NOCONFIGURE=1 ./autogen.sh } build() { - local configure_options=( - --prefix=/usr - --sysconfdir=/etc - --localstatedir=/var - --sbindir=/usr/bin - --libexecdir=/usr/lib - --disable-static - --enable-docbook-docs - --enable-gtk-doc - --with-curl - --with-dbus-config-dir=/usr/share/dbus-1/system.d - --with-system-bubblewrap - --with-system-dbus-proxy + local meson_options=( + -D dbus_config_dir=/usr/share/dbus-1/system.d + -D selinux_module=disabled + -D system_bubblewrap=bwrap + -D system_dbus_proxy=xdg-dbus-proxy ) - cd flatpak - ./configure "${configure_options[@]}" - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make + arch-meson flatpak build "${meson_options[@]}" + meson compile -C build } check() { - cd flatpak - make -k check + meson test -C build --print-errorlogs } -package() { +_pick() { + local p="$1" f d; shift + for f; do + d="$srcdir/$p/${f#$pkgdir/}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done +} + +package_flatpak() { depends+=(xdg-desktop-portal libostree-1.so) provides=(libflatpak.so) - make -C flatpak DESTDIR="$pkgdir" install + meson install -C build --destdir "$pkgdir" install -Dt "$pkgdir/etc/profile.d" -m644 flatpak-bindir.sh install -Dt "$pkgdir/etc/flatpak/remotes.d" flathub.flatpakrepo @@ -96,4 +100,14 @@ # Fixup mode to match polkit install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d" + + _pick docs "$pkgdir"/usr/share/{doc,gtk-doc} } + +package_flatpak-docs() { + pkgdesc+=" (documentation)" + depends=() + mv docs/* "$pkgdir" +} + +# vim:set sw=2 sts=-1 et:
