network/basilisk-src: Updated for version 2018.06.01.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 4 insertions, 96 deletions

diff --git a/network/basilisk-src/basilisk-src.SlackBuild b/network/basilisk-src/basilisk-src.SlackBuild
index e0e3d28f1db34..b3b232cd05598 100644
--- a/network/basilisk-src/basilisk-src.SlackBuild
+++ b/network/basilisk-src/basilisk-src.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=basilisk-src
 SRCNAM=${SRCNAM:-UXP}
-VERSION=${VERSION:-2018.05.15}
+VERSION=${VERSION:-2018.06.01}
 RELEASEVER=${RELEASEVER:-52.9.$VERSION}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -137,10 +137,6 @@ rm -rf $SRCNAM-$VERSION
 tar -xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 
-# This patch fixes a regression in python that causes build failures when building with mach.
-# This patch was integrated upstream, but is not in the current release.
-patch -p1 < $CWD/rb168986.patch
-
 # Set the proper version number, but do not rely on "$BASILISK_VERSION" since doing so will
 # set the version number to whenever a build takes place, rather then when a release was made.
 echo "$RELEASEVER" > browser/config/version.txt
diff --git a/network/basilisk-src/basilisk-src.info b/network/basilisk-src/basilisk-src.info
index 71e4cd6534a9c..583a38d8f8a68 100644
--- a/network/basilisk-src/basilisk-src.info
+++ b/network/basilisk-src/basilisk-src.info
@@ -1,9 +1,9 @@
 PRGNAM="basilisk-src"
-VERSION="2018.05.15"
+VERSION="2018.06.01"
 HOMEPAGE="https://github.com/MoonchildProductions/UXP"
-DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/v2018.05.15/UXP-2018.05.15.tar.gz \
+DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/v2018.06.01/UXP-2018.06.01.tar.gz \
           http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz"
-MD5SUM="823b35096cc678633013efb4c2ab3573 \
+MD5SUM="ac882a92205d9ce213cfca8c8b21b616 \
         f2994d302cf736e7e71974edfa51da3c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/basilisk-src/rb168986.patch b/network/basilisk-src/rb168986.patch
deleted file mode 100644
index b3b087bb5b93f..0000000000000
--- a/network/basilisk-src/rb168986.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
---- a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
-+++ b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
-@@ -284,57 +284,71 @@ class SystemResourceMonitor(object):
-         """
-         if not self._process:
-             self._stopped = True
-             return
- 
-         assert self._running
-         assert not self._stopped
- 
--        self._pipe.send(('terminate',))
-+        try:
-+            self._pipe.send(('terminate',))
-+        except Exception:
-+            pass
-         self._running = False
-         self._stopped = True
- 
-         self.measurements = []
- 
--        done = False
--
-         # The child process will send each data sample over the pipe
-         # as a separate data structure. When it has finished sending
-         # samples, it sends a special "done" message to indicate it
-         # is finished.
--        while self._pipe.poll(1.0):
--            start_time, end_time, io_diff, cpu_diff, cpu_percent, virt_mem, \
--                swap_mem = self._pipe.recv()
-+
-+        # multiprocessing.Pipe is not actually a pipe on at least Linux.  that
-+        # has an effect on the expected outcome of reading from it when the
-+        # other end of the pipe dies, leading to possibly hanging on revc()
-+        # below. So we must poll().
-+        def poll():
-+            try:
-+                return self._pipe.poll(0.1)
-+            except Exception:
-+                # Poll might throw an exception even though there's still
-+                # data to read. That happens when the underlying system call
-+                # returns both POLLERR and POLLIN, but python doesn't tell us
-+                # about it. So assume there is something to read, and we'll
-+                # get an exception when trying to read the data.
-+                return True
-+        while poll():
-+            try:
-+                start_time, end_time, io_diff, cpu_diff, cpu_percent, virt_mem, \
-+                    swap_mem = self._pipe.recv()
-+            except Exception:
-+                # Let's assume we're done here
-+                break
- 
-             # There should be nothing after the "done" message so
-             # terminate.
-             if start_time == 'done':
--                done = True
-                 break
- 
-             io = self._io_type(*io_diff)
-             virt = self._virt_type(*virt_mem)
-             swap = self._swap_type(*swap_mem)
-             cpu_times = [self._cpu_times_type(*v) for v in cpu_diff]
- 
-             self.measurements.append(SystemResourceUsage(start_time, end_time,
-                                                          cpu_times, cpu_percent, io, virt, swap))
- 
-         # We establish a timeout so we don't hang forever if the child
-         # process has crashed.
-         self._process.join(10)
-         if self._process.is_alive():
-             self._process.terminate()
-             self._process.join(10)
--        else:
--            # We should have received a "done" message from the
--            # child indicating it shut down properly. This only
--            # happens if the child shuts down cleanly.
--            assert done
- 
-         if len(self.measurements):
-             self.start_time = self.measurements[0].start
-             self.end_time = self.measurements[-1].end
- 
-     # Methods to record events alongside the monitored data.
- 
-     def record_event(self, name):
-