44cda40358
Merge pull request #289 from kiwix/mix_platform
...
Mix platform
2019-02-04 17:48:27 +01:00
68902b5642
Build libzim in native_mixed platform on travis.
2019-02-04 17:01:28 +01:00
0ad24e9656
Do not use system's static zlib.
...
The system's static zlib is compiled without `-fPIC` but we need it
to build the mixed libzim.
2019-02-04 17:01:28 +01:00
4eb95fd4cc
Pass correct option -Dstatic_linkage to libzim in native_mixed platform.
...
In native_mixed, we want to build a shared lib but we need to compile
with the static lib of the dependencies.
2019-02-04 17:01:28 +01:00
466dc8b64a
Fix -fPIC CXXFLAGS.
2019-02-04 17:01:28 +01:00
c9210bb0e0
Allow kiwix-build to build shared libs linked statically with deps.
...
We need to be able to build libzim as shared lib while using all
other dependencies statically (to not have libxapian.so, ... to distribute)
This add a new platform (static=False) that make all dependencies being
build in a static platform.
2019-02-04 17:01:28 +01:00
1b2b3efb54
Allow the platform itself to set on which platform we need to build the dep
...
For some complex build, we may want to build a dependency on another
platform that the target platform.
2019-02-04 17:01:28 +01:00
ef4cf7ada7
Merge pull request #288 from kiwix/mhutti1/gradle-update-1
...
Update Gradle Version
2019-02-04 06:57:51 +01:00
90460e8100
Update Gradle Version
2019-02-03 23:46:55 +00:00
2aee71075e
Merge pull request #286 from kiwix/fix_flatpak
...
Fix flatpak
2019-01-29 16:55:30 +01:00
b985becf4b
Update versions
2019-01-29 14:18:15 +01:00
c61570fc08
[flatpak] Add the exact commit sha in the manifest.
...
As requested here
https://github.com/flathub/flathub/pull/768#discussion_r245727043
See flathub/flathub#768
2019-01-23 18:25:22 +01:00
50167460dc
Move the version of org.kde in the versions.py file.
2019-01-23 16:04:02 +01:00
4dfcd4aefb
Merge pull request #213 from kiwix/last_meson
...
Use last version of meson.
2019-01-23 14:25:25 +01:00
b2d2e489bf
[iOS] Use the correct option b_bitcode for libzim and kiwix-lib.
2019-01-17 16:50:49 +01:00
8ffbac9734
[Travis] Install the last version of meson.
2019-01-17 15:36:32 +01:00
681c5b4ec2
[Travis] Use python3.5 instead of default python3.4
...
Python3.5 add functionnality we need in kiwix-build.
And recent versions of meson need python3.5.
2019-01-17 15:36:32 +01:00
2ab9f2679b
Merge pull request #285 from kiwix/fix_travis
...
Fix travis
2019-01-15 17:09:36 +01:00
4160673c3a
Correctly raise StopBuild in case of error when building flatpak.
2019-01-15 14:50:06 +01:00
c4a3da03c3
Correctly install mustache in flatpak.
...
We need a simple buildsystem to "build" mustache" as we simply need to
copy the header.
2019-01-15 14:44:02 +01:00
961076bb87
[ANDROID] Build only the apk, not everything.
...
It seems that build everything on android side is a bit too expensive.
Let's do as is done on android CI, build only the apk.
2019-01-15 11:26:11 +01:00
4329629f97
[Travis] Allow the desktop appimage build to fail.
...
`linuxqtdeploy` recently add a test on the running system (libc version)
and refuse to run if the libc is too recent.
So we would need to run `linuxqtdeploy` only on ubuntu 14.04.
However, we also need `qtwebengine5-dev` package whom is available only
since ubuntu 18.04.
While we find a solution (see comments in the linuxdeployqt issue), we
have to allow the appimage build to fail.
See probonopd/linuxdeployqt#340
2019-01-15 11:16:48 +01:00
12614facce
Merge pull request #284 from kiwix/add_missing_import_i586
...
Add missing import of pj in i586 platform
2019-01-11 13:44:05 +01:00
f844832c87
[Appveyor]Add include directory for mustache in kiwix-lib.
2019-01-11 11:28:41 +01:00
4f2786a031
Add missing import of pj in i586 platform
2019-01-10 16:50:47 +01:00
e7860f986d
Merge pull request #283 from kiwix/cross_compile_include_dir
...
Add the include dir in the meson_cross_file.
2019-01-10 10:57:15 +01:00
1d881d0612
Add the include dir in the meson_cross_file.
...
This is needed to have kiwix-lib find the `mustache.hpp` include when
cross compiling.
2019-01-09 18:29:58 +01:00
17c6b68a62
Merge pull request #282 from kiwix/mustache
...
Remove ctpp2 dependency.
2019-01-09 15:04:20 +01:00
879a7294b9
Create the directory containing the skip_file if needed.
2019-01-09 11:46:16 +01:00
1a0e0ad717
Update to last version of libmagic (5.35)
2019-01-09 11:17:41 +01:00
8005aff6c0
Remove ctpp2 dependency.
...
kiwix-lib doesn't use ctpp2 anymore but mustache.
So remove ctpp2 dependency and add mustache.
2019-01-09 11:17:41 +01:00
c12988a811
Merge pull request #280 from kiwix/fix_desktop_file_name
...
Fix desktop file name
2018-12-21 15:39:46 +01:00
b6833eddac
Force rebuild of kiwix-desktop release to have the appimage.
2018-12-21 14:32:33 +01:00
8f5df26a68
The name of the desktop file is now org.kiwix.desktop.desktop
2018-12-21 14:30:36 +01:00
15b9b15e3c
Merge pull request #277 from kiwix/update_request_module
...
Update Python request to 2.20.0
2018-12-15 15:59:13 +01:00
214a38d27f
Update Python request to 2.20.0
2018-12-15 13:44:30 +01:00
e78681dbbd
Merge pull request #276 from kiwix/update_flatpak
...
Update flatpak and new versions
2018-12-15 13:31:00 +01:00
c776ca9a80
Udpate versions.
2018-12-14 17:00:39 +01:00
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
c0c907bb92
Merge pull request #275 from kiwix/fix_flatpak
...
Fix flatpak
2018-12-13 18:05:18 +01:00
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
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
abf0e639e1
The manifest file must be named as the app-id.
2018-12-12 11:28:08 +01:00
e11247c18a
builddir is already default to True for meson.
2018-12-12 11:25:02 +01:00
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
17a786092a
Do not set unused configure options in flatpak.
2018-12-12 11:19:07 +01:00
4574a1cfed
Merge pull request #273 from kiwix/new_versions
...
New versions
2018-12-03 13:30:12 +01:00
71e31c54e5
update version of kiwix-lib and kiwix-desktop
2018-12-03 11:23:37 +01:00
c0daff60bd
Include zimcheck in the zim-tools archives
...
Fix openzim/zim-tools#26
2018-12-03 11:19:36 +01:00
62eb6acd85
Merge pull request #270 from kiwix/flatpak
...
Flatpak bis
2018-11-30 13:28:18 +01:00
