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

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Sat Jun 22 16:00:50 UTC 2019


    Date: Saturday, June 22, 2019 @ 16:00:49
  Author: bpiotrowski
Revision: 356776

archrelease: copy trunk to extra-x86_64

Added:
  flatpak/repos/extra-x86_64/PKGBUILD
    (from rev 356775, flatpak/trunk/PKGBUILD)
  flatpak/repos/extra-x86_64/flatpak-bindir.sh
    (from rev 356775, flatpak/trunk/flatpak-bindir.sh)
  flatpak/repos/extra-x86_64/python3.diff
    (from rev 356775, flatpak/trunk/python3.diff)
Deleted:
  flatpak/repos/extra-x86_64/PKGBUILD
  flatpak/repos/extra-x86_64/flatpak-bindir.sh
  flatpak/repos/extra-x86_64/python3.diff

-------------------+
 PKGBUILD          |  189 +++++++++++++++++++++++++---------------------------
 flatpak-bindir.sh |   14 +--
 python3.diff      |   64 ++++++++---------
 3 files changed, 133 insertions(+), 134 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-22 16:00:43 UTC (rev 356775)
+++ PKGBUILD	2019-06-22 16:00:49 UTC (rev 356776)
@@ -1,95 +0,0 @@
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=flatpak
-pkgver=1.4.1
-pkgrel=1
-pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)"
-url="https://flatpak.org"
-arch=(x86_64)
-license=(LGPL2.1)
-depends=(dbus systemd glib2 libsoup polkit libxau ostree json-glib libseccomp libarchive
-         python bubblewrap appstream-glib xdg-dbus-proxy)
-makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto)
-checkdepends=(valgrind)
-_commit=663b5cd37036e59ec8b0447df644d385984f1d06  # tags/1.4.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"
-        https://dl.flathub.org/repo/flathub.flatpakrepo
-        python3.diff
-        flatpak-bindir.sh)
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a'
-            '4b2e70d10402e179a1fdcfc367a8be128e2ceaafb8b16a737e14c16596417cc5'
-            'cf20e4831bceaaee74e9298b4ad7c4d2d51085d43f62d1c6a2d2977d2f421e00')
-
-prepare() {
-  cd $pkgname
-
-  patch -Np1 -i ../python3.diff
-
-  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-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
-  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"
-
-  echo 'u flatpak - "Flatpak system helper"' |
-    install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/flatpak.conf"
-
-  # 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 356775, flatpak/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-06-22 16:00:49 UTC (rev 356776)
@@ -0,0 +1,94 @@
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=flatpak
+pkgver=1.4.1
+pkgrel=2
+pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)"
+url="https://flatpak.org"
+arch=(x86_64)
+license=(LGPL2.1)
+depends=(dbus systemd glib2 libsoup polkit libxau ostree json-glib libseccomp libarchive
+         python bubblewrap appstream-glib xdg-dbus-proxy)
+makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto)
+checkdepends=(valgrind)
+_commit=663b5cd37036e59ec8b0447df644d385984f1d06  # tags/1.4.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"
+        https://dl.flathub.org/repo/flathub.flatpakrepo
+        python3.diff
+        flatpak-bindir.sh)
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a'
+            '4b2e70d10402e179a1fdcfc367a8be128e2ceaafb8b16a737e14c16596417cc5'
+            'cf20e4831bceaaee74e9298b4ad7c4d2d51085d43f62d1c6a2d2977d2f421e00')
+
+prepare() {
+  cd $pkgname
+
+  patch -Np1 -i ../python3.diff
+
+  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
+  # Xattr tests fail on tmpfs
+  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"
+
+  echo 'u flatpak - "Flatpak system helper"' |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/flatpak.conf"
+
+  # 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	2019-06-22 16:00:43 UTC (rev 356775)
+++ flatpak-bindir.sh	2019-06-22 16:00:49 UTC (rev 356776)
@@ -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 356775, flatpak/trunk/flatpak-bindir.sh)
===================================================================
--- flatpak-bindir.sh	                        (rev 0)
+++ flatpak-bindir.sh	2019-06-22 16:00:49 UTC (rev 356776)
@@ -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

Deleted: python3.diff
===================================================================
--- python3.diff	2019-06-22 16:00:43 UTC (rev 356775)
+++ python3.diff	2019-06-22 16:00:49 UTC (rev 356776)
@@ -1,32 +0,0 @@
-diff --git i/tests/test-webserver.sh w/tests/test-webserver.sh
-index 6d10b011..52128884 100755
---- i/tests/test-webserver.sh
-+++ w/tests/test-webserver.sh
-@@ -3,25 +3,25 @@
- set -euo pipefail
- 
- dir=$1
--cmd=${2:-python -m SimpleHTTPServer 0}
-+cmd=${2:-python -m http.server 0}
- test_tmpdir=$(pwd)
- 
- [ "$dir" != "" ] && cd ${dir}
- echo "Running web server: PYTHONUNBUFFERED=1 setsid $cmd" >&2
- touch ${test_tmpdir}/httpd-output
- env PYTHONUNBUFFERED=1 setsid $cmd >${test_tmpdir}/httpd-output &
- child_pid=$!
- echo "Web server pid: $child_pid" >&2
- 
- for x in $(seq 300); do
-     echo "Waiting for web server ($x/300)..." >&2
-     # Snapshot the output
-     cp ${test_tmpdir}/httpd-output{,.tmp}
-     sed -ne 's/^/# httpd-output.tmp: /' < ${test_tmpdir}/httpd-output.tmp >&2
-     echo >&2
-     # If it's non-empty, see whether it matches our regexp
-     if test -s ${test_tmpdir}/httpd-output.tmp; then
--        sed -e 's,Serving HTTP on 0.0.0.0 port \([0-9]*\) \.\.\.,\1,' < ${test_tmpdir}/httpd-output.tmp > ${test_tmpdir}/httpd-port
-+        sed -e 's,Serving HTTP on 0.0.0.0 port \([0-9]*\) .*,\1,' < ${test_tmpdir}/httpd-output.tmp > ${test_tmpdir}/httpd-port
-         if ! cmp ${test_tmpdir}/httpd-output.tmp ${test_tmpdir}/httpd-port 1>/dev/null; then
-             # If so, we've successfully extracted the port
-             break

Copied: flatpak/repos/extra-x86_64/python3.diff (from rev 356775, flatpak/trunk/python3.diff)
===================================================================
--- python3.diff	                        (rev 0)
+++ python3.diff	2019-06-22 16:00:49 UTC (rev 356776)
@@ -0,0 +1,32 @@
+diff --git i/tests/test-webserver.sh w/tests/test-webserver.sh
+index 6d10b011..52128884 100755
+--- i/tests/test-webserver.sh
++++ w/tests/test-webserver.sh
+@@ -3,25 +3,25 @@
+ set -euo pipefail
+ 
+ dir=$1
+-cmd=${2:-python -m SimpleHTTPServer 0}
++cmd=${2:-python -m http.server 0}
+ test_tmpdir=$(pwd)
+ 
+ [ "$dir" != "" ] && cd ${dir}
+ echo "Running web server: PYTHONUNBUFFERED=1 setsid $cmd" >&2
+ touch ${test_tmpdir}/httpd-output
+ env PYTHONUNBUFFERED=1 setsid $cmd >${test_tmpdir}/httpd-output &
+ child_pid=$!
+ echo "Web server pid: $child_pid" >&2
+ 
+ for x in $(seq 300); do
+     echo "Waiting for web server ($x/300)..." >&2
+     # Snapshot the output
+     cp ${test_tmpdir}/httpd-output{,.tmp}
+     sed -ne 's/^/# httpd-output.tmp: /' < ${test_tmpdir}/httpd-output.tmp >&2
+     echo >&2
+     # If it's non-empty, see whether it matches our regexp
+     if test -s ${test_tmpdir}/httpd-output.tmp; then
+-        sed -e 's,Serving HTTP on 0.0.0.0 port \([0-9]*\) \.\.\.,\1,' < ${test_tmpdir}/httpd-output.tmp > ${test_tmpdir}/httpd-port
++        sed -e 's,Serving HTTP on 0.0.0.0 port \([0-9]*\) .*,\1,' < ${test_tmpdir}/httpd-output.tmp > ${test_tmpdir}/httpd-port
+         if ! cmp ${test_tmpdir}/httpd-output.tmp ${test_tmpdir}/httpd-port 1>/dev/null; then
+             # If so, we've successfully extracted the port
+             break


More information about the arch-commits mailing list