Skip to content

/ PyBitmessage

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

flatpak-builder support #1618

Open
wants to merge 8 commits into
base: v0.6
from
Open

flatpak-builder support #1618

wants to merge 8 commits into from

Conversation

@zciendor
Copy link

@zciendor zciendor commented Apr 29, 2020

Recent distributions like Debian bullseye don't support QT4 anymore. This pull request provides a flatpak-builder configuration and instructions how to package PyBitmessage as a flatpak application which bundles QT4.

This pull request is also a necessary requirement for #1607
zciendor added 2 commits Apr 29, 2020
@zciendor
Update INSTALL.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
194251f
@zciendor
flatpak-builder configuration
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
5e2b9a1
@zciendor zciendor mentioned this pull request Apr 29, 2020
Open
@PeterSurda
Copy link
Member

@PeterSurda PeterSurda commented Apr 30, 2020

Thank you, this is great.
@zciendor
git submodule instruction for flatpak building
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
5e440dd 
git submodule instruction for the flathub shared modules was missing
@g1itch
Copy link
Collaborator

@g1itch g1itch commented Apr 30, 2020

Maybe move the manifest to packages/flatpak?
@g1itch
g1itch reviewed Apr 30, 2020
View changes
INSTALL.md Outdated
git clone git://github.com/Bitmessage/PyBitmessage.git
cd PyBitmessage/
git submodule add https://github.com/flathub/shared-modules.git
flatpak-builder --install _flatpak -install-deps-from=flathub --force-clean --user org.bitmessage.PyBitmessage.json

This comment has been minimized.

Sign in to view
@g1itch

g1itch Apr 30, 2020
Collaborator

It's probably a typo here, should be --install-deps-from=

This comment has been minimized.

Sign in to view
@zciendor

zciendor Apr 30, 2020
Author

It's probably a typo here, should be --install-deps-from=

Fixed. The updated build instructions are now in packages/flatpak/README.md.
zciendor added 3 commits Apr 30, 2020
@zciendor
use build directory for flatpak-builder artifacts
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
684db99 
updated flatpak instructions to make use of the build directory which is already used for other stuff as well
@zciendor
cosmetic change
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
9ac0254 
rearranged flatpak-builder arguments to match documentation: 
```
$ flatpak-builder --help install
flatpak-builder [OPTION…] DIRECTORY MANIFEST
```
@zciendor
put .flatpak-builder cache directory in build dir
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
67ea856 
updated flatpak instructions so that the `.flatpak-builder/` cache directory is created in the exiting `build/` directory as well
@zciendor
Copy link
Author

@zciendor zciendor commented Apr 30, 2020

Maybe move the manifest to packages/flatpak?

I'll try... need to change some relative paths within the manifest then.
@zciendor zciendor force-pushed the zciendor:v0.6 branch from a62f98f to 9ac0254 Apr 30, 2020
@g1itch
Copy link
Collaborator

@g1itch g1itch commented Apr 30, 2020

If we already have all dependencies installed on Ubuntu bionic, is it possible to skip building Qt4?
See https://travis-ci.org/github/g1itch/PyBitmessage/jobs/681467891
@g1itch
Copy link
Collaborator

@g1itch g1itch commented Apr 30, 2020

Maybe move the manifest to packages/flatpak?

I'll try... need to change some relative paths within the manifest then.

diff --git a/org.bitmessage.PyBitmessage.json b/org.bitmessage.PyBitmessage.json
index e2bfb73d..c91f5bea 100644
--- a/org.bitmessage.PyBitmessage.json
+++ b/org.bitmessage.PyBitmessage.json
@@ -33,8 +33,8 @@
       ],
       "sources" : [
         {
-          "type" : "dir",
-          "path" : "."
+          "type" : "git",
+          "url" : "https://github.com/Bitmessage/PyBitmessage.git"
         }
       ]
     }
@zciendor
moved all flatpak related stuff to `packages/flatpak`
Verified
This commit was signed with a verified signature.
zciendor
GPG key ID: 3EDEF857953B4F2E Learn about signing commits
Loading status checks…
23376b4
@zciendor
Copy link
Author

@zciendor zciendor commented Apr 30, 2020

If we already have all dependencies installed on Ubuntu bionic, is it possible to skip building Qt4?

No, Qt4 is not available in any of the available runtimes on flathub: https://docs.flatpak.org/en/latest/available-runtimes.html

Actually, Qt4 is build within the sandbox and not in Ubuntu.
@zciendor
changed instructions to `git submodule update` instead of `add`
Verified
This commit was signed with a verified signature.
zciendor
GPG key ID: 3EDEF857953B4F2E Learn about signing commits
Loading status checks…
ccac73c
@zciendor
Copy link
Author

@zciendor zciendor commented Apr 30, 2020 

-          "type" : "dir",
-          "path" : "."
+          "type" : "git",
+          "url" : "https://github.com/Bitmessage/PyBitmessage.git"

Well, while this works, it would check out the HEAD revision from the remote origin again. This may not be what you want in case you want to build/package the current working copy state.
@zciendor
Copy link
Author

@zciendor zciendor commented Apr 30, 2020

If we already have all dependencies installed on Ubuntu bionic, is it possible to skip building Qt4?
See https://travis-ci.org/github/g1itch/PyBitmessage/jobs/681467891

Timeout (20 minutes) reached.

flatpak-builder has a cache directory. Qt4 won't be rebuild if this exists from a previous build and the inputs for a build step haven't changed. Not sure if this could be configured in travis-ci somehow...
@PeterSurda PeterSurda self-assigned this Jan 3, 2021
@PeterSurda PeterSurda added this to In progress in Build system via automation Jan 3, 2021
@PeterSurda PeterSurda added this to the v0.6.4 milestone Jan 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@g1itch g1itch

At least 1 approving review is required to merge this pull request.

Assignees

@PeterSurda PeterSurda

Labels
build packaging
Projects
Build system
  
In progress
Milestone
v0.6.4
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@zciendor @PeterSurda @g1itch
You can’t perform that action at this time.