From 885aeacb2f157140d97d48c225c95e86a72097c8 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Thu, 2 Sep 2021 12:07:57 +0300 Subject: [PATCH] Linphone - update recipe --- metadata/org.linphone.yml | 6 +++-- metadata/org.linphone/4.5.2.patch | 42 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 metadata/org.linphone/4.5.2.patch diff --git a/metadata/org.linphone.yml b/metadata/org.linphone.yml index 9b20417430..aa232cf165 100644 --- a/metadata/org.linphone.yml +++ b/metadata/org.linphone.yml @@ -764,11 +764,13 @@ Builds: - apt-get install -y doxygen pkgconf python3-pystache python3-six yasm - apt-get install -y -t stretch-backports-sloppy libarchive13 - apt-get install -y -t stretch-backports cmake + patch: + - 4.5.2.patch gradle: - yes output: app/build/outputs/apk/release/linphone-android-release-*.apk srclibs: - - linphone-sdk@5.0.14 + - linphone-sdk@5.0.15 rm: - app/google-services.json prebuild: @@ -792,7 +794,7 @@ Builds: - pushd $$linphone-sdk$$ - mkdir build-sdk - cd build-sdk - - cmake .. -DLINPHONESDK_PLATFORM=Android -DLINPHONESDK_ANDROID_ARCHS="arm64, + - cmake .. -DENABLE_GPL_THIRD_PARTIES=YES -DLINPHONESDK_PLATFORM=Android -DLINPHONESDK_ANDROID_ARCHS="arm64, armv7, x86" -DCMAKE_BUILD_TYPE=Release - cmake --build . --parallel $(nproc) - popd diff --git a/metadata/org.linphone/4.5.2.patch b/metadata/org.linphone/4.5.2.patch new file mode 100644 index 0000000000..387716217b --- /dev/null +++ b/metadata/org.linphone/4.5.2.patch @@ -0,0 +1,42 @@ +--- a/app/src/main/res/layout/settings_network_fragment.xml ++++ b/app/src/main/res/layout/settings_network_fragment.xml +@@ -79,13 +79,6 @@ + + +- +- +--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt ++++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt +@@ -38,14 +38,6 @@ + } + val allowIpv6 = MutableLiveData() + +- val pushNotificationsListener = object : SettingListenerStub() { +- override fun onBoolValueChanged(newValue: Boolean) { +- core.isPushNotificationEnabled = newValue +- } +- } +- val pushNotifications = MutableLiveData() +- val pushNotificationsAvailable = MutableLiveData() +- + val randomPortsListener = object : SettingListenerStub() { + override fun onBoolValueChanged(newValue: Boolean) { + val port = if (newValue) -1 else 5060 +@@ -69,8 +61,6 @@ + init { + wifiOnly.value = core.wifiOnlyEnabled() + allowIpv6.value = core.ipv6Enabled() +- pushNotifications.value = core.isPushNotificationEnabled +- pushNotificationsAvailable.value = core.isPushNotificationAvailable + randomPorts.value = getTransportPort() == -1 + sipPort.value = getTransportPort() + }