Changeset 264165 in webkit

Timestamp:

Jul 9, 2020, 4:43:35 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[Flatpak SDK] Unable to build without Internet connection
​https://bugs.webkit.org/show_bug.cgi?id=213920

Patch by Philippe Normand <​pnormand@igalia.com> on 2020-07-09
Reviewed by Sergio Villar Senin.

Set the flathub ostree repo url explicitely in order to avoid retrieving it from the
flatpakrepo remote file. This is unlikely to change.

• flatpak/flatpakutils.py:

(WebkitFlatpak._get_packages):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• flatpak/flatpakutils.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-07-09  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak SDK] Unable to build without Internet connection
+        https://bugs.webkit.org/show_bug.cgi?id=213920
+
+        Reviewed by Sergio Villar Senin.
+
+        Set the flathub ostree repo url explicitely in order to avoid retrieving it from the
+        flatpakrepo remote file. This is unlikely to change.
+
+        * flatpak/flatpakutils.py:
+        (WebkitFlatpak._get_packages):
+
 2020-07-09  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -977 +977 @@
         # installed for Flatpak 1.2.x to be able to make use of it. Seems like
         # it's not correctly inheriting it from the SDK.
-        self.flathub_repo = self.repos.add(
-            FlatpakRepo("flathub", repo_file="https://dl.flathub.org/repo/flathub.flatpakrepo")
-        )
+        self.flathub_repo = self.repos.add(FlatpakRepo("flathub", url="https://dl.flathub.org/repo/",
+                                                       repo_file="https://dl.flathub.org/repo/flathub.flatpakrepo"))
 
         packages.append(FlatpakPackage("org.freedesktop.Platform.GL.default", "19.08",