@@ -54,12 +54,12 @@ finish-args:
5454 # libGL needs this
5555 - --device=dri
5656command: bloom
57−only-arches:
58− - x86_64
5957
6058modules:
6159 - name: BloomDesktop
6260 buildsystem: simple
61+ only-arches:
62+ - x86_64
6363 build-options:
6464 append-path: /usr/lib/sdk/node16/bin
6565 env:
@@ -213,10 +213,7 @@ modules:
213213 cp --verbose --force /app/geckofx/Geckofx-Winforms.dll "${NUGET_DEST}"/Geckofx60.64.Linux.60.0.51/lib/net40/
214214 cp --verbose --force /app/geckofx/Geckofx-Winforms.dll.config "${NUGET_DEST}"/Geckofx60.64.Linux.60.0.51/lib/net40/
215215 cp --verbose --force /app/geckofx/Geckofx-Winforms.pdb "${NUGET_DEST}"/Geckofx60.64.Linux.60.0.51/lib/net40/
216− cleanup:
217− # the leading /app is assumed
218− - /libpalaso
219− - /geckofx
216+ rm -rf /app/libpalaso /app/geckofx
220217 # Bloom dependencies
221218 # Find updates via Bloom.git with a command like:
222219 # git log -p -- build/getDependencies-Linux.sh
@@ -235,22 +232,19 @@ modules:
235232 - bloom-sources-browser-node.json
236233 - type: patch
237234 path: patches/BloomDesktop/BuildFileFixesForFlatpak.patch
238− options:
239− - --verbose
240235 - type: patch
241236 path: patches/BloomDesktop/CodeFixesForFlatpak.patch
242− options:
243− - --verbose
244237 - type: dir
245238 path: ./extra
246239 dest: local-extra
247240 modules:
241+ # python2.7 is needed for mono5-sil
242+ - shared-modules/python2.7/python-2.7.json
248243 - name: mono5-sil
249244 config-opts:
250245 # Build successfully with gcc >9.
251246 - --enable-minimal=aot
252247 cleanup:
253− # Not cleaning away lib/mono/4.5/mcs* because mcs.exe is used in SFM import.
254248 - "/include"
255249 - "*.a"
256250 - "/bin/gtk-demo"
@@ -281,32 +275,6 @@ modules:
281275 - type: patch
282276 # mono uses a hard-coded path to ping. Help it find ping in /app.
283277 path: patches/mono/mono-ping-path.patch
284− modules:
285− - name: python-2.7
286− config-opts:
287− - --enable-shared
288− - --with-system-expat
289− - --with-system-ffi
290− - --enable-unicode=ucs4
291− post-install:
292− - chmod 644 ${FLATPAK_DEST}/lib/libpython2.7.so.1.0
293− cleanup:
294− - "/lib/python2.7/test"
295− - "/lib/python2.7/unittest"
296− - "/lib/python2.7/distutils/tests"
297− - "/lib/python2.7/idlelib/idle_test"
298− - "/lib/python2.7/lib2to3"
299− - "/include"
300− - "*.a"
301− - "*.o"
302− - "/bin/python"
303− - "/lib/debug/source/python-2.7"
304− - "/lib/debug/bin/python2.7*"
305− - "/share/man/man1/python*.1"
306− sources:
307− - type: archive
308− url: https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz
309− sha256: b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43
310278 - name: gtk-sharp3
311279 sources:
312280 - type: git
@@ -340,6 +308,28 @@ modules:
340308 - type: file
341309 url: http://linux.lsdev.sil.org/ubuntu/pool/main/m/mono5-sil-msbuild/mono5-sil-msbuild_15.8+xamarinxplat.2018.07.31.22.43-0xamarin5+ubuntu1804b1_all.deb
342310 sha256: 758274d8bc438f325fc5fc808c0482ab50eb2bdaf02f61747888e190760753de
311+ # giflib is needed for libgdiplus
312+ - name: giflib
313+ # Note that for some reason, giflib won't build with the autotools buildsystem.
314+ # The build stops with error
315+ # /run/build/giflib/missing: line 81: aclocal-1.15: command not found
316+ # This happens whether or not the perl command is applied to modify configure.ac.
317+ buildsystem: simple
318+ build-commands:
319+ # Skip building documentation
320+ - perl -pi -e 's#doc/Makefile##' configure.ac
321+ - ./autogen.sh --prefix=/app
322+ - make
323+ - make install
324+ cleanup:
325+ - "/include"
326+ - "*.a"
327+ sources:
328+ - type: git
329+ url: https://github.com/mirrorer/giflib.git
330+ commit: fa37672085ce4b3d62c51627ab3c8cf2dda8009a
331+ # Note that libgdiplus needs giflib to have GifQuantizeBuffer.
332+ # Some giflibs need adjustment to have that built in.
343333 - name: libgdiplus
344334 build-options:
345335 env:
@@ -354,28 +344,34 @@ modules:
354344 url: https://github.com/sillsdev/libgdiplus
355345 tag: merge/5.6.0
356346 commit: b9c581ba87da89651d5ec56c5da0960ab739a63a
357− modules:
358− - 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.
363− buildsystem: simple
364− build-commands:
365− # Skip building documentation
366− - perl -pi -e 's#doc/Makefile##' configure.ac
367− - ./autogen.sh --prefix=/app
368− - make
369− - make install
370− cleanup:
371− - "/include"
372− - "*.a"
373− sources:
374− - type: git
375− url: https://github.com/mirrorer/giflib.git
376− commit: fa37672085ce4b3d62c51627ab3c8cf2dda8009a
377− # Note that libgdiplus needs giflib to have GifQuantizeBuffer.
378− # Some giflibs need adjustment to have that built in.
347+ # chmlib is needed for xchm
348+ - name: chmlib
349+ cleanup:
350+ - "/include"
351+ - "*.a"
352+ sources:
353+ - type: git
354+ url: https://github.com/jedwing/CHMLib
355+ # Latest commit, from 2009-07-03.
356+ commit: 2bef8d063ec7d88a8de6fd9f0513ea42ac0fa21f
357+ - type: shell
358+ commands:
359+ - autoreconf --install
360+ # wxWidgets is needed for xchm
361+ - name: wxWidgets
362+ cleanup:
363+ - "/include"
364+ - "/lib/wx/include"
365+ - "*.a"
366+ sources:
367+ - type: git
368+ url: https://github.com/wxWidgets/wxWidgets
369+ # v3.0.4 is used in Ubuntu 20.04.
370+ # v3.1.1+ is needed for xchm to write to XDG_CONFIG_HOME.
371+ # However, v3.1.0 appears to introduce a problem rendering the
372+ # chm html. v3.0.5.1 still worked, rendering the html.
373+ tag: v3.0.4
374+ commit: 721d62adde3f8ba8704a9cf56efeb050f652dfbf
379375 - name: xchm
380376 # Help file viewer
381377 cleanup:
@@ -394,33 +390,6 @@ modules:
394390 # ~/.xchm. This won't be needed after upgrading to a newer xchm
395391 # version and wxWidgets v3.1.1+.
396392 path: patches/xchm/no-config.patch
397− modules:
398− - name: chmlib
399− cleanup:
400− - "/include"
401− - "*.a"
402− sources:
403− - type: git
404− url: https://github.com/jedwing/CHMLib
405− # Latest commit, from 2009-07-03.
406− commit: 2bef8d063ec7d88a8de6fd9f0513ea42ac0fa21f
407− - type: shell
408− commands:
409− - autoreconf --install
410− - name: wxWidgets
411− cleanup:
412− - "/include"
413− - "/lib/wx/include"
414− - "*.a"
415− sources:
416− - type: git
417− url: https://github.com/wxWidgets/wxWidgets
418− # v3.0.4 is used in Ubuntu 20.04.
419− # v3.1.1+ is needed for xchm to write to XDG_CONFIG_HOME.
420− # However, v3.1.0 appears to introduce a problem rendering the
421− # chm html. v3.0.5.1 still worked, rendering the html.
422− tag: v3.0.4
423− commit: 721d62adde3f8ba8704a9cf56efeb050f652dfbf
424393 - name: wget
425394 buildsystem: autotools
426395 cleanup:
@@ -442,22 +411,22 @@ modules:
442411 - type: archive
443412 url: https://software.sil.org/downloads/r/andika/AndikaNewBasic-5.500.zip
444413 sha512: 53513c782889fd7e87903cab43f1e419a87cfbc425fd722b621cbdb1b1928584b5ce82ecc56e6f6aa1073ed30268993c46c451dfd8b198b430a54a5cf1eb10a1
414+ # libxmu is needed for wmctrl
415+ - name: libxmu
416+ buildsystem: autotools
417+ cleanup:
418+ - "/include"
419+ - "*.a"
420+ sources:
421+ - type: git
422+ url: https://gitlab.freedesktop.org/xorg/lib/libxmu.git
423+ commit: e9efe2d027b4c46cf6834cc532222f8ad1d1d3c3
445424 - name: wmctrl
446425 buildsystem: autotools
447426 sources:
448427 - type: git
449428 url: https://github.com/Conservatory/wmctrl.git
450429 commit: 7c1dcbaa221a16e8a9765bf2b14d61d640a52304
451− modules:
452− - name: libxmu
453− buildsystem: autotools
454− cleanup:
455− - "/include"
456− - "*.a"
457− sources:
458− - type: git
459− url: https://gitlab.freedesktop.org/xorg/lib/libxmu.git
460− commit: e9efe2d027b4c46cf6834cc532222f8ad1d1d3c3
461430 - name: libtidy-sil
462431 buildsystem: cmake
463432 config-opts:
@@ -523,6 +492,19 @@ modules:
523492 url: https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/1.3.35/GraphicsMagick-1.3.35.tar.bz2
524493 sha256: 7fd0b49903eb35df4ab5ca76139ab3f023f47485a4913fbdcf5c642c6e5f01fc
525494 - python3-aeneas.yml
495+ # msbuild is needed for building libpalaso.yml and geckofx. It's the msbuild tied to the mono6 sdk. (I don't know why it isn't part of that sdk!)
496+ # We already have another msbuild (mono5-sil-msbuild) tied to mono5-sil which is installed in /app for building BloomDesktop.
497+ - name: msbuild
498+ sources:
499+ - type: file
500+ url: https://download.mono-project.com/repo/ubuntu/pool/main/m/msbuild/msbuild_16.10.1+xamarinxplat.2021.05.26.14.00-0xamarin2+ubuntu2004b1_all.deb
501+ sha256: 32f1eba1c2df67bc55920cd45ce3689c32a5c705ae01fd7ead52ca180221b469
502+ buildsystem: simple
503+ build-commands:
504+ - ar x msbuild_*.deb
505+ - tar xf data.tar.xz
506+ - sed -e 's|/usr/|/usr/lib/sdk/mono6/|g' -i usr/bin/msbuild
507+ - cp -a usr/. /usr/lib/sdk/mono6/
526508 - libpalaso.yml
527509 - name: ca-certificates
528510 sources:
@@ -560,8 +542,6 @@ modules:
560542 commit: a77e5ba72728630ee02b95892d5fd0c219f87c98
561543 - type: patch
562544 path: patches/geckofx/FixesForFlatpak.patch
563− options:
564− - --verbose
565545 - name: ArtOfReading
566546 sources:
567547 # This .deb contains only PNG image files with a few text files such
@@ -570,6 +550,8 @@ modules:
570550 url: https://packages.sil.org/ubuntu/pool/main/a/art-of-reading3/art-of-reading3_3.3.1+bionic1_all.deb
571551 sha256: 96d99d60c1838aaac8461e3568185cc287206d2852bd3e11d94eef5d9d6a3f15
572552 buildsystem: simple
553+ only-arches:
554+ - x86_64
573555 build-commands:
574556 # Extract art-of-reading3 images into /app instead of /usr
575557 - |