[arch-commits] Commit in flatpak/trunk (PKGBUILD python3.diff)

[Bartłomiej Piotrowski]

    Date: Thursday, November 28, 2019 @ 06:32:38
  Author: bpiotrowski
Revision: 369863

1.5.1-1

Modified:
  flatpak/trunk/PKGBUILD
Deleted:
  flatpak/trunk/python3.diff

--------------+
 PKGBUILD     |    8 ++------
 python3.diff |   32 --------------------------------
 2 files changed, 2 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-28 06:25:32 UTC (rev 369862)
+++ PKGBUILD	2019-11-28 06:32:38 UTC (rev 369863)
@@ -2,7 +2,7 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=flatpak
-pkgver=1.5.0
+pkgver=1.5.1
 pkgrel=1
 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)"
 url="https://flatpak.org"
@@ -12,13 +12,12 @@
          python bubblewrap appstream-glib xdg-dbus-proxy)
 makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto)
 checkdepends=(valgrind socat)
-_commit=72d7d456e4a16f7f9b22f2bf28b5419ae87692ab
+_commit=44ed9e912d5f956c9828740344f8567e8a0efbd0  # tags/1.5.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'
@@ -25,14 +24,11 @@
             '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"

Deleted: python3.diff
===================================================================
--- python3.diff	2019-11-28 06:25:32 UTC (rev 369862)
+++ python3.diff	2019-11-28 06:32:38 UTC (rev 369863)
@@ -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