[arch-commits] Commit in watchman/trunk (PKGBUILD python3.patch)

[Jelle van der Waa]

    Date: Friday, April 3, 2020 @ 18:54:52
  Author: jelle
Revision: 611004

upgpkg: watchman 4.9.0-4

FS#66057 fix iteritems bug on Python 3.

Added:
  watchman/trunk/python3.patch
Modified:
  watchman/trunk/PKGBUILD

---------------+
 PKGBUILD      |    9 ++++++---
 python3.patch |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-03 18:52:28 UTC (rev 611003)
+++ PKGBUILD	2020-04-03 18:54:52 UTC (rev 611004)
@@ -4,7 +4,7 @@
 
 pkgname=watchman
 pkgver=4.9.0
-pkgrel=3
+pkgrel=4
 pkgdesc="An inotify-based file watching and job triggering command line utility"
 url="https://facebook.github.io/watchman/"
 arch=('i686' 'x86_64')
@@ -11,13 +11,16 @@
 license=('Apache')
 depends=('pcre' 'systemd' 'python')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/facebook/watchman/archive/v$pkgver.tar.gz"
-        "$pkgname.tmpfiles")
+        "$pkgname.tmpfiles" "python3.patch")
 sha256sums=('1f6402dc70b1d056fffc3748f2fdcecff730d8843bb6936de395b3443ce05322'
-            '2b061865e10578a0477b9c7991a00594bc839c846b98896e93c75743dbf6a379')
+            '2b061865e10578a0477b9c7991a00594bc839c846b98896e93c75743dbf6a379'
+            '8aa32e37aef329e0873425d25e370d25b7aa0731f104a645737f1111f64a5a9e')
 
 prepare() {
   cd $pkgname-$pkgver
   ./autogen.sh
+
+  patch -Np1 -i ${srcdir}/python3.patch
 }
 
 build() {

Added: python3.patch
===================================================================
--- python3.patch	                        (rev 0)
+++ python3.patch	2020-04-03 18:54:52 UTC (rev 611004)
@@ -0,0 +1,51 @@
+diff -aur watchman-4.9.0.old/python/bin/watchman-make watchman-4.9.0/python/bin/watchman-make
+--- watchman-4.9.0.old/python/bin/watchman-make	2020-04-03 20:33:59.893048471 +0200
++++ watchman-4.9.0/python/bin/watchman-make	2020-04-03 20:36:21.800479512 +0200
+@@ -209,7 +209,7 @@
+         client.setTimeout(600)
+ 
+         result = client.receive()
+-        for _, t in targets.iteritems():
++        for _, t in targets.items():
+             t.consumeEvents(client)
+ 
+         # Now we wait for events to settle
+@@ -218,7 +218,7 @@
+         while not settled:
+             try:
+                 result = client.receive()
+-                for _, t in targets.iteritems():
++                for _, t in targets.items():
+                     t.consumeEvents(client)
+             except pywatchman.SocketTimeout as ex:
+                 # Our short settle timeout hit, so we're now settled
+@@ -226,7 +226,7 @@
+                 break
+ 
+         # Now we can work on executing the targets
+-        for _, t in targets.iteritems():
++        for _, t in targets.items():
+             t.execute()
+ 
+         # Print this at the bottom of the loop rather than the top
+diff -aur watchman-4.9.0.old/python/bin/watchman-wait watchman-4.9.0/python/bin/watchman-wait
+--- watchman-4.9.0.old/python/bin/watchman-wait	2020-04-03 20:33:59.893048471 +0200
++++ watchman-4.9.0/python/bin/watchman-wait	2020-04-03 20:36:46.413945264 +0200
+@@ -182,7 +182,7 @@
+ try:
+     client.capabilityCheck(
+         required=['term-dirname', 'cmd-watch-project', 'wildmatch'])
+-    for _, sub in subscriptions.iteritems():
++    for _, sub in subscriptions.items():
+         sub.start(client)
+ 
+ except pywatchman.CommandError as ex:
+@@ -200,7 +200,7 @@
+         # the client object will accumulate all subscription results
+         # over time, so we ask it to remove and return those values
+         # for each of the subscriptions
+-        for _, sub in subscriptions.iteritems():
++        for _, sub in subscriptions.items():
+             sub.emit(client)
+ 
+     except pywatchman.SocketTimeout as ex: