431017a · flathub · git.iko.soy

git.iko.soy/flathub

on master help sign in

Response to initial code review (20220730)

431017aStephen McConnel4 years ago

.gitignorenew file+2

compare with master

unifiedsplit

@@ -0,0 +1,2 @@

1+.flatpak-builder

2+build-dir

.gitmodulesnew file+3

@@ -0,0 +1,3 @@

1+[submodule "shared-modules"]

2+ path = shared-modules

3+ url = https://github.com/flathub/shared-modules.git

libpalaso.yml+2−1

@@ -26,6 +26,8 @@ build-commands:

26 export NUGET_PACKAGE=`pwd`/packages

27 echo NUGET_PACKAGE=$NUGET_PACKAGE

28 find . -iname nuget.exe -print

29+ # we need a branch for GitVersion to work

30+ git switch -c bloom5.2

29 echo mono build/nuget.exe sources add -name Downloaded -source `pwd`/nuget-sources

31 echo mono build/nuget.exe sources add -name Downloaded -source `pwd`/nuget-sources

30 mono build/nuget.exe sources add -name Downloaded -source `pwd`/nuget-sources

32 mono build/nuget.exe sources add -name Downloaded -source `pwd`/nuget-sources

31 mono build/nuget.exe sources disable -name nuget.org

33 mono build/nuget.exe sources disable -name nuget.org

@@ -53,7 +55,6 @@ build-commands:

53sources:

55sources:

54 - type: git

56 - type: git

55 url: https://github.com/sillsdev/libpalaso.git

57 url: https://github.com/sillsdev/libpalaso.git

56− branch: Bloom-5.2

57 commit: c4fd324c4024640ba6652e5184d66bf7962672d2

58 commit: c4fd324c4024640ba6652e5184d66bf7962672d2

58 disable-shallow-clone: true

59 disable-shallow-clone: true

59 - type: file

60 - type: file

org.sil.Bloom.yml+9−19

@@ -23,7 +23,7 @@

23app-id: org.sil.Bloom

25runtime: org.gnome.Platform

26−runtime-version: "41"

26+runtime-version: "42"

27sdk: org.gnome.Sdk

28sdk-extensions:

29 - org.freedesktop.Sdk.Extension.node16

@@ -54,16 +54,13 @@ finish-args:

54 # same /tmp as the host, so the host programs can find the files.

55 - --filesystem=/tmp

56 # libGL needs this

57− - --device=all

57+ - --device=dri

58− # debugging verbosely. I need all the help I can get!

59− - -vv

60command: bloom

58command: bloom

62modules:

60modules:

63 - name: BloomDesktop

61 - name: BloomDesktop

64 buildsystem: simple

62 buildsystem: simple

65 build-options:

63 build-options:

66− prepend-path: /app/bin

67 append-path: /usr/lib/sdk/node16/bin

64 append-path: /usr/lib/sdk/node16/bin

68 env:

65 env:

69 MONO_PREFIX: "/app"

66 MONO_PREFIX: "/app"

@@ -168,7 +165,7 @@ modules:

168 - type: git

165 - type: git

169 dest: BloomDesktop

166 dest: BloomDesktop

170 url: https://github.com/BloomBooks/BloomDesktop.git

167 url: https://github.com/BloomBooks/BloomDesktop.git

171− branch: Version5.2

168+ commit: 75c7f09b17f24ac514994c45b9d1736b37362f32

172 # Bloom nuget dependencies

169 # Bloom nuget dependencies

173 # To regenerate bloom-build-sources-nuget.yml:

170 # To regenerate bloom-build-sources-nuget.yml:

174 # ./compose-nuget-sources bloom-build-sources-nuget.yml . ./buildPackages.config

171 # ./compose-nuget-sources bloom-build-sources-nuget.yml . ./buildPackages.config

@@ -345,7 +342,6 @@ modules:

345 sha256: 758274d8bc438f325fc5fc808c0482ab50eb2bdaf02f61747888e190760753de

342 sha256: 758274d8bc438f325fc5fc808c0482ab50eb2bdaf02f61747888e190760753de

346 - name: libgdiplus

343 - name: libgdiplus

347 build-options:

344 build-options:

348− prefix: /app

349 env:

345 env:

350 MONO_PREFIX: /app

346 MONO_PREFIX: /app

351 config-opts:

347 config-opts:

@@ -360,6 +356,10 @@ modules:

360 commit: b9c581ba87da89651d5ec56c5da0960ab739a63a

356 commit: b9c581ba87da89651d5ec56c5da0960ab739a63a

361 modules:

357 modules:

362 - name: giflib

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

@@ -404,7 +404,7 @@ modules:

404 url: https://github.com/jedwing/CHMLib

405 # Latest commit, from 2009-07-03.

406 commit: 2bef8d063ec7d88a8de6fd9f0513ea42ac0fa21f

407− - type: script

407+ - type: shell

408 commands:

409 - autoreconf --install

410 - name: wxWidgets

@@ -430,17 +430,8 @@ modules:

430 - type: archive

431 url: https://ftp.gnu.org/gnu/wget/wget-1.20.3.tar.gz

432 sha512: e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c

433− - name: dbus-glib

434 # For Gecko.

433 # For Gecko.

435− cleanup:

434+ - shared-modules/dbus-glib/dbus-glib.json

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

444 - name: fonts-sil-andika-new-basic

435 - name: fonts-sil-andika-new-basic

445 # From https://software.sil.org/andika/download/

436 # From https://software.sil.org/andika/download/

446 buildsystem: simple

437 buildsystem: simple

@@ -476,7 +467,6 @@ modules:

476 sources:

467 sources:

477 - type: git

468 - type: git

478 url: https://github.com/BloomBooks/tidy-html5.git

469 url: https://github.com/BloomBooks/tidy-html5.git

479− branch: debian

480 commit: 8efa8feb2046d31f9216e1ef806609c311809dea

470 commit: 8efa8feb2046d31f9216e1ef806609c311809dea

481 - name: lcdf-typetools

471 - name: lcdf-typetools

482 # otfinfo (one of the lcdf-typetools)

472 # otfinfo (one of the lcdf-typetools)