pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch

   1 From 4849d5633b98e6d3514355436eab5ba537cbfd99 Mon Sep 17 00:00:00 2001
   2 From: David P <megver83@parabola.nu>
   3 Date: Fri, 23 Oct 2020 16:44:17 -0300
   4 Subject: [PATCH] remove bc_compute_full_version usage
   5
   6 ---
   7  linphone-app/CMakeLists.txt                           | 11 +----------
   8  linphone-app/build/CMakeLists.txt                     |  5 -----
   9  .../cmake_builder/linphone_package/CMakeLists.txt     | 10 +---------
  10  3 files changed, 2 insertions(+), 24 deletions(-)
  11
  12 diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt
  13 index de7f917f..ee14ff78 100644
  14 --- a/linphone-app/CMakeLists.txt
  15 +++ b/linphone-app/CMakeLists.txt
  16 @@ -21,17 +21,8 @@
  17  ################################################################################
  18  cmake_minimum_required(VERSION 3.1)
  19
  20 +include(linphoneqt_version.cmake)
  21  find_package(bctoolbox CONFIG)
  22 -set(FULL_VERSION )
  23 -bc_compute_full_version(FULL_VERSION)
  24 -set(version_major )
  25 -set(version_minor )
  26 -set(version_patch )
  27 -set(identifiers )
  28 -set(metadata )
  29 -bc_parse_full_version("${FULL_VERSION}" version_major version_minor version_patch identifiers metadata)
  30 -
  31 -project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}")
  32
  33
  34  if(ENABLE_BUILD_VERBOSE)
  35 diff --git a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt
  36 index 8ef03faa..97d94bd6 100644
  37 --- a/linphone-app/build/CMakeLists.txt
  38 +++ b/linphone-app/build/CMakeLists.txt
  39 @@ -46,11 +46,6 @@ set(CPACK_SOURCE_IGNORE_FILES
  40    "libmng.spec"
  41  )
  42
  43 -bc_compute_full_version(PROJECT_VERSION_BUILD)
  44 -if(PROJECT_VERSION_BUILD)
  45 -  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PROJECT_VERSION_BUILD}")
  46 -endif()
  47 -
  48  message("-- Package file name is ${CPACK_PACKAGE_FILE_NAME}")
  49
  50  set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
  51 diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
  52 index ac85c68a..e6af5a66 100644
  53 --- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
  54 +++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
  55 @@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui")
  56  # ==============================================================================
  57  # Build package version.
  58  # ==============================================================================
  59 -bc_compute_full_version(APP_PROJECT_VERSION)
  60 -if (GIT_EXECUTABLE AND NOT(APP_PROJECT_VERSION))
  61 -  execute_process(
  62 -    COMMAND ${GIT_EXECUTABLE} describe --always
  63 -    OUTPUT_VARIABLE APP_PROJECT_VERSION
  64 -    OUTPUT_STRIP_TRAILING_WHITESPACE
  65 -    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.."
  66 -  )
  67 -elseif (NOT(APP_PROJECT_VERSION))
  68 +if (NOT(APP_PROJECT_VERSION))
  69    set(APP_PROJECT_VERSION "0.0.0")
  70  endif ()
  71  string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}")
  72 --
  73 2.25.1
  74