[arch-commits] Commit in flatpak/trunk (PKGBUILD python3.diff)
Jan Steffens
heftig at archlinux.org
Tue Feb 5 20:31:43 UTC 2019
Date: Tuesday, February 5, 2019 @ 20:31:41
Author: heftig
Revision: 345306
1.2.1-1: with passing tests
Added:
flatpak/trunk/python3.diff
Modified:
flatpak/trunk/PKGBUILD
--------------+
PKGBUILD | 16 +++++++---------
python3.diff | 32 ++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-02-05 20:30:53 UTC (rev 345305)
+++ PKGBUILD 2019-02-05 20:31:41 UTC (rev 345306)
@@ -1,7 +1,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
pkgname=flatpak
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=1
pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)"
url="http://flatpak.org"
@@ -12,16 +12,18 @@
makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto)
checkdepends=(valgrind)
install=flatpak.install
-_commit=7baac10cdbb9096e675377d8adf21a09e2ffd2e8 # tags/1.2.0^0
+_commit=7b78a7d0afa58e8596e7994e2ced3b9419391439 # tags/1.2.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://gitlab.gnome.org/GNOME/libglnx.git"
"git+https://github.com/flatpak/xdg-dbus-proxy"
+ python3.diff
flatpak-bindir.sh flathub.flatpakrepo)
sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
+ '4b2e70d10402e179a1fdcfc367a8be128e2ceaafb8b16a737e14c16596417cc5'
'cf20e4831bceaaee74e9298b4ad7c4d2d51085d43f62d1c6a2d2977d2f421e00'
'3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a')
@@ -28,11 +30,7 @@
prepare() {
cd $pkgname
- # Post-1.1.3 fixes
- git cherry-pick -n 96fde5b29c86635a2bf5ef4e191d0ba63cbfe2c0 \
- 2a25ecf6ee8e6cff6ef56aeccc220b4640feb168 \
- 2f28a940b3488604d04c9b8ed8b81aad6c9e3337 \
- f28e8af9680074e1a6b4e6c90cb337fe2d52f26e
+ patch -Np1 -i ../python3.diff
git submodule init
git config --local submodule.bubblewrap.url "$srcdir/bubblewrap"
@@ -75,7 +73,7 @@
check() {
cd $pkgname
# Xattr tests fail on tmpfs
- make -k check || :
+ make -k check || [[ -n $(find . -maxdepth 0 -fstype tmpfs) ]]
}
package() {
Added: python3.diff
===================================================================
--- python3.diff (rev 0)
+++ python3.diff 2019-02-05 20:31:41 UTC (rev 345306)
@@ -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