From fe4fc7c2cb491be00bf13e2f0173f01801c24c27 Mon Sep 17 00:00:00 2001 From: relan Date: Wed, 6 Sep 2017 08:25:00 +0300 Subject: [PATCH] =?UTF-8?q?p=E2=89=A1p:=20fix=200.9.10.1=20(60)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- metadata/pep.android.k9.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/metadata/pep.android.k9.txt b/metadata/pep.android.k9.txt index 064a6fc438..b9da5d50fc 100644 --- a/metadata/pep.android.k9.txt +++ b/metadata/pep.android.k9.txt @@ -133,20 +133,19 @@ Build:0.9.4,13 sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile ndk=r11c -Build:0.9.10.1,60 - disable=build failing +Build:0.9.10.1.withoutKeysync,60 commit=v0.9.10.1 subdir=k9mail gradle=WiththoutkeysyncPlayStore srclibs=pEpJNIAdapter@f5210e9e14a7,pEpEngine@46fa9082dd6b,yml2@2.5.5 prebuild=sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):' ../settings.gradle && \ - sed -i "s/4.8/4.9/" $$pEpJNIAdapter$$/android/external/Makefile && \ + sed -i "s/4.8/4.9/" $$pEpJNIAdapter$$/android/external/Makefile $$pEpJNIAdapter$$/android/jni/Application.mk $$pEpEngine$$/build-android/jni/Application.mk && \ sed -i 's:include $(ANDROID_NDK_HOME)/\(toolchains/$(NDK_TOOLCHAIN)/setup.mk\):include $(ANDROID_NDK_HOME)/build/core/\1:' $$pEpJNIAdapter$$/android/external/Makefile && \ sed -i 's:\(ICONV_PREFIX=$(LOCAL)\) \(./build.sh\):\1 bash \2:' $$pEpJNIAdapter$$/android/external/Makefile && \ sed -i "s:yml2proc:../$$yml2$$/yml2proc:" $$pEpJNIAdapter$$/src/Makefile && \ sed -i 's:env python:env python2:' $$yml2$$/yml2proc && \ sed -i "s:backend.includePath.extend(dirs):backend.includePath.extend(['$(realpath $$yml2$$)']):" $$yml2$$/yml2proc && \ - sed -i 's:YML2PROC=.*$:YML2PROC=src/$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=src/$$yml2$$:' $$pEpEngine$$/Makefile.conf && \ + sed -i 's:YML2PROC=.*$:YML2PROC=../$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=../$$yml2$$:' $$pEpEngine$$/Makefile.conf && \ sed -i "s:/bin/sh:/bin/bash:" $$pEpEngine$$/build-android/build.sh && \ sed -i 's:ASN1C_INCLUDE=.*$:ASN1C_INCLUDE=/usr/share/asn1c:' $$pEpEngine$$/Makefile.conf && \ sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile @@ -160,5 +159,5 @@ Auto Update Mode:Version v%v Auto Update Mode:None Update Check Mode:Tags -Current Version:Unknown -Current Version Code:59 +Current Version:0.9.10.1.withoutKeysync +Current Version Code:60