Matthieu Gautier
2980075ce0
Update flatpak_builder to new version of kiwix-desktop
...
- app-id is now ork.kiwix.desktop
- No need to rename the desktop-file
- `--filesystem=xdg-data` is useless.
2018-12-14 17:00:39 +01:00
Matthieu Gautier
c0c907bb92
Merge pull request #275 from kiwix/fix_flatpak
...
Fix flatpak
2018-12-13 18:05:18 +01:00
Matthieu Gautier
f9610ce3b3
Move the `sources` at the end of the modules.
...
It is the usage to have `sources` attribute at the end of the module
definition in flatpak manifest. Let's follow it.
2018-12-12 11:31:50 +01:00
Matthieu Gautier
ac0685877b
Do not keep "empty" modules (without sources).
...
`org.kde` dependency has no source. It used by kiwix-build to install the
correct sdk/platform.
2018-12-12 11:30:04 +01:00
Matthieu Gautier
abf0e639e1
The manifest file must be named as the app-id.
2018-12-12 11:28:08 +01:00
Matthieu Gautier
e11247c18a
`builddir` is already default to True for meson.
2018-12-12 11:25:02 +01:00
Matthieu Gautier
6b5df23b03
`no-autogen` is already default to false.
...
We don't need to add it by default.
2018-12-12 11:24:40 +01:00
Matthieu Gautier
17a786092a
Do not set unused configure options in flatpak.
2018-12-12 11:19:07 +01:00
Matthieu Gautier
4574a1cfed
Merge pull request #273 from kiwix/new_versions
...
New versions
2018-12-03 13:30:12 +01:00
Matthieu Gautier
71e31c54e5
update version of kiwix-lib and kiwix-desktop
2018-12-03 11:23:37 +01:00
Matthieu Gautier
c0daff60bd
Include zimcheck in the zim-tools archives
...
Fix openzim/zim-tools#26
2018-12-03 11:19:36 +01:00
Matthieu Gautier
62eb6acd85
Merge pull request #270 from kiwix/flatpak
...
Flatpak bis
2018-11-30 13:28:18 +01:00
Matthieu Gautier
9679c01254
Run docker with all privileges.
2018-11-30 11:37:23 +01:00
Matthieu Gautier
92d637ad99
Better flatpak build.
...
- Print the name of the module instead of the builder.
- Do not try to build the kiwix-desktop dependencies in the flatpak.
- Correct the path of the created flatpak.
2018-11-30 11:37:23 +01:00
Matthieu Gautier
f96ae19c88
Disable websocket support in aria2.
...
We don't need it. It could speed up a bit the compilation.
2018-11-30 11:37:23 +01:00
Matthieu Gautier
703cac1f70
Do not compile libcurl in flatpak.
2018-11-30 11:37:23 +01:00
Matthieu Gautier
5d7972f037
Merge pull request #271 from kiwix/new_server
...
Update upload script to new server user "ci".
2018-11-30 11:36:55 +01:00
Matthieu Gautier
827c963895
Update upload script to new server user "ci".
...
On new server, the user `nightlybot` as been renamed to `ci`.
The path of the data used by the download server has also changed.
2018-11-30 11:08:33 +01:00
Matthieu Gautier
b2a6ca7950
Merge pull request #269 from kiwix/flatpak
...
Flatpak
2018-11-27 18:03:20 +01:00
Matthieu Gautier
f41a0dccdb
Get base dependencies only if we are not building a flatpak.
2018-11-27 17:22:47 +01:00
Matthieu Gautier
ce540ca280
Update creation of appImage to the new location of kiwix-desktop.desktop.
2018-11-27 17:22:47 +01:00
Matthieu Gautier
ecf3b8b1ff
Add an option `--asume-packages-installed` to not try to install packages.
...
This is different than `--dont-install-packages` that will try to
compile the dependencies.
`--asumme-packages-installed` will no try to install packages, but will
not try either to compile dependencies.
2018-11-27 17:22:47 +01:00
Matthieu Gautier
086361b432
Build the flatpak in travis.
...
Use docker to have the last version of ubuntu (and flatpak)
2018-11-27 17:22:47 +01:00
Matthieu Gautier
a3ce2e0126
Fix the flatpak manifest.
...
- Rename the .desktop file and the icons for desktop integration.
- Fix finish-args for the right permissions
- Remove curl binary, not aria2c.
2018-11-27 17:22:47 +01:00
Matthieu Gautier
a18c28b168
Build the flatpak as user, not system.
2018-11-27 17:22:47 +01:00
Matthieu Gautier
feec272d1f
Use the correct key `app-id` instead of `id`.
2018-11-27 17:22:47 +01:00
Matthieu Gautier
833c5844a1
Use the right option to build kiwix_desktop and pugixml on flatpak.
2018-11-27 17:22:47 +01:00
Matthieu Gautier
ed63ffe24c
Add aria2 dependency.
...
kiwix-desktop needs the aria2 binary to download content.
kiwix-desktop will use aria2 throw lib-kiwix so it is somehow a kiwix-lib
dependency, but it is used only by kiwix-desktop.
And we know to install it only on platforms where we are supporting
kiwix-destkop.
2018-11-27 17:22:47 +01:00
Matthieu Gautier
d375cc06bc
Do not try to compiled dependencies already in the org.kde.Platform.
2018-11-27 10:11:08 +01:00
birros
8d58d8d7cb
First version of a flatpak builder.
...
This commit add a first version code to build a flatpak of kiwix-desktop.
It is mainly based on the PR #254 of @birros (hence he is the author of this commit)
However there is some differences :
- I (@mgautier) create a new builder to run the flatpak build instead of using a new
dependency.
- Use the flatpak platform to install org.kde.Platform and org.kde.Sdk
This code version doesn't correctly work but I wanted to commit the birros' code
without too many modification (even if there is a lot).
2018-11-27 09:43:52 +01:00
Matthieu Gautier
0b9f13a2f0
Create a property in the remotefile to get the correct url.
2018-11-14 11:08:44 +01:00
Matthieu Gautier
22f1693335
Merge remote-tracking branch 'origin/master'
...
I forget to fetch before pushing the 0.0.14 tag :/
2018-11-14 10:59:11 +01:00
Matthieu Gautier
054f7802d0
Update version of kiwix-lib and kiwix-tools.
2018-11-12 16:54:44 +01:00
Kelson
f080c750b6
Merge pull request #268 from kiwix/new_tmp_server
...
New tmp.kiwix.org server
2018-11-07 16:16:37 +01:00
Kelson
70301d4723
New tmp.kiwix.org server
2018-11-07 03:51:13 +01:00
Kelson
e5be404697
Merge pull request #266 from kiwix/new_download_zim_server
...
New Travis config for new openzim download server
2018-11-03 17:23:04 +01:00
Kelson
d9ef792172
Update Travis for new download server
2018-11-03 14:38:46 +01:00
Matthieu Gautier
500e2c1e02
update version of kiwix-lib and kiwix-desktop
2018-11-03 12:35:12 +01:00
Matthieu Gautier
1b7a40ea97
Fix create appimage
2018-11-02 17:58:18 +01:00
Matthieu Gautier
85f0d4ccb1
Update version of kiwix-lib and kiwix-desktop.
2018-11-02 17:37:02 +01:00
Matthieu Gautier
e0de6e90d0
Merge pull request #265 from kiwix/package_aria2_linux
...
Add aria2 in the appimage.
2018-11-02 17:11:02 +01:00
Matthieu Gautier
f4ff820eda
Add aria2 in the appimage.
2018-11-02 11:56:00 +01:00
Matthieu Gautier
1440dd8b25
Update version of kiwix-lib, kiwix-tools and kiwix-desktop.
2018-10-31 17:20:24 +01:00
Matthieu Gautier
237e4d860d
Merge pull request #262 from kiwix/build_libcurl
...
Force the build of libcurl instead of using system one.
2018-10-31 17:19:50 +01:00
Matthieu Gautier
c47bad8c74
Try to cache appveyor dependencies.
2018-10-31 15:42:15 +01:00
Matthieu Gautier
00b7e0f1f8
[AppVeyor] Add Aria2.
2018-10-31 15:40:53 +01:00
Matthieu Gautier
845cdffdba
[AppVeyor] Compile kiwix-desktop using static lib when possible.
2018-10-31 15:38:32 +01:00
Matthieu Gautier
97f6c076c4
[AppVeyor] Build curl in appveyor.
2018-10-31 15:37:24 +01:00
Matthieu Gautier
0600be96ac
Force the build of libcurl instead of using system one.
...
On ubuntu, the libcurl package is compiled with libkrb (kerberos).
However, no libkrb5.a is provided and so, we cannot link statically.
As we are not using kerberos, we can (and must) compile ourselves libcurl.
2018-10-31 15:33:12 +01:00
Matthieu Gautier
5a97ec28ca
Merge pull request #253 from kiwix/libcurl
...
Add libcurl dependency.
2018-10-23 15:41:19 +02:00