Skip to content

Commit

Permalink
flatpak: upgrade runtime to v42
Browse files Browse the repository at this point in the history
- Updated some dependencies.
- Added Zenity, which is no longer in the runtime.
- Includes libpalaso keyboarding fixes, both for the new runtime as
well as for Ubuntu 22.04.
- Remove no longer used permission: talk org.gnome.Shell.

Change-Id: I5a1f80a96a277ab70d691f3cff121e2f0b82a771
  • Loading branch information
marksvc committed Jan 6, 2023
1 parent 54e4da9 commit 7d0cd4e
Show file tree
Hide file tree
Showing 6 changed files with 105 additions and 104 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/flatpak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ jobs:
sudo flatpak remote-add --if-not-exists flathub \
https://flathub.org/repo/flathub.flatpakrepo
sudo flatpak install --noninteractive flathub \
org.gnome.Platform//3.36 \
org.gnome.Sdk//3.36
org.gnome.Platform//42 \
org.gnome.Sdk//42
# Work around submodule file: problem until .deb package includes
# the fix for https://github.com/flatpak/flatpak-builder/issues/495 .
git config --global protocol.file.allow always
Expand Down
2 changes: 1 addition & 1 deletion Build/mkall.targets
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
<PalasoBuildType Condition="'$(OS)'=='Windows_NT' AND '$(arch)'=='x64'">Libpalaso_PalasoWin60Continuous</PalasoBuildType>
<!-- bt322 is the master branch build of Palaso for Linux development. Update when appropriate. -->
<PalasoBuildType Condition="'$(OS)'=='Unix'">Libpalaso_Palaso60linuxContinuous</PalasoBuildType>
<PalasoBuildTag>fw-9.0.18.2.tcbuildtag</PalasoBuildTag>
<PalasoBuildTag>fw-9.0.18.3.tcbuildtag</PalasoBuildTag>
<!--Todo: use PalasoBuildType, when it refers to somewhere that has the IPCFramework.-->
<!-- bt278 is the develop branch build of IPCFramework for Windows development. Update when appropriate. -->
<IPCFrameworkBuildType Condition="'$(OS)'=='Windows_NT'">bt278</IPCFrameworkBuildType>
Expand Down
2 changes: 1 addition & 1 deletion flatpak/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ sudo add-apt-repository ppa:flatpak/stable
sudo apt install flatpak-builder flatpak
flatpak --user remote-add --if-not-exists flathub \
https://flathub.org/repo/flathub.flatpakrepo
flatpak --user install flathub org.gnome.Platform//3.36 org.gnome.Sdk//3.36
flatpak --user install flathub org.gnome.Platform//42 org.gnome.Sdk//42
# Use flatpak-builder from flathub since the fix at
# https://github.com/flatpak/flatpak-builder/pull/497 is not yet available in
# the .deb package.
Expand Down
2 changes: 1 addition & 1 deletion flatpak/fieldworks-sources-urls-input.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- name: libpalaso
baseurl: https://build.palaso.org/guestAuth/repository/download/Libpalaso_Palaso60linuxContinuous/fw-9.0.18.2.tcbuildtag/
baseurl: https://build.palaso.org/guestAuth/repository/download/Libpalaso_Palaso60linuxContinuous/fw-9.0.18.3.tcbuildtag/
dest: fw/Downloads
files:
- SIL.Core.dll
Expand Down
Loading

0 comments on commit 7d0cd4e

Please sign in to comment.