[arch-commits] Commit in firefox-developer-edition/trunk (2 files)

[Andrew Crerar]

    Date: Tuesday, November 19, 2019 @ 01:17:04
  Author: andrewsc
Revision: 530371

upgpkg: firefox-developer-edition 71.0b10-1

firefox-developer-edition: Updating to 71.0b10, adding patch for py3.8 compat.

Added:
  firefox-developer-edition/trunk/python_38_mozinfo.patch
Modified:
  firefox-developer-edition/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   11 ++++++---
 python_38_mozinfo.patch |   54 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-19 00:50:17 UTC (rev 530370)
+++ PKGBUILD	2019-11-19 01:17:04 UTC (rev 530371)
@@ -2,7 +2,7 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=firefox-developer-edition
-pkgver=71.0b9
+pkgver=71.0b10
 pkgrel=1
 pkgdesc="Developer Edition of the popular Firefox web browser"
 arch=('x86_64')
@@ -12,7 +12,7 @@
          'ttf-font' 'libpulse')
 makedepends=('unzip' 'zip' 'diffutils' 'python2-setuptools' 'yasm' 'mesa' 'imake' 'inetutils'
              'xorg-server-xvfb' 'autoconf2.13' 'rust' 'clang' 'llvm' 'jack' 'gtk2'
-             'python' 'nodejs' 'python2-psutil' 'cbindgen' 'nasm')
+             'python' 'nodejs' 'python2-psutil' 'python-distro' 'cbindgen' 'nasm')
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
@@ -23,11 +23,13 @@
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         firefox-install-dir.patch
         0001-Use-remoting-name-for-GDK-application-names.patch
+        python_38_mozinfo.patch
         "$pkgname".desktop)
-sha512sums=('d559c876f55280291481faee02582265206ceb90201c52f2af0b4ceeda5a7e2b18b39d0d4d99e2f8dd213c3281a5dedc690362da463235c161a8a23180a76e89'
+sha512sums=('0533b7aab0ad4f70198d82dfcf4568dd0ab44344272f0557048af87456d3300a64c8a956837fff308e205d9418576032f8f049d9ecf4bc60ea89f92b5aed95dd'
             'SKIP'
             'b66dbe7f262d036e5a5b895ab5b0dbb03313bca18b0823c001ef2dbaeb1a33169b57db0cf4dfd268499f28913845119902b5d62e8a6a9cc4820eb0ee2f322a1e'
             '40c931b8abbe5880122dbcc93d457e04e9b4f2bc3e0275e9e3e35dd347fe0658f9446c89e99553203be8a8c9ab6f4ca872a7aedc514920c107b9235c04df91dc'
+            '4fb484c6488d2e31f8700b20b8f184e4f670079472eb31c7794c1f5f5c343e2537d1ca88365dacc2802058329100bf373635c51a0df14f174460aa4fd702cd0a'
             'c212158fe76b1e6228adba9214e2881458b81f38564149719dd18b121f962285bf54603a5bea93c27cb09be851b1d70091a2ce2eb5294c9d75f7619e06d549be')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>
 
@@ -51,6 +53,9 @@
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
+  # Attempt to use distro package as platform has been deprecated
+  patch -Np1 -i ../python_38_mozinfo.patch
+
   echo -n "$_google_api_key" > google-api-key
   echo -n "$_mozilla_api_key" > mozilla-api-key
 

Added: python_38_mozinfo.patch
===================================================================
--- python_38_mozinfo.patch	                        (rev 0)
+++ python_38_mozinfo.patch	2019-11-19 01:17:04 UTC (rev 530371)
@@ -0,0 +1,54 @@
+diff -r 05375fb5dd89 testing/mozbase/mozinfo/mozinfo/mozinfo.py
+--- a/testing/mozbase/mozinfo/mozinfo/mozinfo.py	Fri Nov 15 16:21:54 2019 +0000
++++ b/testing/mozbase/mozinfo/mozinfo/mozinfo.py	Fri Nov 15 13:32:36 2019 -0500
+@@ -14,6 +14,7 @@
+ import platform
+ import re
+ import sys
++
+ from .string_version import StringVersion
+ from ctypes.util import find_library
+ 
+@@ -98,25 +99,34 @@
+     info['os'] = 'win'
+     os_version = version = unknown
+ elif system == "Linux":
+-    if hasattr(platform, "linux_distribution"):
+-        (distro, os_version, codename) = platform.linux_distribution()
+-    else:
+-        (distro, os_version, codename) = platform.dist()
++    # Attempt to use distro package to determine Linux distribution first.
++    # Failing that, fall back to use the platform method.
++    # Note that platform.linux_distribution() will be deprecated as of 3.8
++    # and this block will be removed once support for 2.7/3.5 is dropped.
++    try:
++        from distro import linux_distribution
++    except ImportError:
++        from platform import linux_distribution
++
++    output = linux_distribution()
++    (distribution, os_version, codename) = tuple(
++        str(item.title()) for item in output)
++
+     if not processor:
+         processor = machine
+-    version = "%s %s" % (distro, os_version)
++    version = "%s %s" % (distribution, os_version)
+ 
+     # Bug in Python 2's `platform` library:
+     # It will return a triple of empty strings if the distribution is not supported.
+     # It works on Python 3. If we don't have an OS version,
+     # the unit tests fail to run.
+-    if not distro and not os_version and not codename:
+-        distro = 'lfs'
++    if not distribution and not os_version and not codename:
++        distribution = 'lfs'
+         version = release
+         os_version = release
+ 
+     info['os'] = 'linux'
+-    info['linux_distro'] = distro
++    info['linux_distro'] = distribution
+ elif system in ['DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD']:
+     info['os'] = 'bsd'
+     version = os_version = sys.platform