@@ -23,7 +23,7 @@
2323app-id: org.sil.Bloom
2424
2525runtime: org.gnome.Platform
26−runtime-version: "41"
26+runtime-version: "42"
2727sdk: org.gnome.Sdk
2828sdk-extensions:
2929 - org.freedesktop.Sdk.Extension.node16
@@ -54,16 +54,13 @@ finish-args:
5454 # same /tmp as the host, so the host programs can find the files.
5555 - --filesystem=/tmp
5656 # libGL needs this
57− - --device=all
58− # debugging verbosely. I need all the help I can get!
59− - -vv
57+ - --device=dri
6058command: bloom
6159
6260modules:
6361 - name: BloomDesktop
6462 buildsystem: simple
6563 build-options:
66− prepend-path: /app/bin
6764 append-path: /usr/lib/sdk/node16/bin
6865 env:
6966 MONO_PREFIX: "/app"
@@ -168,7 +165,7 @@ modules:
168165 - type: git
169166 dest: BloomDesktop
170167 url: https://github.com/BloomBooks/BloomDesktop.git
171− branch: Version5.2
168+ commit: 75c7f09b17f24ac514994c45b9d1736b37362f32
172169 # Bloom nuget dependencies
173170 # To regenerate bloom-build-sources-nuget.yml:
174171 # ./compose-nuget-sources bloom-build-sources-nuget.yml . ./buildPackages.config
@@ -345,7 +342,6 @@ modules:
345342 sha256: 758274d8bc438f325fc5fc808c0482ab50eb2bdaf02f61747888e190760753de
346343 - name: libgdiplus
347344 build-options:
348− prefix: /app
349345 env:
350346 MONO_PREFIX: /app
351347 config-opts:
@@ -360,6 +356,10 @@ modules:
360356 commit: b9c581ba87da89651d5ec56c5da0960ab739a63a
361357 modules:
362358 - name: giflib
359+ # Note that for some reason, giflib won't build with the autotools buildsystem.
360+ # The build stops with error
361+ # /run/build/giflib/missing: line 81: aclocal-1.15: command not found
362+ # This happens whether or not the perl command is applied to modify configure.ac.
363363 buildsystem: simple
364364 build-commands:
365365 # Skip building documentation
@@ -404,7 +404,7 @@ modules:
404404 url: https://github.com/jedwing/CHMLib
405405 # Latest commit, from 2009-07-03.
406406 commit: 2bef8d063ec7d88a8de6fd9f0513ea42ac0fa21f
407− - type: script
407+ - type: shell
408408 commands:
409409 - autoreconf --install
410410 - name: wxWidgets
@@ -430,17 +430,8 @@ modules:
430430 - type: archive
431431 url: https://ftp.gnu.org/gnu/wget/wget-1.20.3.tar.gz
432432 sha512: e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
433− - name: dbus-glib
434433 # For Gecko.
435− cleanup:
436− - "/share/gtk-doc"
437− - "/include"
438− - "*.a"
439− sources:
440− - type: git
441− url: https://gitlab.freedesktop.org/dbus/dbus-glib.git
442− tag: dbus-glib-0.110
443− commit: ffeb6909967ff79585a7ede85227da94f04ecb01
434+ - shared-modules/dbus-glib/dbus-glib.json
444435 - name: fonts-sil-andika-new-basic
445436 # From https://software.sil.org/andika/download/
446437 buildsystem: simple
@@ -476,7 +467,6 @@ modules:
476467 sources:
477468 - type: git
478469 url: https://github.com/BloomBooks/tidy-html5.git
479− branch: debian
480470 commit: 8efa8feb2046d31f9216e1ef806609c311809dea
481471 - name: lcdf-typetools
482472 # otfinfo (one of the lcdf-typetools)