@@ -46,9 +46,7 @@ finish-args:
4646 # via a mechanism like DropBox). Users need to load pictures, sound files,
4747 # and videos from arbitrary locations in the filesystem. Users also need to
4848 # be able to export books in various formats to arbitrary locations.
49− - --filesystem=home
5049 - --filesystem=host
51− - --filesystem=xdg-data
5250 # Bloom writes temporary folders and files to /tmp, to open in a browser to
5351 # show the user, such as creating PDFs, ePUBs, or BloomPub ebooks. Use the
5452 # same /tmp as the host, so the host programs can find the files.
@@ -56,6 +54,8 @@ finish-args:
5654 # libGL needs this
5755 - --device=dri
5856command: bloom
57+only-arches:
58+ - x86_64
5959
6060modules:
6161 - name: BloomDesktop
@@ -218,8 +218,8 @@ modules:
218218 - /libpalaso
219219 - /geckofx
220220 # Bloom dependencies
221− # Find updates via FieldWorks.git with a command like:
222− # git log -p -- src/build/getDependencies-Linux.sh
221+ # Find updates via Bloom.git with a command like:
222+ # git log -p -- build/getDependencies-Linux.sh
223223 # Manually apply changes by editing bloom-sources-urls-input.yml.
224224 # Regenerate input sources:
225225 # ./compose-url-sources bloom-sources-urls-input.yml bloom-sources-urls.yml
@@ -515,7 +515,8 @@ modules:
515515 - /share/doc
516516 - /share/ghostscript/*/doc
517517 - /share/ghostscript/*/examples
518− - /share/man# graphicsmagick
518+ - /share/man
519+ # graphicsmagick
519520 - name: GraphicsMagick
520521 sources:
521522 - type: archive
@@ -554,25 +555,13 @@ modules:
554555 install Geckofx-Winforms/bin/Release_Linux/Geckofx-Winforms.dll.config /app/geckofx
555556 install Geckofx-Winforms/bin/Release_Linux/Geckofx-Winforms.pdb /app/geckofx
556557 sources:
557− - type: archive
558− url: https://hg.sr.ht/~hindlemail/geckofx/archive/60.0.54.0.tar.gz
559− sha256: f9e134944998ea48f4b85fb67eafdf3fc32ac1dacc68eae17c3ee3f4186f8813
558+ - type: git
559+ url: https://github.com/StephenMcConnel/Geckofx60.git
560+ commit: a77e5ba72728630ee02b95892d5fd0c219f87c98
560561 - type: patch
561562 path: patches/geckofx/FixesForFlatpak.patch
562563 options:
563564 - --verbose
564− ############################################################################
565− # - name: gtklp
566− # # requires gtk+-2.0, which is too old to be provided
567− # buildsystem: autotools
568− # sources:
569− # - type: archive
570− # archive-type: tar-gzip
571− # url: https://sourceforge.net/projects/gtklp/files/gtklp/1.3.3/gtklp-1.3.3.src.tar.gz/download
572− # sha512: ce6d37fa155857b0e47f9ed28e3b2e5180b650e821e1246d398692625e8aafeedf4869c1c7ba9d41c180856c716989a13ac98ab48cb8c8f9a73e90c4da2c6546
573− ############################################################################
574− # gnome-terminal, terminator, xfce4-terminal, xterm ?
575− ############################################################################
576565 - name: ArtOfReading
577566 sources:
578567 # This .deb contains only PNG image files with a few text files such
@@ -590,48 +579,3 @@ modules:
590579 tar -C /app -x -f "${package}-dir"/data.tar.xz \
591580 --strip-components=2 ./usr
592581 done
593−
594−################################################################################
595−# Leave this section commented out to simplify future work.
596−# - name: local-final-adjustments
597−# # This allows for adding and testing additional files without re-building
598−# # the other modules. For example, experimental changes to libpalaso or
599−# # Bloom could be copied to $BLOOMLIB. Copy with --force,
600−# # since the destination files may be marked as read-only.
601−# buildsystem: simple
602−# build-options:
603−# env:
604−# BLOOMLIB: "/app/lib/bloom-desktop"
605−# build-commands:
606−# - |
607−# set -xueo pipefail
608−# #cp --verbose --force local-palaso-output/SIL.Core.dll $BLOOMLIB
609−# #cp --verbose --force local-palaso-output/SIL.Core.pdb $BLOOMLIB
610−# #cp --verbose --force local-palaso-output/SIL.Core.Desktop.dll $BLOOMLIB
611−# #cp --verbose --force local-palaso-output/SIL.Core.Desktop.pdb $BLOOMLIB
612−# #cp --verbose --force local-palaso-output/SIL.Media.dll $BLOOMLIB
613−# #cp --verbose --force local-palaso-output/SIL.Media.pdb $BLOOMLIB
614−# #cp --verbose --force local-palaso-output/SIL.Windows.Forms.dll $BLOOMLIB
615−# #cp --verbose --force local-palaso-output/SIL.Windows.Forms.pdb $BLOOMLIB
616−# #cp --verbose --force local-palaso-output/SIL.Windows.Forms.GeckoBrowserAdapter.dll $BLOOMLIB
617−# #cp --verbose --force local-palaso-output/SIL.Windows.Forms.GeckoBrowserAdapter.pdb $BLOOMLIB
618−# #cp --verbose --force local-palaso-output/SIL.Windows.Forms.Keyboarding.dll $BLOOMLIB
619−# #cp --verbose --force local-palaso-output/SIL.Windows.Forms.Keyboarding.pdb $BLOOMLIB
620−# #cp --verbose --force local-palaso-output/SIL.Windows.Forms.WritingSystems.dll $BLOOMLIB
621−# #cp --verbose --force local-palaso-output/SIL.Windows.Forms.WritingSystems.pdb $BLOOMLIB
622−# #cp --verbose --force local-palaso-output/SIL.WritingSystems.dll $BLOOMLIB
623−# #cp --verbose --force local-palaso-output/SIL.WritingSystems.pdb $BLOOMLIB
624−# cp --verbose --force local-bloom-output/Bloom.exe $BLOOMLIB
625−# cp --verbose --force local-bloom-output/Bloom.exe.config $BLOOMLIB
626−# cp --verbose --force local-bloom-output/Bloom.pdb $BLOOMLIB
627−# #cp --verbose --force local-geckofx-output/*.* $BLOOMLIB
628−# sources:
629−# #- type: dir
630−# # path: /d/github/palaso/output/Debug/net461
631−# # dest: local-palaso-output
632−# - type: dir
633−# path: /d/github/BloomDesktop/output/Debug
634−# dest: local-bloom-output
635−# #- type: dir
636−# # path: /d/steve/gecko/60/geckofx/Geckofx-Winforms/bin/Debug_Linux
637−# # dest: local-geckofx-output