diff options
author | David P <megver83@parabola.nu> | 2020-10-23 17:10:50 -0300 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2020-10-23 17:10:50 -0300 |
commit | 5ec5aa98ecc354dd1a495c0323a56f3b0d6187a4 (patch) | |
tree | 1e5ed76440998ef0f2333036e2a0a057afa821f2 /pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch | |
parent | bc08e4d17350157082b0fa1ff3ffff14fc14d3be (diff) | |
download | abslibre-5ec5aa98ecc354dd1a495c0323a56f3b0d6187a4.tar.gz abslibre-5ec5aa98ecc354dd1a495c0323a56f3b0d6187a4.tar.bz2 abslibre-5ec5aa98ecc354dd1a495c0323a56f3b0d6187a4.zip |
updpkg: pcr/linphone-desktop 4.2.3-1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch')
-rw-r--r-- | pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch b/pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch new file mode 100644 index 000000000..ecec4ade0 --- /dev/null +++ b/pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch @@ -0,0 +1,74 @@ +From b7bbebb8bf6f4fe8d321d4ace84b5a62326e5b89 Mon Sep 17 00:00:00 2001 +From: David P <megver83@parabola.nu> +Date: Fri, 23 Oct 2020 16:44:17 -0300 +Subject: [PATCH 2/2] remove bc_compute_full_version usage + +--- + linphone-app/CMakeLists.txt | 11 +---------- + linphone-app/build/CMakeLists.txt | 5 ----- + .../cmake_builder/linphone_package/CMakeLists.txt | 10 +--------- + 3 files changed, 2 insertions(+), 24 deletions(-) + +diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt +index b85e3684..43bcd171 100644 +--- a/linphone-app/CMakeLists.txt ++++ b/linphone-app/CMakeLists.txt +@@ -21,17 +21,8 @@ + ################################################################################ + cmake_minimum_required(VERSION 3.1) + ++include(linphoneqt_version.cmake) + find_package(bctoolbox CONFIG) +-set(FULL_VERSION ) +-bc_compute_full_version(FULL_VERSION) +-set(version_major ) +-set(version_minor ) +-set(version_patch ) +-set(identifiers ) +-set(metadata ) +-bc_parse_full_version("${FULL_VERSION}" version_major version_minor version_patch identifiers metadata) +- +-project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") + + if(ENABLE_BUILD_VERBOSE) + #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") +diff --git a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt +index 8ef03faa..97d94bd6 100644 +--- a/linphone-app/build/CMakeLists.txt ++++ b/linphone-app/build/CMakeLists.txt +@@ -46,11 +46,6 @@ set(CPACK_SOURCE_IGNORE_FILES + "libmng.spec" + ) + +-bc_compute_full_version(PROJECT_VERSION_BUILD) +-if(PROJECT_VERSION_BUILD) +- set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PROJECT_VERSION_BUILD}") +-endif() +- + message("-- Package file name is ${CPACK_PACKAGE_FILE_NAME}") + + set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}) +diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +index 9549b595..6b05379c 100644 +--- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt ++++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +@@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui") + # ============================================================================== + # Build package version. + # ============================================================================== +-bc_compute_full_version(APP_PROJECT_VERSION) +-if (GIT_EXECUTABLE AND NOT(APP_PROJECT_VERSION)) +- execute_process( +- COMMAND ${GIT_EXECUTABLE} describe --always +- OUTPUT_VARIABLE APP_PROJECT_VERSION +- OUTPUT_STRIP_TRAILING_WHITESPACE +- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.." +- ) +-elseif (NOT(APP_PROJECT_VERSION)) ++if (NOT(APP_PROJECT_VERSION)) + set(APP_PROJECT_VERSION "0.0.0") + endif () + string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}") +-- +2.29.0 + |