#24 libre/iceweasel: 92.0
Closed 10 months ago by billauger. Opened 10 months ago by grizzlyuser.

@@ -9,10 +9,10 @@ 

   2 files changed, 6 insertions(+), 12 deletions(-)

  

  diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp

- index 3ec33c9b45417..56081f76a0074 100644

+ index 055be3e7a3554..f660bd26e331c 100644

  --- a/toolkit/xre/nsAppRunner.cpp

  +++ b/toolkit/xre/nsAppRunner.cpp

- @@ -4252,11 +4252,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {

+ @@ -4304,11 +4304,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {

     // consistently.

   

     // Set program name to the one defined in application.ini.

libre/iceweasel/9001-FSDG-always-sync-remote-settings-with-local-dump.patch libre/iceweasel/9001-always-sync-remote-settings-with-local-dump.patch
file renamed
+5 -5
@@ -77,9 +77,9 @@ 

  --- a/services/settings/Utils.jsm

  +++ b/services/settings/Utils.jsm

  @@ -60,11 +60,11 @@ var Utils = {

-      );

-      const isXpcshell = env.exists("XPCSHELL_TEST_PROFILE_DIR");

-      return AppConstants.RELEASE_OR_BETA && !Cu.isInAutomation && !isXpcshell

+        !Cu.isInAutomation &&

+        !isXpcshell &&

+        isNotThunderbird

  -      ? "https://firefox.settings.services.mozilla.com/v1"

  +      ? "resource://app/defaults/settings"

         : gServerURL;
@@ -672,8 +672,8 @@ 

       return `${this.bucketName}/${this.collectionName}`;

     }

  @@ -353,6 +368,10 @@ class RemoteSettingsClient extends EventEmitter {

-      try {

-        let hasLocalData = await Utils.hasLocalData(this);

+        let lastModified = await this.db.getLastModified();

+        let hasLocalData = lastModified !== null;

   

  +      if (!(await this._isSynced())) {

  +        throw new MissingSignatureError(this.identifier);

libre/iceweasel/9002-FSDG-preference-defaults.patch libre/iceweasel/9002-preference-defaults.patch
file renamed
+4 -11
@@ -20,8 +20,8 @@ 

  default for now.

  ---

   modules/libpref/init/StaticPrefList.yaml | 2 +-

-  modules/libpref/init/all.js              | 4 ++--

-  2 files changed, 3 insertions(+), 3 deletions(-)

+  modules/libpref/init/all.js              | 2 +-

+  2 files changed, 2 insertions(+), 2 deletions(-)

  

  diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml

  index f9befc42b4..2d8f509a1a 100644
@@ -37,10 +37,10 @@ 

   

   # Time, in milliseconds, to wait for the location provider to spin up.

  diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js

- index c7cde8917c..26b724350f 100644

+ index 6143558398..a393c4afcd 100644

  --- a/modules/libpref/init/all.js

  +++ b/modules/libpref/init/all.js

- @@ -3791,13 +3791,13 @@ pref("network.psl.onUpdate_notify", false);

+ @@ -3706,7 +3706,7 @@ pref("network.psl.onUpdate_notify", false);

   // All the Geolocation preferences are here.

   //

   #ifndef EARLY_BETA_OR_EARLIER
@@ -49,13 +49,6 @@ 

   #else

     // Use MLS on Nightly and early Beta.

     pref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");

-    // On Nightly and early Beta, make duplicate location services requests

-    // to google so we can compare results.

- -  pref("geo.provider.network.compare.url", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%");

- +  pref("geo.provider.network.compare.url", "");

-  #endif

-  

-  // Timeout to wait before sending the location request.

  -- 

  2.31.1

  

libre/iceweasel/9003-FSDG-misc.patch libre/iceweasel/9003-misc-libre.patch
file renamed
file was moved with no change to the file
file modified
+24 -29
@@ -47,10 +47,10 @@ 

  

  pkgname=iceweasel

  epoch=1

- pkgver=90.0

+ pkgver=92.0

  pkgrel=1

  pkgrel+=.parabola1

- _brandingver=87.0-1

+ _brandingver=91.0-1

  pkgdesc="Standalone web browser derived from Mozilla Firefox"

  arch=(x86_64)

  arch+=(i686 armv7h)
@@ -61,12 +61,7 @@ 

               autoconf2.13 rust clang llvm jack nodejs cbindgen nasm

               python-setuptools python-psutil python-zstandard lld dump_syms)

  makedepends+=(quilt libxslt imagemagick git jq python-jsonschema)

- if   [[ "${CARCH}" == 'i686' ]]

- then makedepends=(${makedepends[*]/llvm/llvm10})   # FIXME: i686 configure fails with LLVM11

-      makedepends=(${makedepends[*]/clang/clang10}) #        rustup: error while loading shared libraries: libLLVM-10.so

- #      makedepends=(${makedepends[*]/rust/rust=1:1.49.0})

- #      makedepends=(${makedepends[*]/gcc/gcc10})

- fi

+ makedepends_i686=(gcc10)

  optdepends=('networkmanager: Location detection via available WiFi networks'

              'libnotify: Notification integration'

              'pulseaudio: Audio support'
@@ -79,26 +74,26 @@ 

          0001-Use-remoting-name-for-GDK-application-names.patch

          $pkgname.desktop)

  source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig}

-          9001-always-sync-remote-settings-with-local-dump.patch

-          9002-preference-defaults.patch

-          9003-misc-libre.patch

+          9001-FSDG-always-sync-remote-settings-with-local-dump.patch

+          9002-FSDG-preference-defaults.patch

+          9003-FSDG-misc.patch

           process-json-files.py

           vendor.js.in)

  source_armv7h=(arm.patch

                 build-arm-libopus.patch)

  source_i686=('avoid-libxul-OOM-python-check.patch'

               'rust-static-disable-network-test-on-static-libraries.patch')

- sha256sums=('43a943e7d7660c6d7f5b41c95b344b7fd6a4a88ad0bb45dbd844b372ea60d58b'

+ sha256sums=('299a472373021cc9194449c9f4bb962d5f74ef05e8af0448c589761ea34fbc84'

              'SKIP'

-             '7e7435e8171426e87a84cecf9eb017cb969c9c85d973feb78c1e05771972b6e9'

+             'd7c7a65c4b7ec9ea40df129724ffb369d3f775b0514e3c267c52eec6d284b5e6'

              '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')

- sha256sums+=('e0a0c7434a057dffdce49bb3e5f53fa190aef24f2666cdc50262170df8fec94f'

+ sha256sums+=('b3cf2d984a979a1daf997efaa46358c601a7b3e957cbc21f4155ea0a72def8e5'

               'SKIP'

-              '798d5d167ff4c8030aebd9dbc931df80c34f08a6aed718b878b064e47e4b4f16'

-              'f6114bfe02716442658874e80e553d1cd5fadf4626b461fb94cfb2623cd34b7b'

+              '6ebbf18792cb57067f500fd4575c341d4708c5c0a232d676471f87dfa590621b'

+              'afeaeb6e9a6af901b57e25d85014e5c792efe4ff9dabb58663377f487b9d2887'

               '39e3a5e1ad137e21f842a44d7e3bd24050292d2b41fe59b4e7c7dfed52a195dd'

-              '90e710662f06c619de8752b088ce56bf3779f24168387b1c18e733391bedd143'

-              '4e4ef3f5643da6a23b05de9266c1b2c5310483638b23670944374e12aa446a35')

+              '9386f1c50506cd20ab6d212335d5e4417faeb2aea371dd46f2d107d171e80b83'

+              'c93ce98e1cb64033079343ff1f3037fab6a3bc6d3eb5bc14c5edb70e2d45965d')

  sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353'

                   '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041')

  sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
@@ -230,11 +225,11 @@ 

  ac_add_options --enable-linker=bfd

  ac_add_options --disable-lto

  ac_add_options --disable-rust-simd

- export CC=gcc

- export CXX=g++

- export AR=gcc-ar

- export NM=gcc-nm

- export RANLIB=gcc-ranlib

+ export CC=gcc-10

+ export CXX=g++-10

+ export AR=gcc-ar-10

+ export NM=gcc-nm-10

+ export RANLIB=gcc-ranlib-10

  END

  

        # readelf: Error: Unable to seek to 0x801db328 for section headers
@@ -356,8 +351,8 @@ 

    rm testing/mozbase/mozproxy/tests/files/mitm5-linux-firefox-amazon.zip

  

    # Disable/neutralize Remote Settings (as best we can)

-   echo "applying 9001-always-sync-remote-settings-with-local-dump.patch"

-   patch -Np1 --no-backup-if-mismatch -i ../9001-always-sync-remote-settings-with-local-dump.patch

+   echo "applying 9001-FSDG-always-sync-remote-settings-with-local-dump.patch"

+   patch -Np1 --no-backup-if-mismatch -i ../9001-FSDG-always-sync-remote-settings-with-local-dump.patch

  

    # Verify Remote Settings patching

    local settings_server='firefox.settings.services.mozilla.com'
@@ -372,12 +367,12 @@ 

  

    python ../process-json-files.py "${srcdir}"/firefox-${pkgver} "${brandingsrcdir}"

  

-   echo "applying 9002-preference-defaults.patch"

-   patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9002-preference-defaults.patch

+   echo "applying 9002-FSDG-preference-defaults.patch"

+   patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9002-FSDG-preference-defaults.patch

  

    # Remove remaining non-free bits

-   echo "applying 9003-misc-libre.patch"

-   patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9003-misc-libre.patch

+   echo "applying 9003-FSDG-misc.patch"

+   patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9003-FSDG-misc.patch

  }

  

  build() {

@@ -75,6 +75,8 @@ 

      @classmethod

      def process_raw(cls, unwrapped_jsons, parsed_schema):

          timestamps, result = [], []

+         last_modified_key_name = 'last_modified'

+ 

          for collection in unwrapped_jsons:

              should_modify_collection = cls.should_modify_collection(collection)

              for record in collection.content:
@@ -91,13 +93,14 @@ 

                          while timestamp in timestamps:

                              timestamp += 1

                          timestamps.append(timestamp)

-                         record['last_modified'] = timestamp

+                         record[last_modified_key_name] = timestamp

  

                  if parsed_schema is not None:

                      validate(record, schema=parsed_schema)

  

                  result.append(record)

  

+         result.sort(key=lambda record: record[last_modified_key_name], reverse=True)

          cls.OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True)

  

          return File(cls.OUTPUT_PATH, result)