[gimp/wip/Jehan/debugging-flatpak-bisect: 2/3] build: update OpenEXR in our nightly flatpak manifest.




commit 83c73f5f9f9e55d74ce232e899e74c36f2019ae7
Author: Jehan <jehan girinstud io>
Date:   Thu Jul 22 16:37:15 2021 +0200

    build: update OpenEXR in our nightly flatpak manifest.
    
    Synced from the beta flatpak. The previous manifest rules were building
    fine on Flathub build servers, but not on GNOME CI ones. It resulted in
    a bunch of "ISO C++17" errors when building ilmbase.
    
    Maybe just restricting to C++14 through build fine would have been fine,
    but anyway let's also update the dependencies in the same time as we
    were outdated.
    
    (cherry picked from commit 58fd168f8e0ed3d9a5bdb506ffa4900ed8c73935)

 build/flatpak/org.gimp.GIMP-nightly.json | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/build/flatpak/org.gimp.GIMP-nightly.json b/build/flatpak/org.gimp.GIMP-nightly.json
index 562a74bdc0..8b798d3e6a 100644
--- a/build/flatpak/org.gimp.GIMP-nightly.json
+++ b/build/flatpak/org.gimp.GIMP-nightly.json
@@ -79,11 +79,17 @@
                 {
                     "name": "ilmbase",
                     "config-opts": [ "--disable-static" ],
+                    "build-options": {
+                        "cxxflags": "-std=c++14",
+                        "env": {
+                            "LDFLAGS": "-lpthread"
+                        }
+                    },
                     "sources": [
                         {
                             "type": "archive",
-                            "url": 
"https://download.savannah.nongnu.org/releases/openexr/ilmbase-2.2.1.tar.gz";,
-                            "sha256": "cac206e63be68136ef556c2b555df659f45098c159ce24804e9d5e9e0286609e"
+                            "url": 
"https://github.com/openexr/openexr/releases/download/v2.3.0/ilmbase-2.3.0.tar.gz";,
+                            "sha256": "456978d1a978a5f823c7c675f3f36b0ae14dba36638aeaa3c4b0e784f12a3862"
                         },
                         {
                             "type": "shell",
@@ -94,11 +100,18 @@
             ],
             "config-opts": [ "--disable-static", "--disable-ilmbasetest" ],
             "cleanup": [ "/bin", "/share/doc", "/lib/libIlmImfUtil*" ],
+            "build-options": {
+                "cxxflags": "-std=c++14"
+            },
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.savannah.nongnu.org/releases/openexr/openexr-2.2.1.tar.gz";,
-                    "sha256": "8f9a5af6131583404261931d9a5c83de0a425cb4b8b25ddab2b169fbf113aecd"
+                    "url": 
"https://github.com/openexr/openexr/releases/download/v2.3.0/openexr-2.3.0.tar.gz";,
+                    "sha256": "fd6cb3a87f8c1a233be17b94c74799e6241d50fc5efd4df75c7a4b9cf4e25ea6"
+                },
+                {
+                    "type": "patch",
+                    "path": "patches/openexr-no-docs.patch"
                 },
                 {
                     "type": "shell",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]