update Flatpak README and scripts
This commit is contained in:
		@@ -1,7 +1,50 @@
 | 
				
			|||||||
# Flatpak packaging
 | 
					# Flatpak packaging
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Building Flatpak
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					To build flatpak package, you will need flatpak, flatpak-builder, and
 | 
				
			||||||
 | 
					KDE 5.12 runtime with SDK. flatpak-builder is usually available from
 | 
				
			||||||
 | 
					the same repository as flatpak. See https://flatpak.org/setup/ for
 | 
				
			||||||
 | 
					setting it up. To install runtimes (adjust as needed if you prefer
 | 
				
			||||||
 | 
					system-wide installation):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					flatpak install --user flathub org.kde.Platform//5.12 org.kde.Sdk//5.12
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					To build, run from the root of the project:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					flatpak-builder --repo=build/flatpak/repo --force-clean build/flatpak/build packaging/flatpak/mirage.flatpak.yaml
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					To create bundle, run
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					flatpak build-bundle build/flatpak/repo mirage.flatpak io.github.mirukana.mirage
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Then you can install it with
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					flatpak install --user mirage.flatpak
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					To run, either use your desktop environment or command line:
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					flatpak run io.github.mirukana.mirage
 | 
				
			||||||
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Manifest
 | 
					## Manifest
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Manifest can be created using the included scripts, as described
 | 
				
			||||||
 | 
					below. Please note it is intended to be done by the maintainers
 | 
				
			||||||
 | 
					only. In particular, there could be some unexpected issues exposed by
 | 
				
			||||||
 | 
					updates in Python modules that have to be resolved.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Manifest has to be updated by maintainers when the dependencies of
 | 
				
			||||||
 | 
					Mirage change, some updates in used Python modules are desired.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Flatpak packaging manifest is generated by running
 | 
					Flatpak packaging manifest is generated by running
 | 
				
			||||||
[generate-flatpak-script.sh](generate-flatpak-script.sh). This script
 | 
					[generate-flatpak-script.sh](generate-flatpak-script.sh). This script
 | 
				
			||||||
requires `libolm` to be installed on the development PC as it will
 | 
					requires `libolm` to be installed on the development PC as it will
 | 
				
			||||||
@@ -22,26 +65,3 @@ Flatpak manifest is created automatically by
 | 
				
			|||||||
marked placeholder with Python module dependencies.
 | 
					marked placeholder with Python module dependencies.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Building Flatpak
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
To build flatpak package, you will need flatpak, flatpak-builder, and
 | 
					 | 
				
			||||||
KDE 5.12 runtime with SDK. flatpak-builder is usually available from
 | 
					 | 
				
			||||||
the same repository as flatpak. See https://flatpak.org/setup/ for
 | 
					 | 
				
			||||||
setting it up. To install runtimes (adjust as needed if you prefer
 | 
					 | 
				
			||||||
system-wide installation):
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
```
 | 
					 | 
				
			||||||
flatpak install --user flathub org.kde.Platform//5.12 org.kde.Sdk//5.12
 | 
					 | 
				
			||||||
```
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
To build, run from the root of the project:
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
```
 | 
					 | 
				
			||||||
flatpak-builder --repo=../flatpak-repo --force-clean flatpak-build packaging/flatpak/mirage.flatpak.yaml
 | 
					 | 
				
			||||||
```
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
To create bundle, run
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
```
 | 
					 | 
				
			||||||
flatpak build-bundle ../flatpak-repo ../mirage.flatpak io.github.mirukana.mirage
 | 
					 | 
				
			||||||
```
 | 
					 | 
				
			||||||
@@ -18,7 +18,9 @@ cat requirements.flatpak.txt ../../requirements.txt > requirements.txt
 | 
				
			|||||||
flatpak-env/bin/pip install -Ur requirements.txt
 | 
					flatpak-env/bin/pip install -Ur requirements.txt
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# freeze requirements and ignore blacklisted packages
 | 
					# freeze requirements and ignore blacklisted packages
 | 
				
			||||||
flatpak-env/bin/pip freeze | grep -v PyYAML | grep -v six= | grep -v matrix-nio > flatpak-requirements.txt
 | 
					flatpak-env/bin/pip freeze | \
 | 
				
			||||||
 | 
					    grep -v PyYAML | grep -v six= | \
 | 
				
			||||||
 | 
					    grep -v matrix-nio > flatpak-requirements.txt
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# generate flatpak requirements
 | 
					# generate flatpak requirements
 | 
				
			||||||
flatpak-env/bin/python flatpak-pip-generator --output flatpak-pip \
 | 
					flatpak-env/bin/python flatpak-pip-generator --output flatpak-pip \
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -100,6 +100,10 @@ modules:
 | 
				
			|||||||
    sources:
 | 
					    sources:
 | 
				
			||||||
      - type: dir
 | 
					      - type: dir
 | 
				
			||||||
        path: ../..
 | 
					        path: ../..
 | 
				
			||||||
 | 
					        skip:
 | 
				
			||||||
 | 
					          - build
 | 
				
			||||||
 | 
					          - .git
 | 
				
			||||||
 | 
					          - .flatpak-builder
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # - name: mirage
 | 
					  # - name: mirage
 | 
				
			||||||
  #   buildsystem: qmake
 | 
					  #   buildsystem: qmake
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -714,3 +714,7 @@ modules:
 | 
				
			|||||||
  sources:
 | 
					  sources:
 | 
				
			||||||
  - type: dir
 | 
					  - type: dir
 | 
				
			||||||
    path: ../..
 | 
					    path: ../..
 | 
				
			||||||
 | 
					    skip:
 | 
				
			||||||
 | 
					      - build
 | 
				
			||||||
 | 
					      - .git
 | 
				
			||||||
 | 
					      - .flatpak-builder
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user