build/linux: Fix Flatpak building after gexiv2 dep declaration

When we bump some dependency (e.g. Poppler), even the ones which
don't link to it will be rebuild, so 30min is not enough even
with the ORAS caching.

.gitlab-ci.yml

@@ -395,7 +395,8 @@ gimp-debian:
     MESON_DIST: 0
   before_script:
     - export GIMP_PREFIX="${CI_PROJECT_DIR}/_install"
-  timeout: 30m
+  #30min is enough only if no module was updated/rebuilt, we need more time in case of module bumps
+  timeout: 90m
 
 deps-flatpak:
   extends: .flatpak
@@ -541,8 +542,7 @@ gimp-snap:
     PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true'
   before_script:
     - if (-not $env:MSYSTEM_PREFIX) { $env:MSYSTEM_PREFIX = if ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'ARM64*') { 'clangarm64' } else { 'clang64' }}
-    # FIXME:'gimpenv' have buggy code about Windows paths. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12284
-    - $GIMP_PREFIX = "$PWD\_install-$env:MSYSTEM_PREFIX".Replace('\', '/')
+    - $GIMP_PREFIX = "$PWD\_install-$env:MSYSTEM_PREFIX"
   timeout: 30m
 
 .win_environ: &WIN_ENVIRON

build/linux/flatpak/org.gimp.GIMP-nightly.json

@@ -99,10 +99,8 @@
             ],
             "buildsystem": "meson",
             "config-opts": [
-                "-Dintrospection=false",
                 "-Dpython3=false",
-                "-Dtools=false",
-                "-Dvapi=false"
+                "-Dtools=false"
             ],
             "modules": [
                 {
@@ -245,8 +243,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://poppler.freedesktop.org/poppler-25.09.1.tar.xz",
-                    "sha256": "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658",
+                    "url": "https://poppler.freedesktop.org/poppler-25.10.0.tar.xz",
+                    "sha256": "6b5e9bb64dabb15787a14db1675291c7afaf9387438cc93a4fb7f6aec4ee6fe0",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 3686,

build/windows/2_build-gimp-msys2.ps1

@@ -32,8 +32,7 @@ if ($GITLAB_CI)
 # Prepare env
 if (-not $GIMP_PREFIX)
   {
-    #FIXME:'gimpenv' have buggy code about Windows paths. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12284
-    $GIMP_PREFIX = "$PWD\..\_install".Replace('\', '/')
+    $GIMP_PREFIX = "$PWD\..\_install"
   }
 Invoke-Expression ((Get-Content .gitlab-ci.yml | Select-String 'win_environ\[' -Context 0,7) -replace '> ','' -replace '- ','')
 

meson.build

@@ -128,7 +128,7 @@ fs        = import('fs')
 
 cc        = meson.get_compiler('c')
 cxx       = meson.get_compiler('cpp')
-prefix    = get_option('prefix')
+prefix    = get_option('prefix').replace('\\', '/')
 buildtype = get_option('buildtype')
 exec_ver  = '-' + gimp_app_version