Date: Saturday, May 15, 2021 @ 22:41:02 Author: heftig Revision: 415577
archrelease: copy trunk to extra-x86_64 Added: flatpak/repos/extra-x86_64/PKGBUILD (from rev 415575, flatpak/trunk/PKGBUILD) flatpak/repos/extra-x86_64/flatpak-bindir.sh (from rev 415575, flatpak/trunk/flatpak-bindir.sh) Deleted: flatpak/repos/extra-x86_64/PKGBUILD flatpak/repos/extra-x86_64/flatpak-bindir.sh -------------------+ PKGBUILD | 174 ++++++++++++++++++++++++++-------------------------- flatpak-bindir.sh | 14 ++-- 2 files changed, 95 insertions(+), 93 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-05-15 22:41:02 UTC (rev 415576) +++ PKGBUILD 2021-05-15 22:41:02 UTC (rev 415577) @@ -1,86 +0,0 @@ -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> - -pkgname=flatpak -pkgver=1.10.2 -pkgrel=1 -pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" -url="https://flatpak.org" -arch=(x86_64) -license=(LGPL2.1) -depends=(dbus glib2 libsoup polkit libxau ostree json-glib libseccomp libarchive - python bubblewrap appstream-glib xdg-dbus-proxy) -makedepends=(intltool systemd gobject-introspection gtk-doc git docbook-xsl xmlto) -checkdepends=(valgrind socat) -_commit=c614eb400ed9f9ec516d74a43e7d63783e3fe1fb -source=("git+https://github.com/flatpak/flatpak#commit=$_commit" - "git+https://gitlab.gnome.org/GNOME/libglnx.git" - "git+https://github.com/projectatomic/bubblewrap" - "git+https://github.com/flatpak/xdg-dbus-proxy" - https://dl.flathub.org/repo/flathub.flatpakrepo - flatpak-bindir.sh) -sha256sums=('SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a' - 'cf20e4831bceaaee74e9298b4ad7c4d2d51085d43f62d1c6a2d2977d2f421e00') - -prepare() { - cd $pkgname - - git submodule init - git config --local submodule.bubblewrap.url "$srcdir/bubblewrap" - git config --local submodule.libglnx.url "$srcdir/libglnx" - git config --local submodule.dbus-proxy.url "$srcdir/xdg-dbus-proxy" - git submodule update - - # https://github.com/flatpak/flatpak/issues/267 - sed -i '/locale\/C\./d' tests/make-test-runtime.sh - - NOCONFIGURE=1 ./autogen.sh -} - -pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' -} - -build() { - cd $pkgname - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib \ - --disable-static \ - --enable-gtk-doc \ - --with-system-bubblewrap \ - --with-system-dbus-proxy \ - --with-dbus-config-dir=/usr/share/dbus-1/system.d - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -check() { - cd $pkgname - make -k check || : -} - -package() { - depends+=(xdg-desktop-portal) - - cd $pkgname - make DESTDIR="$pkgdir" install - rm -rf "$pkgdir/usr/share/selinux" - - install -Dm644 "$srcdir/flatpak-bindir.sh" "$pkgdir/etc/profile.d/flatpak-bindir.sh" - install -Dm644 "$srcdir/flathub.flatpakrepo" "$pkgdir/etc/flatpak/remotes.d/flathub.flatpakrepo" - - # Fixup mode to match polkit - install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d" -} Copied: flatpak/repos/extra-x86_64/PKGBUILD (from rev 415575, flatpak/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-05-15 22:41:02 UTC (rev 415577) @@ -0,0 +1,88 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> + +pkgname=flatpak +pkgver=1.11.1 +pkgrel=1 +pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" +url="https://flatpak.org" +arch=(x86_64) +license=(LGPL) +depends=(dbus glib2 libsoup polkit libxau ostree json-glib libseccomp libarchive + python bubblewrap appstream-glib xdg-dbus-proxy) +makedepends=(intltool systemd gobject-introspection gtk-doc git docbook-xsl xmlto) +checkdepends=(valgrind socat) +_commit=bcdc073041e0c93e15aa108b94cb7a39a79dcdf3 # tags/1.11.1^0 +source=("git+https://github.com/flatpak/flatpak#commit=$_commit" + git+https://gitlab.gnome.org/GNOME/libglnx.git + git+https://github.com/projectatomic/bubblewrap + 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 + flatpak-bindir.sh) +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a' + 'cf20e4831bceaaee74e9298b4ad7c4d2d51085d43f62d1c6a2d2977d2f421e00') + +prepare() { + cd $pkgname + + git submodule init + git config --local submodule.bubblewrap.url "$srcdir/bubblewrap" + git config --local submodule.libglnx.url "$srcdir/libglnx" + git config --local submodule.dbus-proxy.url "$srcdir/xdg-dbus-proxy" + git config --local submodule.variant-schema-compiler.url "$srcdir/variant-schema-compiler" + git submodule update + + # https://github.com/flatpak/flatpak/issues/267 + sed -i '/locale\/C\./d' tests/make-test-runtime.sh + + NOCONFIGURE=1 ./autogen.sh +} + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +build() { + cd $pkgname + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib \ + --disable-static \ + --enable-gtk-doc \ + --with-system-bubblewrap \ + --with-system-dbus-proxy \ + --with-dbus-config-dir=/usr/share/dbus-1/system.d + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +check() { + cd $pkgname + make -k check +} + +package() { + depends+=(xdg-desktop-portal) + + make -C $pkgname DESTDIR="$pkgdir" install + + install -Dt "$pkgdir/etc/profile.d" -m644 flatpak-bindir.sh + install -Dt "$pkgdir/etc/flatpak/remotes.d" flathub.flatpakrepo + + # Fixup mode to match polkit + install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d" +} Deleted: flatpak-bindir.sh =================================================================== --- flatpak-bindir.sh 2021-05-15 22:41:02 UTC (rev 415576) +++ flatpak-bindir.sh 2021-05-15 22:41:02 UTC (rev 415577) @@ -1,7 +0,0 @@ -if [ -d "$HOME" ] && [ -d "$HOME/.local/share/flatpak/exports/bin" ]; then - PATH="$PATH:$HOME/.local/share/flatpak/exports/bin" -fi - -if [ -d /var/lib/flatpak/exports/bin ]; then - PATH="$PATH:/var/lib/flatpak/exports/bin" -fi Copied: flatpak/repos/extra-x86_64/flatpak-bindir.sh (from rev 415575, flatpak/trunk/flatpak-bindir.sh) =================================================================== --- flatpak-bindir.sh (rev 0) +++ flatpak-bindir.sh 2021-05-15 22:41:02 UTC (rev 415577) @@ -0,0 +1,7 @@ +if [ -d "$HOME" ] && [ -d "$HOME/.local/share/flatpak/exports/bin" ]; then + PATH="$PATH:$HOME/.local/share/flatpak/exports/bin" +fi + +if [ -d /var/lib/flatpak/exports/bin ]; then + PATH="$PATH:/var/lib/flatpak/exports/bin" +fi