Merge branch 'master' into mips32r2

This commit is contained in:
cm8 2018-06-25 04:09:23 +02:00 committed by GitHub
commit 99d3c4bc09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions

View File

@ -17,7 +17,7 @@ class Xapian(Dependency):
patches = ['xapian_sys_types.patch']
class Builder(MakeBuilder):
configure_option = "--disable-sse --disable-backend-inmemory --disable-documentation"
configure_option = "--disable-sse --disable-backend-chert --disable-backend-inmemory --disable-documentation"
configure_env = {'_format_LDFLAGS': "-L{buildEnv.install_dir}/{buildEnv.libprefix}",
'_format_CXXFLAGS': "-I{buildEnv.install_dir}/include"}

View File

@ -10,7 +10,7 @@ main_project_versions = {
# This is the "version" of the whole base_deps_versions dict.
# Change this when you change base_deps_versions.
base_deps_meta_version = '8'
base_deps_meta_version = '9'
base_deps_versions = {

View File

@ -28,6 +28,7 @@ Type=Application
Terminal=false
StartupNotify=true
NoDisplay=false
Categories=Education;
EOF
# Get linuxdeployqt