deleted file mode 100644

@@ -1,72 +0,0 @@

-Description: Remove unused LLVM and Rust build dependencies

- Since the Javascript engine is normally part of Firefox, its build

- system has dependencies on the LLVM and Rust toolchains. This limits

- the number of architectures which mozjs68 can be built on.

- .

- It turns out, however, that neither LLVM nor Rust are used when mozjs68

- is being built and these build dependencies are therefore not necessary.

- .

- This patch removes them and allows mozjs68 to be built on any architecture.

- .

-Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959144

-Forwarded: no

-Last-Update: 2020-04-30

-

-Index: mozjs68-68.6.0/js/moz.configure

-===================================================================

-+++ mozjs68-68.6.0/js/moz.configure

-@@ -18,11 +18,6 @@ def building_js(build_project):

- option(env='JS_STANDALONE', default=building_js,

-        help='Reserved for internal use')

-

--include('../build/moz.configure/rust.configure',

--        when='--enable-compile-environment')

--include('../build/moz.configure/bindgen.configure',

--        when='--enable-compile-environment')

--

- @depends('JS_STANDALONE')

- def js_standalone(value):

-     if value:

-Index: mozjs68-68.6.0/moz.configure

-===================================================================

-+++ mozjs68-68.6.0/moz.configure

-@@ -598,36 +598,6 @@ set_config('MAKENSISU_FLAGS', nsis_flags

-

- check_prog('7Z', ('7z', '7za'), allow_missing=True, when=target_is_windows)

-

--

--@depends(host_c_compiler, c_compiler, bindgen_config_paths)

--def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths):

--    clang = None

--    for compiler in (host_c_compiler, c_compiler):

--        if compiler and compiler.type == 'clang':

--            clang = compiler.compiler

--            break

--        elif compiler and compiler.type == 'clang-cl':

--            clang = os.path.join(os.path.dirname(compiler.compiler), 'clang')

--            break

--

--    if not clang and bindgen_config_paths:

--        clang = bindgen_config_paths.clang_path

--    llvm_objdump = 'llvm-objdump'

--    if clang:

--        out = check_cmd_output(clang, '--print-prog-name=llvm-objdump',

--                               onerror=lambda: None)

--        if out:

--            llvm_objdump = out.rstrip()

--    return (llvm_objdump,)

--

--

--llvm_objdump = check_prog('LLVM_OBJDUMP', llvm_objdump, what='llvm-objdump',

--                          when='--enable-compile-environment',

--                          paths=toolchain_search_path)

--

--add_old_configure_assignment('LLVM_OBJDUMP', llvm_objdump)

--

--

- # Please do not add configure checks from here on.

-

- # Fallthrough to autoconf-based configure

@@ -1,12 +1,15 @@

+diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py

+index 8d5ab8eb30..65c43ff48e 100644

 --- a/python/mozbuild/mozbuild/frontend/emitter.py

 +++ b/python/mozbuild/mozbuild/frontend/emitter.py

-@@ -1195,11 +1195,6 @@ class TreeMetadataEmitter(LoggingMixin):

-                     raise SandboxValidationError('Path specified in LOCAL_INCLUDES '

-                         'is a filename, but a directory is required: %s '

-                         '(resolved to %s)' % (local_include, full_path), context)

+@@ -1239,12 +1239,6 @@ class TreeMetadataEmitter(LoggingMixin):

+                                                  'is a filename, but a directory is required: %s '

+                                                  '(resolved to %s)' % (local_include, full_path),

+                                                  context)

 -            if (full_path == context.config.topsrcdir or

 -                    full_path == context.config.topobjdir):

--                raise SandboxValidationError('Path specified in LOCAL_INCLUDES '

+-                raise SandboxValidationError(

+-                    'Path specified in LOCAL_INCLUDES '

 -                    '(%s) resolves to the topsrcdir or topobjdir (%s), which is '

 -                    'not allowed' % (local_include, full_path), context)

              include_obj = LocalInclude(context, local_include)

@@ -1,26 +1,30 @@

+diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py

+index e8cbd81d41..d45ccee50a 100644

 --- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py

 +++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py

-@@ -1051,24 +1051,6 @@

-

+@@ -1040,26 +1040,6 @@ class TestEmitterBasic(unittest.TestCase):

+ 

          self.assertEqual(local_includes, expected)

-

+ 

 -    def test_local_includes_invalid(self):

 -        """Test that invalid LOCAL_INCLUDES are properly detected."""

 -        reader = self.reader('local_includes-invalid/srcdir')

 -

--        with self.assertRaisesRegexp(

+-        with six.assertRaisesRegex(

+-                self,

 -                SandboxValidationError,

 -                'Path specified in LOCAL_INCLUDES.*resolves to the '

 -                'topsrcdir or topobjdir'):

--            objs = self.read_topsrcdir(reader)

+-            self.read_topsrcdir(reader)

 -

 -        reader = self.reader('local_includes-invalid/objdir')

 -

--        with self.assertRaisesRegexp(

+-        with six.assertRaisesRegex(

+-                self,

 -                SandboxValidationError,

 -                'Path specified in LOCAL_INCLUDES.*resolves to the '

 -                'topsrcdir or topobjdir'):

--            objs = self.read_topsrcdir(reader)

+-            self.read_topsrcdir(reader)

 -

      def test_local_includes_file(self):

          """Test that a filename can't be used in LOCAL_INCLUDES."""

@@ -1,31 +1,32 @@

 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

-%global	major 68

+%global	major 78

 Summary:       Mozilla's JavaScript engine.

 Name:          mozjs

-Version:       68.11.0

-Release:       2%{?dist}

+Version:       78.3.1

+Release:       1%{?dist}

 Group:         Applications/System

 Vendor:        VMware, Inc.

 License:       GPLv2+ or LGPLv2+ or MPL-2.0

 URL:           https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey

 Source0:       https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz

-%define sha1   firefox-%{version}=445acbf7b7b8f75374ee6347bb6f45748511bcf9

+%define sha1   firefox-%{version}=b60bcb10184a682380832c0f558c89cfa25d3dbf

 Patch0:        emitter.patch

 Patch1:        emitter_test.patch

 # Build fixes

 Patch2:        init_patch.patch

 Patch3:        spidermonkey_checks_disable.patch

-Patch4:        Remove-unused-LLVM-and-Rust-build-dependencies.patch

 Distribution:  Photon

-BuildArch:     aarch64

 BuildRequires: which

 BuildRequires: python3-xml

 BuildRequires: python3-libs

 BuildRequires: python3-devel

 BuildRequires: zlib-devel

 BuildRequires: clang-devel

+BuildRequires: icu-devel

+BuildRequires: rust

 BuildRequires: autoconf = 2.13

+Requires:      icu

 Requires:      python3

 Requires:      python3-libs

 Obsoletes:     mozjs60

@@ -49,15 +50,12 @@ This contains development tools and libraries for SpiderMonkey.

 %patch1 -p1

 %patch2 -p1

 %patch3 -p1

-%patch4 -p1

 rm -rf modules/zlib

-rm -rf security

 %build

 cd js/src

-sh configure \

-    --prefix=%{_prefix} \

-    --without-system-icu \

+%configure \

+    --with-system-icu \

     --enable-readline \

     --disable-jemalloc \

     --disable-tests \

@@ -92,6 +90,8 @@ find %{buildroot} -name '*.la' -delete

 %{_libdir}/pkgconfig/mozjs-%{major}.pc

 %changelog

+*   Mon Oct 05 2020 Ankit Jain <ankitja@vmware.com> 78.3.1-1

+-   Updated to 78.3.1

 *   Tue Aug 25 2020 Ankit Jain <ankitja@vmware.com> 68.11.0-2

 -   Removed autoconf213 dependency and obsoletes js

 *   Sat Oct 26 2019 Ankit Jain <ankitja@vmware.com> 68.11.0-1

@@ -1,21 +1,20 @@

 Summary:       A toolkit for defining and handling authorizations.

 Name:          polkit

-Version:       0.117

-Release:       2%{?dist}

+Version:       0.118

+Release:       1%{?dist}

 Group:         Applications/System

 Vendor:        VMware, Inc.

 License:       LGPLv2+

 URL:           https://www.freedesktop.org/software/polkit/docs/latest/polkit.8.html

 Source0:       https://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz

-%define sha1 polkit=0c375fa621bc9f74f2972e00fb517a408f419adf

+%define sha1 polkit=1c53d0ccacc6e6afd49ba14cb39d2514b943933d

 Distribution:  Photon

-BuildArch:      aarch64

 BuildRequires: autoconf

 BuildRequires: expat-devel

 BuildRequires: glib-devel

 BuildRequires: gobject-introspection

 BuildRequires: intltool >= 0.40.0

-BuildRequires: mozjs-devel = 68.11.0

+BuildRequires: mozjs-devel = 78.3.1

 BuildRequires: Linux-PAM-devel

 BuildRequires: systemd-devel

 Requires:      mozjs

@@ -111,6 +110,8 @@ fi

 %{_libdir}/pkgconfig/*.pc

 %changelog

+*   Wed Sep 09 2020 Gerrit Photon <photon-checkins@vmware.com> 0.118-1

+-   Automatic Version Bump

 *   Tue Aug 25 2020 Ankit Jain <ankitja@vmware.com> 0.117-2

 -   This version of polkit build requires specific mozjs version

 *   Thu Aug 13 2020 Ankit Jain <ankitja@vmware.com> 0.117-1

@@ -1,12 +1,11 @@

 Summary:        Commit RPMs to an OSTree repository

 Name:           rpm-ostree

 Version:        2020.5

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        LGPLv2+

 URL:            https://github.com/projectatomic/rpm-ostree

 Vendor:         VMware, Inc.

 Distribution:   Photon

-BuildArch:      aarch64

 Source0:        https://github.com/projectatomic/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz

 %define sha1    rpm-ostree=42f76f192b64adb432abd8b1c2a7897e91fa835b

 Source1:        libglnx-5ef78bb.tar.gz

@@ -34,7 +33,6 @@ BuildRequires:  sqlite-devel

 BuildRequires:  cppunit-devel

 BuildRequires:  polkit-devel

 BuildRequires:  ostree-devel

-BuildRequires:  libgsystem-devel

 BuildRequires:  docbook-xsl

 BuildRequires:  libxslt

 BuildRequires:  gobject-introspection-devel

@@ -67,7 +65,6 @@ Requires:       openssl

 Requires:       ostree

 Requires:       ostree-libs

 Requires:       ostree-grub2

-Requires:       libgsystem

 Requires:       json-glib

 Requires:       libsolv

 Requires:       bubblewrap

@@ -154,6 +151,8 @@ install -p -m 755 -D %{SOURCE5} %{buildroot}%{_bindir}/rpm-ostree-server

 %{_bindir}/rpm-ostree-server/mkostreerepo

 %changelog

+*   Mon Oct 05 2020 Ankit Jain <ankitja@vmware.com> 2020.5-2

+-   Re-enabling ostree

 *   Mon Sep 21 2020 Ankit Jain <ankitja@vmware.com> 2020.5-1

 -   Updated to 2020.5

 *   Tue Sep 08 2020 Ankit Jain <ankitja@vmware.com> 2020.4-2