[arch-commits] Commit in flatpak/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Saturday, December 16, 2017 @ 22:04:46
  Author: heftig
Revision: 312981

archrelease: copy trunk to extra-x86_64

Added:
  flatpak/repos/extra-x86_64/PKGBUILD
    (from rev 312980, flatpak/trunk/PKGBUILD)
Deleted:
  flatpak/repos/extra-x86_64/PKGBUILD
  flatpak/repos/extra-x86_64/flatpak.install

-----------------+
 PKGBUILD        |  165 ++++++++++++++++++++++++++++--------------------------
 flatpak.install |   11 ---
 2 files changed, 86 insertions(+), 90 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-16 22:04:13 UTC (rev 312980)
+++ PKGBUILD	2017-12-16 22:04:46 UTC (rev 312981)
@@ -1,79 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=flatpak
-pkgver=0.10.1
-pkgrel=1
-pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)"
-url="http://flatpak.org"
-arch=(x86_64)
-license=(LGPL2.1)
-depends=(dbus systemd glib2 libsoup polkit libxau ostree fuse json-glib libseccomp libarchive
-         python bubblewrap appstream-glib)
-makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto)
-checkdepends=(valgrind)
-install=flatpak.install
-_commit=8fbd442c9d395ca19561c98e20a7451926c440ab  # tags/0.10.1^0
-source=("git+https://github.com/flatpak/flatpak#commit=$_commit"
-        "git+https://github.com/projectatomic/bubblewrap"
-        "git+https://git.gnome.org/browse/libglnx")
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP')
-
-prepare() {
-  cd $pkgname
-
-  git submodule init
-  git config --local submodule.bubblewrap.url "$srcdir/bubblewrap"
-  git config --local submodule.libglnx.url "$srcdir/libglnx"
-  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/$pkgname \
-    --disable-static \
-    --enable-gtk-doc \
-    --enable-p2p \
-    --with-system-bubblewrap \
-    --with-priv-mode=setuid \
-    --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
-  # Xattr tests fail on tmpfs
-  make -k check || :
-}
-
-package() {
-  depends+=(xdg-desktop-portal)
-
-  cd $pkgname
-
-  make DESTDIR="$pkgdir" install
-
-  # 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 312980, flatpak/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-12-16 22:04:46 UTC (rev 312981)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=flatpak
+pkgver=0.10.2
+pkgrel=1
+pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)"
+url="http://flatpak.org"
+arch=(x86_64)
+license=(LGPL2.1)
+depends=(dbus systemd glib2 libsoup polkit libxau ostree fuse json-glib libseccomp libarchive
+         python bubblewrap appstream-glib)
+makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto)
+checkdepends=(valgrind)
+_commit=648f74b324db7df7c29b2c1b96c0482c6689b633  # tags/0.10.2^0
+source=("git+https://github.com/flatpak/flatpak#commit=$_commit"
+        "git+https://github.com/projectatomic/bubblewrap"
+        "git+https://git.gnome.org/browse/libglnx")
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP')
+
+prepare() {
+  cd $pkgname
+
+  git submodule init
+  git config --local submodule.bubblewrap.url "$srcdir/bubblewrap"
+  git config --local submodule.libglnx.url "$srcdir/libglnx"
+  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/$pkgname \
+    --disable-static \
+    --enable-gtk-doc \
+    --enable-p2p \
+    --with-system-bubblewrap \
+    --with-priv-mode=setuid \
+    --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
+  # Xattr tests fail on tmpfs
+  make -k check || :
+}
+
+package() {
+  depends+=(xdg-desktop-portal)
+
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 /dev/stdin "$pkgdir/etc/profile.d/flatpak-bindir.sh" <<END
+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
+END
+
+  # Fixup mode to match polkit
+  install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
+}

Deleted: flatpak.install
===================================================================
--- flatpak.install	2017-12-16 22:04:13 UTC (rev 312980)
+++ flatpak.install	2017-12-16 22:04:46 UTC (rev 312981)
@@ -1,11 +0,0 @@
-post_install() {
-  post_upgrade $1 0
-}
-
-post_upgrade() {
-  if (( $(vercmp $2 0.6.1-3) < 0 )); then
-    # Generate initial /var/lib/flatpak/repo; must be present
-    # before non-root flatpak will try polkit auth
-    flatpak remote-list
-  fi
-}