File 0001-remove-dot-git-folder-dependency-and-encountered-bugs.patch of Package kimi-linphone-desktop-5.1.2-opensuse-fedora-archlinux-debian-ubuntu-raspbian
diff -U 3 -H -b -B -d -r -N -- a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt
--- a/linphone-app/CMakeLists.txt
+++ b/linphone-app/CMakeLists.txt
@@ -21,18 +21,174 @@
################################################################################
cmake_minimum_required(VERSION 3.1)
-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 )
+##############################################################
+#
+# Start Fix:
+# Fix error at compilation time on some systems like OpenSUSE build service-
+# Error wording:
+# ADD_LIBRARY called with SHARED option but the target platform does not
+# support dynamic linking.
+# Solution:
+# https://stackoverflow.com/questions/12264299/cmake-on-linux-target-platform-does-not-support-dynamic-linking
+message(STATUS "linphone_app/CMakeLists.txt line 33")
+message(STATUS "Applying patch to fix error: ADD_LIBRARY called with SHARED option but the target platform does not support dynamic linking.")
+message(STATUS "linphone_app/CMakeLists.txt line 35")
+
+# First we copy the functionality here, duplicating the code from BcToolboxCMakeUtils.cmake:
+# Start copy:
+function(bc_parse_full_version version major minor patch)
+ message("version: '${version}'")
+ if ("${version}" MATCHES "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)(-[.0-9A-Za-z-]+)?([+][.0-9A-Za-z-]+)?$")
+ set(${major} "${CMAKE_MATCH_1}" PARENT_SCOPE)
+ set(${minor} "${CMAKE_MATCH_2}" PARENT_SCOPE)
+ set(${patch} "${CMAKE_MATCH_3}" PARENT_SCOPE)
+ if (ARGC GREATER 4)
+ set(${ARGV4} "${CMAKE_MATCH_4}" PARENT_SCOPE)
+ endif()
+ if (ARGC GREATER 5)
+ set(${ARGV5} "${CMAKE_MATCH_5}" PARENT_SCOPE)
+ endif()
+ else()
+ message(FATAL_ERROR "invalid full version '${version}'")
+ endif()
+endfunction()
+
+function(bc_compute_full_version OUTPUT_VERSION)
+ find_program(GIT_EXECUTABLE git NAMES Git CMAKE_FIND_ROOT_PATH_BOTH)
+ if(GIT_EXECUTABLE)
+ execute_process(
+ COMMAND "${GIT_EXECUTABLE}" "describe"
+ OUTPUT_VARIABLE GIT_DESCRIBE_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ ERROR_QUIET
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+ )
+ # Git may fail because there is no .git folder
+ # cd linphone-sdk
+ # git describe
+ # gives for Linphone SDK: 5.2.98
+ # gives for Linphone APP: 5.1.2
+
+ if(GIT_DESCRIBE_VERSION)
+ message("We have GIT_DESCRIBE which gives us ${GIT_DESCRIBE_VERSION}")
+ else()
+ # Set this to be equal to Linphone APP version,
+ # not Linphone SDK version!
+ # set(GIT_DESCRIBE_VERSION "5.2.98") # Linphone SDK Version
+ # Not allowed to write 5.2.98-2 or 5.2.98-1-g54d3541
+ set(GIT_DESCRIBE_VERSION "5.1.2") # Linphone APP Version
+ message(STATUS "GIT_DESCRIBE_VERSION=${GIT_DESCRIBE_VERSION}")
+ endif()
+
+ # parse git describe version
+ if (NOT (GIT_DESCRIBE_VERSION MATCHES "^([0-9]+)[.]([0-9]+)[.]([0-9]+)(-alpha|-beta)?(-[0-9]+)?(-g[0-9a-f]+)?$"))
+ # Git may fail because there is no .git folder
+ # Change FATAL_ERROR to STATUS
+ # in order not to halt compilation.
+ message(STATUS "invalid git describe version: '${GIT_DESCRIBE_VERSION}'")
+ endif()
+ set(version_major ${CMAKE_MATCH_1})
+ set(version_minor ${CMAKE_MATCH_2})
+ set(version_patch ${CMAKE_MATCH_3})
+ if (CMAKE_MATCH_4)
+ string(SUBSTRING "${CMAKE_MATCH_4}" 1 -1 version_prerelease)
+ endif()
+ if (CMAKE_MATCH_5)
+ string(SUBSTRING "${CMAKE_MATCH_5}" 1 -1 version_commit)
+ endif()
+ if (CMAKE_MATCH_6)
+ string(SUBSTRING "${CMAKE_MATCH_6}" 2 -1 version_hash)
+ endif()
+
+ # interpret untagged hotfixes as pre-releases of the next "patch" release
+ if (NOT version_prerelease AND version_commit)
+ math(EXPR version_patch "${version_patch} + 1")
+ set(version_prerelease "pre")
+ endif()
+
+ # format full version
+ set(full_version "${version_major}.${version_minor}.${version_patch}")
+ if (version_prerelease)
+ string(APPEND full_version "-${version_prerelease}")
+ if (version_commit)
+ string(APPEND full_version ".${version_commit}+${version_hash}")
+ endif()
+ endif()
+
+ # check that the major and minor versions declared by the `project()` command are equal to the ones
+ # that have been found out while parsing `git describe` result.
+ if (PROJECT_VERSION)
+ set(short_git_version "${version_major}.${version_minor}")
+ set(short_project_version "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ if(NOT (short_project_version VERSION_EQUAL short_git_version))
+ # Git may fail because there is no .git folder
+ # Change FATAL_ERROR to STATUS
+ # in order not to halt compilation.
+ message(STATUS
+ "project and git version differ as you may be aware of (project: '${PROJECT_VERSION}', git: '${full_version}'): "
+ "major and minor version are not equal, but you know what you are doing so this is just for information to avoid halting the compilation."
+ )
+ endif()
+ endif()
+
+ set(${OUTPUT_VERSION} "${full_version}" PARENT_SCOPE)
+ endif()
+endfunction()
+# End copy from BcToolboxCMakeUtils.cmake
+
+# This is the root cause of the error and should be placed AFTER project(linphoneqt VERSION "5.1.2").
+# Move the line below to after calling project(linphoneqt VERSION "5.1.2") and comment out it here:
+# find_package(bctoolbox CONFIG)
+
+set(FULL_VERSION "5.1.2")
+set(FULL_VERSION_BC_COMPUTE )
+bc_compute_full_version(FULL_VERSION_BC_COMPUTE)
+message("-----------------------------------")
+message(STATUS "linphone_app/CMakeLists.txt line 146")
+message("Fix error: ADD_LIBRARY called with SHARED option but the target platform does not support dynamic linking.")
+message("Root cause: find_package(...) is called before project(linphoneqt VERSION 5.1.2)")
+message("FULL_VERSION : ${FULL_VERSION}")
+message("FULL_VERSION_BC_COMPUTE : ${FULL_VERSION_BC_COMPUTE}")
+message("-----------------------------------")
+message(STATUS "linphone_app/CMakeLists.txt line 152")
+
+set(version_major ) # Will become: x (from VERSION x.y.z=5.1.2)
+set(version_minor ) # Will become: y (from VERSION x.y.z=5.1.2)
+set(version_patch ) # Will become: z (from VERSION x.y.z=5.1.2)
+set(identifiers ) # Will for instance become: -alpha-35-geabe561d
+set(metadata ) # Will be empty
+
bc_parse_full_version("${FULL_VERSION}" version_major version_minor version_patch identifiers metadata)
+message(STATUS "--- bc_parse_full_version ---")
+message(STATUS "linphone_app/CMakeLists.txt line 163")
+set(FULL_VERSION_BC_PARSE "5.1.2")
+bc_parse_full_version("${FULL_VERSION_BC_PARSE}" version_major version_minor version_patch identifiers metadata)
+
+message(STATUS "FULL_VERSION_BC_PARSE : ${FULL_VERSION_BC_PARSE}")
+message(STATUS "version_major : ${version_major}")
+message(STATUS "version_minor : ${version_minor}")
+message(STATUS "version_patch : ${version_patch}")
+message(STATUS "identifiers : ${identifiers}")
+message(STATUS "metadata : ${metadata}")
+
+# Fix error: ADD_LIBRARY called with SHARED option but the target platform does not support dynamic linking.
+# The error occurs when project(linphoneqt VERSION "x.y.z") is defined after find_package(bctoolbox Config)
+# Move the following line to top before calling find_package and comment out it here, or move all find_package(...) below the following line:
project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}")
+# Moving find_package(...) calls to here, after project(...):
+message(STATUS "find_package(bctoolbox CONFIG)")
+message(STATUS "linphone_app/CMakeLists.txt line 180")
+find_package(bctoolbox CONFIG)
+message(STATUS "find_package(bctoolbox CONFIG) was successful.")
+message(STATUS "linphone_app/CMakeLists.txt line 183")
+message(STATUS "End fix error ADD_LIBRARY called with SHARED option but the target platform does not support dynamic linking.")
+message(STATUS "linphone_app/CMakeLists.txt line 186")
+#
+# End fix error ADD_LIBRARY called with SHARED option but the target platform does not support dynamic linking.
+#
+##############################################################
if(ENABLE_BUILD_VERBOSE)
#message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}")
diff -U 3 -H -b -B -d -r -N -- a/linphone-app/assets/icons/genicons_1.1.sh b/linphone-app/assets/icons/genicons_1.1.sh
--- a/linphone-app/assets/icons/genicons_1.1.sh
+++ b/linphone-app/assets/icons/genicons_1.1.sh
@@ -19,10 +19,12 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
+export SCRIPTDIR="$(cd "$(dirname "$0")" && pwd)"
+cd "$SCRIPTDIR"
+
for i in 16 22 24 32 64 128 256
do
mkdir -p hicolor/${i}x${i}/apps
inkscape -z --export-type=png --export-filename=hicolor/${i}x${i}/apps/icon.png -w $i -h $i ../images/linphone_logo.svg
done
convert -density 256x256 -background transparent ../images/linphone_logo.svg -define icon:auto-resize -colors 256 ../icon.ico
-png2icns ../../cmake_builder/linphone_package/macos/linphone.icns hicolor/16x16/apps/icon.png hicolor/32x32/apps/icon.png hicolor/128x128/apps/icon.png hicolor/256x256/apps/icon.png
diff -U 3 -H -b -B -d -r -N -- a/linphone-app/assets/images/linphone_logo.svg b/linphone-app/assets/images/linphone_logo.svg
--- a/linphone-app/assets/images/linphone_logo.svg
+++ b/linphone-app/assets/images/linphone_logo.svg
@@ -1,49 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- width="512"
- height="512"
- viewBox="0 0 512 512"
- fill="none"
- version="1.1"
- id="svg8"
- sodipodi:docname="linphone_logo.svg"
- inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:svg="http://www.w3.org/2000/svg">
- <defs
- id="defs12" />
- <sodipodi:namedview
- id="namedview10"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0.0"
- inkscape:pagecheckerboard="0"
- showgrid="false"
- inkscape:zoom="1.6269531"
- inkscape:cx="256"
- inkscape:cy="255.69268"
- inkscape:window-width="1920"
- inkscape:window-height="1163"
- inkscape:window-x="1920"
- inkscape:window-y="500"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg8" />
- <rect
- width="512"
- height="512"
- rx="50"
- fill="#FF5E00"
- id="rect2" />
- <path
- d="M136.974 166.579C136.974 166.579 107.974 206.579 112.474 224.58C112.319 223.882 131.474 203.579 131.474 203.579C132.474 209.079 178.974 222.58 178.974 222.58C185.148 226.515 187.276 229.341 188.474 235.58V259.58C204.537 269.574 219.292 272.89 254.974 275.08C292.887 273.464 308.546 270.106 322.474 259.58C322.474 259.58 320.974 241.079 322.474 234.579C323.974 228.079 327.303 224.362 332.474 222.58C351.767 218.166 361.29 213.337 379.474 204.079L399.474 224.58C396.435 202.04 391.212 189.564 375.474 167.58C362.98 153.302 354.969 145.814 338.474 133.58C320.542 122.984 310.592 118.939 292.974 114.08C262.394 107.818 245.536 107.837 215.974 114.08C197.861 119.541 188.833 123.661 175.474 133.58C175.474 133.58 124.974 104.579 118.474 109.579C111.974 114.579 136.974 166.579 136.974 166.579Z"
- fill="white"
- id="path4" />
- <path
- d="M171.5 321.5C148.272 311.332 135.686 303.651 114 286.5C119.214 308.087 124.076 319.453 136 338.5C148.706 355.695 156.513 363.368 171.5 374C187.708 385.124 197.428 389.987 216 396C232.684 400.01 241.987 401.288 258.5 401.5C275.337 400.657 284.074 398.822 298.5 395.5C314.412 389.159 322.518 385.161 336 377.5C358.355 390.12 386 404.5 390 398.5C394 392.5 372 344 372 344C386.673 322.985 392.675 308.833 398.5 285C378.414 300.757 365.365 309.951 340.5 321.5C309.742 333.632 291.828 337.528 258.5 338.5C219.673 337.823 200.725 333.981 171.5 321.5Z"
- fill="white"
- id="path6" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000">
+ <path fill="#f5f5f5" d="M485.4 999.7a2 2 0 0 1 1.2 0c.4.1 0 .2-.6.2s-1 0-.6-.2zm28 0a2 2 0 0 1 1.2 0c.4.1 0 .2-.6.2s-1 0-.6-.2zm-23.5-37.5a2 2 0 0 1 1.2 0c.4.1 0 .2-.6.2s-1 0-.6-.2zm19.2 0a2.9 2.9 0 0 1 1.5 0c.4.1 0 .2-.9.2-.8 0-1-.1-.6-.3zm9-.6a2.9 2.9 0 0 1 1.5 0c.4.2 0 .3-.9.3-.8 0-1-.1-.6-.3zm-47.2-.5 1 .1c.1.2-.2.3-.7.3-.6 0-.7-.2-.3-.3zm92.5-3.4a2 2 0 0 1 1.2 0c.4.1 0 .2-.6.2s-1 0-.6-.2zm60.5-12.5c.4-.2.8-.2 1 0 .1.2-.2.3-.7.3-.6 0-.7-.2-.3-.3zM615 842.5a260 260 0 0 1-69-19.4 484 484 0 0 1-82.5-49.4c-44.1-33.2-94-86.7-149.5-160.4a420.7 420.7 0 0 0-11.5-15.2 6 6 0 0 0-1.4-2.2 28 28 0 0 1-2.3-3.2 25.9 25.9 0 0 0-2.6-3.7c-1-1.2-2.2-3-2.7-4s-2.3-3.4-4-5.5a42.2 42.2 0 0 1-3.8-5.5c-.5-.9-3.1-5.3-6-9.7a571.6 571.6 0 0 1-30.3-52.6 570.6 570.6 0 0 1-25.7-56 122 122 0 0 0-3.5-8.5c-.9-1.4-7.2-21-9.9-30.8a269.5 269.5 0 0 1-10.9-84.4c1.7-29 8.2-51 21.4-72.1 5.6-9 8.7-13 17.2-21.6l7.8-7.9 3 4a517 517 0 0 1 5.6 7 181.5 181.5 0 0 0 7.1 9.1l5.3 7.1 6 7.8a183.3 183.3 0 0 0 6.8 8.7 57.1 57.1 0 0 0 2.6 3.5 586.2 586.2 0 0 1 8.4 10.8 260.3 260.3 0 0 0 15.5 20 44 44 0 0 1 2.8 3.5c.4.8 1.4 2 2.1 2.9l2 2.5 3.9 5a529.3 529.3 0 0 1 11.3 14.7 332.5 332.5 0 0 0 7 9 711.7 711.7 0 0 0 12 15.3c7.7 9.8 10.3 12.8 10.8 12.4.3-.1.5.2.5.8 0 1.2.6 2.1 7.3 10.5l6.1 8 1.6 2.1-2 4a24 24 0 0 0-2 4.6c0 .5-.2.8-.5.8s-.5.2-.4.4c0 .2-.4 2-1 3.9-4.3 13.2-1.2 35 7.4 52.2 14 27.8 70.3 104 112 151.5 7.3 8.2 19.8 20.7 26 26l5.5 4.6a81.5 81.5 0 0 0 22 12.8c0 1.3 13.9 3 17.4 2.3 1-.2 5.4-.4 9.7-.3l7.8.1 4 5.1c27 35 109 144.1 116 154.3 3.1 4.7 3 5-2.7 8.4a119 119 0 0 1-48.6 16.2c-7.4.7-22.7 1-29.1.5zm207-11.2a10.9 10.9 0 0 1 2-1.8l-1.5 1.8a10.9 10.9 0 0 1-2 1.7l1.5-1.8zm7.8-7.8c.5-.6 1-1 1.1-1 .1 0-.1.5-.7 1l-1.1 1c-.1 0 .2-.5.7-1zm-120.5-12.4c-3.4-2.2-4-2.8-39.1-48.4-53-68.6-86.2-113-87-116-.5-1.9 1.6-4.4 9.6-12 14-13.4 43.7-34.2 51.6-36.2 1.7-.4 2.4-.4 3.5.2 3 1.5 10.4 8.7 16.7 16.2a556 556 0 0 1 20.9 25.9l7.3 9.2c1 1.1 20.5 27 31.7 42 25.4 34.3 44.5 61.7 46.3 66.3l.8 2.2-1.7 2.9a232.2 232.2 0 0 1-54.2 47c-3.6 1.9-4.4 2-6.5.7zm147.2-17.3.9-.9c.8-.6.8-.6.2.2-.7.8-1.1 1.1-1.1.7zm-818-264.6c0-.6.2-.7.3-.3.2.4.2.8 0 1-.2.1-.3-.2-.3-.7zm-.4-9.7c0-1 .1-1.4.2-.9a4.1 4.1 0 0 1 0 1.8c0 .5-.2 0-.2-.9zm923.5-.3c0-.8.1-1 .3-.6a3 3 0 0 1 0 1.5c-.2.4-.3 0-.3-.9zm-15.5-3.5c0-1 .1-1.5.2-.8.2.6.2 1.5 0 2 0 .5-.2 0-.2-1.1zm-946-1.5c0-.8.1-1 .3-.6a3 3 0 0 1 0 1.5c-.2.4-.3 0-.3-.9zm999.5-.5c0-.8.1-1 .3-.6a3 3 0 0 1 0 1.5c-.2.4-.3 0-.3-.9zm-999.5-7c0-1 .1-1.4.2-.8.2.6.2 1.5 0 2 0 .5-.2 0-.2-1.1zm0-14.2c0-.7 0-1 .2-.6.2.3.2.9 0 1.2-.1.4-.2 0-.2-.6zm37.4-2.3c0-.6.2-.7.3-.3.2.4.2.8 0 1-.2.1-.3-.2-.3-.7zm908.7-4.7c0-2 0-2.9.2-1.9v3.8c-.1 1-.2.2-.2-1.9zM0 486c0-.7 0-1 .2-.6.2.3.2.9 0 1.2-.1.4-.2 0-.2-.6Zm38-5.3c0-.8.1-1 .3-.6a3 3 0 0 1 0 1.5c-.2.4-.3 0-.3-.9zm923.5-.2c0-.7 0-1 .2-.6.2.3.2.9 0 1.2-.1.4-.2 0-.2-.6zm-578-95.7a1006 1006 0 0 1-51.8-64.5 59423 59423 0 0 1-50.7-67 9661 9661 0 0 0-15.7-20.7c-6.9-9-7.7-10.4-7.2-11.2a339.8 339.8 0 0 1 54.7-39.8c5.6-2.9 14.3-6.6 15.2-6.6.4 0 1.8 1.5 3.2 3.4l5.4 7a4959.5 4959.5 0 0 1 22 28.9 1058.9 1058.9 0 0 0 12.3 16l6.3 8a148.4 148.4 0 0 1 4.4 6c.7 1.2 3 4 4.9 6.4a175.6 175.6 0 0 1 4.8 6.2l19.4 25.8a1633.4 1633.4 0 0 1 18.6 25l8 11.6c8.4 11.6 11.6 17.2 11.6 20.2 0 2.7-2.3 5.8-8.7 11.6a350.6 350.6 0 0 1-46 35.1c-5.6 3.3-6.3 3.2-10.6-1.3zM181 187.4l.9-.9c.8-.6.8-.6.2.2-.7.9-1.1 1.1-1.1.7zm96.9-78.7h1c.1.3-.2.4-.7.4-.6 0-.7-.2-.3-.3zm205.7-55h2.8c.7.2.1.2-1.4.2s-2.1 0-1.4-.2zm30 0h2.8c.7.2.1.2-1.4.2s-2.1 0-1.4-.2zM480 38.2a2 2 0 0 1 1.2 0c.4.1 0 .2-.6.2s-1-.1-.6-.2zm39.5 0c.4-.2.8-.2 1 0 .1.2-.2.3-.7.3-.6 0-.7-.2-.3-.3zm-30.5-.5a2 2 0 0 1 1.2 0c.4.1 0 .2-.6.2s-1-.1-.6-.2zm20.7 0a2.9 2.9 0 0 1 1.5 0c.4.1 0 .2-.9.2-.8 0-1-.1-.6-.3zM485.4 0a2 2 0 0 1 1.2 0c.4.2 0 .3-.6.3s-1-.1-.6-.2zm28.5 0a2 2 0 0 1 1.2 0c.4.2 0 .3-.6.3s-1-.1-.6-.2z"/>
+ <path fill="#00242c" d="M473.8 999a506.4 506.4 0 0 1-218.6-63.5A500 500 0 0 1 95.4 792.9a544.8 544.8 0 0 1-32.9-51.6 812.4 812.4 0 0 1-20-40.5 506.6 506.6 0 0 1-39-256 499.6 499.6 0 0 1 160.1-314.1A499.3 499.3 0 0 1 438.5 4.3c24.2-3 43-4 69-3.6 19.8.2 30.8.9 48 2.8 89.1 10 175 44.2 246.5 98.5a472 472 0 0 1 31.7 26.2c7.1 6.3 33 32.3 39.9 40a502.5 502.5 0 0 1 110.5 208.3A508.5 508.5 0 0 1 999 477a500.5 500.5 0 0 1-459.3 521 630.3 630.3 0 0 1-66 1z"/>
+ <path fill="#056e80" d="M501 38.6a392 392 0 0 0-45.8 1.3 473.2 473.2 0 0 0-126 30.8 450 450 0 0 0-55 26.8c-1 1-2.1 1.8-2.3 1.6-1.2-1.2-31.4 18-48 30.5a494.8 494.8 0 0 0-69.1 63.6A462.8 462.8 0 0 0 76 316.7a464.6 464.6 0 0 0-36 138.1c-1.8 17-2 69.2-.5 85.9a478.9 478.9 0 0 0 32.3 132.8A462.5 462.5 0 0 0 472.6 961c6.3.3 11.5.7 11.7.9.8.7 45.9-.7 57.6-1.9a453 453 0 0 0 143.2-36.8 642 642 0 0 0 53.2-27.5 470 470 0 0 0 145.4-138.5 491.3 491.3 0 0 0 53.7-108.5 463.3 463.3 0 0 0 17.1-231.6 463.4 463.4 0 0 0-57.8-153.8l-5.3-8.9c-7.5-12.5-25-36.5-38.7-52.8a480.7 480.7 0 0 0-88-80.3A467.8 467.8 0 0 0 576 44.2a357.3 357.3 0 0 0-75-5.6ZM498.5 54a377 377 0 0 1 87.1 7.7 466.7 466.7 0 0 1 96.2 29.8 284.4 284.4 0 0 1 26.5 13c8.4 4.3 7.5 3.8 24.7 14.2a450.4 450.4 0 0 1 146 144.6 440.8 440.8 0 0 1 67.1 237.3c0 34-1.5 50.4-7 81a521 521 0 0 1-25.4 87.8c-.6 1.6-1.6 3.9-6 13.6a28.2 28.2 0 0 0-2.1 5.6c0 .4-.8 1.8-1.6 3a32.8 32.8 0 0 0-3 5.8 35.5 35.5 0 0 1-2.8 5.7 80.7 80.7 0 0 0-3.8 6.8 455.4 455.4 0 0 1-45.1 69.3 493.8 493.8 0 0 1-81.4 78.7 446.7 446.7 0 0 1-218 86.1c-6 .7-19.6 1.6-30.3 2-18.4.8-33 .9-42.1.3A445 445 0 0 1 304 901.5a445.8 445.8 0 0 1-192-179.4 230.9 230.9 0 0 0-4-7.3 605.6 605.6 0 0 1-18.7-38l-3.5-9a439.5 439.5 0 0 1-32.2-157.5c-.8-36 2.2-69.3 9.1-102a487 487 0 0 1 30-92.8c2.1-4.8 13.1-27 14.3-28.9l13.6-23.3c.7-1.1 2.7-4.4 4.6-7.1a452.4 452.4 0 0 1 139.1-135.8 139.9 139.9 0 0 0 15-10.1c0 .3 6.5-2.8 14.4-6.8 21-10.7 20.4-10.4 33.4-15.6A449 449 0 0 0 339 83a398 398 0 0 1 36.9-12.1c25-7.2 48-11.7 76.9-15a355 355 0 0 1 45.7-2zm117.2 31.2c-2.2.4-5.6 8.7-7.3 17.7-4.4 22.6-6.5 55.8-12.3 197.2-4.4 108.7-6.3 135-10.2 141.1-1.3 2.2-2.2 2.3-3.9.6-3.3-3.4-4.2-15.4-5.7-80.5-1.3-54.8-2.4-81.4-3.7-93.6-2.5-22.7-9-32.4-14.4-21.6-4.5 8.9-5.7 25.7-7.8 105.8-1.2 44.3-2 61.5-3.3 64.7-.8 2-2.7 1.7-3.5-.5-1.2-3.2-1.7-11.7-3-49.6-1.6-52.5-2.2-59-5.7-65-3.4-5.8-6.6-6.4-9.8-1.6-4.2 6.2-5.3 16.5-7.1 68.2-1.8 51.7-2.8 60.9-6.7 62.4-2.2.8-5.4-2.3-6.8-6.6-3-8.8-4.3-22.8-10-106-5.8-83.8-8-102.3-13.7-113.7-2.3-4.5-4.5-6.1-7.4-5.4-4.4 1-7.5 8.4-22.7 53.1a520 520 0 0 1-20.1 53.9c-1 1.5-.4 2.7 6.5 12.5 4.2 6 8.7 13.1 10.1 15.9 2.3 4.7 2.4 5.1 1.3 7.7-.6 1.5-4 5.4-7.3 8.6a351 351 0 0 1-47.1 36 32 32 0 0 0-6.1 4.3 186 186 0 0 1-11.2 8.4c-7 5.1-8.3 6.3-8.3 8.2 0 1.2-.6 3.7-1.3 5.4-1 2.5-1.2 5-.9 12.8a81.8 81.8 0 0 0 9.5 35.7c14.2 28.5 72.1 106.8 113 152.5a97 97 0 0 0 9 9.4c.2-.4 1-8 2-17 1.9-19.5 3.4-27.8 5.8-32.7 2.9-5.8 7-5.5 8.7.7a280 280 0 0 1 3.2 45l.5 23.4 5.6 3.9c6 4.1 14.3 8.8 15.6 8.8.5 0 1-9.2 1.4-23 .6-26.5 1.7-44.4 3-48.1 1.6-5.1 3.4-2.6 4.3 6.3.4 4.6 2.9 59 2.9 65 0 2.1.1 2.2 4.4 2.2 4.8 0 4.6.1 16.9-11.3l3.9-3.7.7-26.7a464 464 0 0 1 3.3-54c.9-3.4 2.6-5.1 4.4-4.5 3.3 1.3 4.9 11.7 7.6 50.2.9 12 1.7 22 1.9 22 .7.8 8.7-4 17-10.3 18.4-13.8 32.9-22.3 36.3-21.2.9.3 3.8 2.5 6.5 5l4.8 4.4v-5c0-14.1 1.7-48 2.5-51.8 1.5-6.8 4.7-6.3 6.8 1.1a89.7 89.7 0 0 1 2 11c1 8.2 3 38.4 3.6 52.6l.4 10 9.6 12.2 9.5 12.1.5-3.5c.3-2 .8-13.4 1-25.5 1.7-67 3.5-88.3 7.6-92.9 1.6-1.7 5.7-1.9 8-.2a13 13 0 0 1 3.4 5c3.6 8.4 5.4 22.4 8.7 67.5 3 42.1 4.7 53 8 53 3 0 8.9-14.4 11.3-28 1.6-8.4 2.6-21 4.2-51.3 2.4-46.4 2.7-48 8.4-47.2 1.7.2 6 2.1 9.5 4.2A35 35 0 0 0 782 537c5.1 0 8-1.6 33.6-19l18.7-12.6h9.9c14.9 0 55.7-1.5 66.1-2.4 10.3-1 13.1-1.9 11.3-3.7-2.2-2.2-13-3-61.6-4.4l-26.4-.8-19-12.7c-18.8-12.7-27.6-17.6-33-18.6-4-.8-9.1.8-17.4 5.5a36.7 36.7 0 0 1-10.7 4.5c-3.1.4-3.5.2-4.3-1.8-.4-1.2-1.7-17.6-2.8-36.3-2.5-41.5-3.3-51.2-5.3-61.8-2.8-14.4-8.2-27.5-11.1-26.9-3 .6-5 13.6-7.5 48.9-4.2 59.8-6.5 73.3-13.3 77.4-3.4 2.1-4.9 2-7.2-.9-3.8-4.5-4.7-13.8-6.6-67.6-2.3-65.3-3.9-78.5-9.4-81.4-2-1.2-4.4 0-6 3-2.8 5.6-4.4 20-7 62.2-2.5 43.7-3.7 56.2-5.8 62.3-1.2 3.4-3.1 4.5-5 3-2-1.8-2 .2-4.5-148-1.2-68.4-2.2-86.5-5.8-104a54.7 54.7 0 0 0-7.7-19.7 3.9 3.9 0 0 0-6.3.4c-3.5 5.4-4.2 18.2-5.7 95.4-1.4 71.4-2.4 97.2-3.9 101.7-1.2 3.6-3.3 5.3-4.7 3.8-2.3-2.2-2.7-24.1-1.6-87.3 1.6-97.8 2-168.4 1-182.5-1.3-16.5-4.4-28-7.3-27.5zM384.6 212.6l-.5.4c-1 1.2-2.2 8-3 18.8a66 66 0 0 1-1 8.6c-.1.3-.8-.3-2.5-2.4a14.2 14.2 0 0 0-2-2l2.2 3 3.5 4.7a216.8 216.8 0 0 0 7.6 9.8 4 4 0 0 0-.3-1.2c-.4-1-.5-2.2-1-11.7-.8-18.8-1-22.2-1.7-25.3-.4-1.4-1-2.7-1.3-2.7zM220.5 448.4l-1 4.8c-1.8 9.8-4.2 15.9-7.4 19.2l-3 3.2-6.4-.3c-9.8-.5-11.7-1.7-16.4-11.2-4.2-8.2-5.8-9.8-8.9-8.1-1.5.8-3 3.5-10.1 19.1l-3 6.6-10.7 5.4a78.5 78.5 0 0 1-15 6.2c-2.5.4-14.7 1.4-27.2 2-29.4 1.6-33.6 2.2-33.6 4.8 0 2.1 5.5 2.9 28.3 3.7 32 1.3 34.5 1.6 42 6 3.4 2 7.6 4 9.2 4.5 4.4 1.4 8 6.2 12.4 16.3 4.8 11.1 6.2 12.9 9.6 12.9 3.3 0 4.8-1.6 6.6-7.3a17.1 17.1 0 0 1 17-12.1c3.5 0 9 2.8 9.8 5 .2.8.8 1.4 1.2 1.4 1.4 0 4 7 5.2 14 .6 3.7 1.7 13.3 2.4 21.3 1.6 18.2 2.6 25 4.5 29.3 1.8 4.2 4.2 4.6 8 1.3 5.4-4.5 8-12.3 11.8-37a469 469 0 0 1 4.1-23c1.3-5 4.3-8.6 6.5-7.8.6.3 1.2.3 1.2 0l-10.4-20.9a579.2 579.2 0 0 1-23.2-50.4z" style="-inkscape-stroke:none"/>
+ <path fill="#dfdfdf" d="M612.3 842.1c-.2-.2-2.2-.6-4.4-.8a75.3 75.3 0 0 1-9.7-1.7 338 338 0 0 1-43-13 279.2 279.2 0 0 0-5.2-2A474.9 474.9 0 0 1 445.5 759a552 552 0 0 1-17-15.1 990 990 0 0 1-99.4-111.4 1392.2 1392.2 0 0 1-16.4-21.5 93.3 93.3 0 0 0-4-5.2 65 65 0 0 1-3.3-4.3 173 173 0 0 0-4.7-6 99 99 0 0 0-8.3-12.4 194 194 0 0 1-15.6-24 526 526 0 0 1-29.7-53 512.7 512.7 0 0 1-23.1-50.6 363.5 363.5 0 0 1-22-79.8l-1.2-9.3c-.4-3.6-1-13-1-21-.9-44.2 11.6-79.3 37.5-106l8.5-8.8 13.4 17.3a6674.4 6674.4 0 0 1 28.4 36.7l9.7 12.6 9.9 13a67 67 0 0 0 3.8 4.8 768.2 768.2 0 0 0 10.5 13.6l5 6.3a2632.4 2632.4 0 0 0 28 35.7 288.6 288.6 0 0 1 7.6 9.7l6.6 8.7c2.2 2.6 3.9 5.5 3.9 6.3 0 .8-1 3.6-2.3 6.2a61.3 61.3 0 0 0-3.5 8.6 83.7 83.7 0 0 0 2.2 36c1.7 7.6 11.4 26.3 19.4 37.6 1.6 2 2.8 4.2 2.8 4.6 0 .5.4.8.8.8.5 0 .8.5.8 1.2 0 .6.3 1.2.7 1.4a33 33 0 0 1 4.5 6l6.4 9.3a569.9 569.9 0 0 1 4.2 6.1l3.7 5.2 14.6 19.4a1491.2 1491.2 0 0 0 59 73.7l6.6 7.3a194.4 194.4 0 0 0 43.3 35.9c5.6 2.8 12.8 3.8 26.4 3.8h13.4l17.8 23.3c28.8 37.8 92.7 123 98.6 131.7 6.7 9.5 7 8.9-6 15.5a127.4 127.4 0 0 1-36 12c-7.6 1-36.8 2-37.7 1.1zm-230.5-460a196.3 196.3 0 0 1-8.8-9.9 504 504 0 0 0-9-10.8 92.1 92.1 0 0 0-2.4-2.9 466 466 0 0 1-7.4-9.4 245.1 245.1 0 0 0-8.3-10.3c-.9-1-1.7-2-1.7-2.3A7309 7309 0 0 1 258.4 222c0-.9 9.9-9.3 20.2-17.3 17.8-13.8 42.3-28.3 48-28.5 2.8-.1 4.1 1.4 25.7 29.8l20.5 26.8 37.2 49.4c30.4 40.3 39.4 54.1 38.4 58.3-.7 2.8-7.3 9.7-17.5 18.2-18.8 15.6-38.2 29.2-41.7 29.2-1.1 0-3.8-2.2-7.4-5.9zm325.7 427a218 218 0 0 1-12.9-15.3C662.6 753 595 664 587.2 652.5l-4.2-6.3 2.4-3.4c2-2.9 12.7-12.8 20-18.7 13.8-11 37-25.5 40.7-25.5 2.2 0 11 8 19 17.3l7.6 8.9c4.7 5.2 50.3 65.3 67.3 88.8a589 589 0 0 1 29.5 43l1.9 3.9-2.1 3a248.2 248.2 0 0 1-26 26.5c-13.2 11.4-28 21.6-31.5 21.6-.8 0-2.7-1.2-4.3-2.6z" style="-inkscape-stroke:none"/>
+ </svg>
diff -U 3 -H -b -B -d -r -N -- a/linphone-app/assets/images/systemtray.svg b/linphone-app/assets/images/systemtray.svg
--- a/linphone-app/assets/images/systemtray.svg
+++ b/linphone-app/assets/images/systemtray.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path fill="#bebebe" d="M10.5 1.7c-.6 0-1 .4-1 1v3c0 .5.4.9 1 .9h.6c-.6 2.2-2.4 4-4.5 4.5v-.6c0-.5-.4-1-1-1H2.7a1 1 0 0 0-1 1V12a2.3 2.3 0 0 0 2.4 2.4h.6c5.3 0 9.5-4.3 9.5-9.6v-.6A2.3 2.3 0 0 0 12 1.7Zm0 0"/>
+</svg>
diff -U 3 -H -b -B -d -r -N -- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
--- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
+++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
@@ -48,7 +48,27 @@
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.."
)
elseif (NOT(APP_PROJECT_VERSION))
- set(APP_PROJECT_VERSION "0.0.0")
+ # Start Fix:
+ message(STATUS "linphone_app/cmake_builder/linphone_package/CMakeLists.txt line 51")
+ # .git folder may be absent
+ # Hard code this to Linphone version 5.0.9
+ message(STATUS "Fix for missing .git folder:")
+ message(STATUS "Hard code APP_PROJECT_VERSION=5.0.9")
+ # Suggestion for improvement:
+ # Remove bctoolbox dependency on git data.
+ # Enable to have a text file somewhere
+ # where all the git variables can be read by cmak
+ # when .git folder is not presetn.
+ # set(APP_PROJECT_VERSION "0.0.0")
+ set(APP_PROJECT_VERSION "5.0.9")
+ message(STATUS "APP_PROJECT_VERSION=${APP_PROJECT_VERSION}")
+ message(STATUS "linphone_app/cmake_builder/linphone_package/CMakeLists.txt line 64")
+ # Suggestion:
+ # Fix CPACK capability to directly create packages for major linux distributions
+ # such as Ubuntu, Debian, Fedora, OpenSUSE Tumbleweed, Arch.
+ # It's more fun to call people if every distribution is supported.
+ # The software should work on any linux ideally.
+ # End Fix
endif ()
@@ -305,6 +325,7 @@
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../assets/qt.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/../../qt.conf" @ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../../qt.conf" DESTINATION "${CMAKE_INSTALL_BINDIR}")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../assets/images/linphone_logo.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps/" RENAME "${EXECUTABLE_NAME}.svg")
+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../assets/images/systemtray.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/web/" RENAME "${EXECUTABLE_NAME}systemtray.svg")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../assets/linphonerc-factory" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${EXECUTABLE_NAME}")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../assets/assistant" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${EXECUTABLE_NAME}" USE_SOURCE_PERMISSIONS)
diff -U 3 -H -b -B -d -r -N -- a/linphone-app/resources.qrc b/linphone-app/resources.qrc
--- a/linphone-app/resources.qrc
+++ b/linphone-app/resources.qrc
@@ -560,6 +560,7 @@
<file>ui/views/App/Styles/Settings/SettingsUiStyle.qml</file>
<file>ui/views/App/Styles/Settings/SettingsWindowStyle.qml</file>
<file>assets/images/linphone_logo.svg</file>
+ <file>assets/images/systemtray.svg</file>
<file>ui/dev-modules/Units/Units.qml</file>
<file>assets/icon.ico</file>
</qresource>
diff -U 3 -H -b -B -d -r -N -- a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp
--- a/linphone-app/src/app/App.cpp
+++ b/linphone-app/src/app/App.cpp
@@ -899,7 +899,10 @@
menu->addAction(quitAction);
if(!mSystemTrayIcon)
systemTrayIcon->setContextMenu(menu);// This is a Qt bug. We cannot call setContextMenu more than once. So we have to keep an instance of the menu.
- systemTrayIcon->setIcon(QIcon(Constants::WindowIconPath));
+ /*
+ * Use easier to see icon
+ */
+ systemTrayIcon->setIcon(QIcon(Constants::SystemTrayIconPath));
systemTrayIcon->setToolTip(APPLICATION_NAME);
systemTrayIcon->show();
if(!mSystemTrayIcon)
diff -U 3 -H -b -B -d -r -N -- a/linphone-app/src/app/AppController.cpp b/linphone-app/src/app/AppController.cpp
--- a/linphone-app/src/app/AppController.cpp
+++ b/linphone-app/src/app/AppController.cpp
@@ -35,8 +35,32 @@
#include "utils/Constants.hpp"
// =============================================================================
+// Start description of difficulties:
+// STATUS: Clean-up of the added modification cod
+// BcToolbox has to work without .git folder and therefore each
+// place that requires .git folder information must not halt the
+// compilation in abscence of .git folder
+// Reason: OBS OpenSUSE build service (https://build.opensuse.org)
+// has no possibility to include git files to run commands like:
+// git describe
+// because the tar file does not contain any .git directory.
+// TODO: To be able to compile the software, each part dependent on git
+// must also compile if .git folder is not present.
+// TODO: Somehow implement:
+// git describe --always
+// git describe --abbrev=0
+// git rev-parse <branch>..HEAD
+// git rev-list --count <branch>..HEAD
+// to work without the presence of .git folder, which usually is very large.
+// A possible solution would be to supply a text file with the information that
+// git describe is supposed to output if .git folder was present.
+// End description of difficulties
using namespace std;
+// Fix for compilation error: LINPHONE_QT_GIT_VERSION is not defined
+// std::optional<string> LINPHONE_QT_GIT_VERSION;
+// End Fix
+
AppController::AppController (int &argc, char *argv[]) {
DesktopTools::init();
QT_REQUIRE_VERSION(argc, argv, Constants::ApplicationMinimalQtVersion)
diff -U 3 -H -b -B -d -r -N -- a/linphone-app/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp b/linphone-app/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp
--- a/linphone-app/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp
+++ b/linphone-app/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp
@@ -44,7 +44,7 @@
}
EventCountNotifier::EventCountNotifier (QObject *parent) : AbstractEventCountNotifier(parent) {
- QSvgRenderer renderer((QString(Constants::WindowIconPath)));
+ QSvgRenderer renderer((QString(Constants::SystemTrayIconPath)));
if (!renderer.isValid())
qFatal("Invalid SVG Image.");
@@ -91,7 +91,7 @@
// Draw background.
{
- p.setBrush(App::getInstance()->getColorListModel()->addImageColor("Logo_tray_blink_bg", Constants::WindowIconPath,"b")->getColor());
+ p.setBrush(App::getInstance()->getColorListModel()->addImageColor("Logo_tray_blink_bg", Constants::SystemTrayIconPath,"b")->getColor());
p.drawEllipse(QPointF(width / 2, height / 2), IconCounterBackgroundRadius, IconCounterBackgroundRadius);
}
@@ -101,7 +101,7 @@
font.setPixelSize(IconCounterTextPixelSize);
p.setFont(font);
- p.setPen(QPen(App::getInstance()->getColorListModel()->addImageColor("Logo_tray_blink_fg", Constants::WindowIconPath,"ai")->getColor(), 1));
+ p.setPen(QPen(App::getInstance()->getColorListModel()->addImageColor("Logo_tray_blink_fg", Constants::SystemTrayIconPath,"ai")->getColor(), 1));
p.drawText(QRect(0, 0, width, height), Qt::AlignCenter, QString::number(n));
}
diff -U 3 -H -b -B -d -r -N -- a/linphone-app/src/utils/Constants.cpp b/linphone-app/src/utils/Constants.cpp
--- a/linphone-app/src/utils/Constants.cpp
+++ b/linphone-app/src/utils/Constants.cpp
@@ -1,6 +1,7 @@
#include "Constants.hpp"
constexpr char Constants::WindowIconPath[];
+constexpr char Constants::SystemTrayIconPath[];
constexpr char Constants::DefaultLocale[];
constexpr char Constants::LanguagePath[];
diff -U 3 -H -b -B -d -r -N -- a/linphone-app/src/utils/Constants.hpp b/linphone-app/src/utils/Constants.hpp
--- a/linphone-app/src/utils/Constants.hpp
+++ b/linphone-app/src/utils/Constants.hpp
@@ -108,6 +108,7 @@
static constexpr char LinphoneDomain[] = "sip.linphone.org"; // Use for checking if config are a Linphone
static constexpr char WindowIconPath[] = ":/assets/images/linphone_logo.svg";
+ static constexpr char SystemTrayIconPath[] = ":/assets/images/systemtray.svg";
static constexpr char ApplicationMinimalQtVersion[] = "5.10.0";
static constexpr char DefaultConferenceURI[] = "sip:conference-factory@sip.linphone.org"; // Default for a Linphone account
static constexpr char DefaultVideoConferenceURI[] = "sip:videoconference-factory@sip.linphone.org"; // Default for a Linphone account
diff -U 3 -H -b -B -d -r -N -- a/linphone-sdk/bctoolbox/cmake/BcToolboxCMakeUtils.cmake b/linphone-sdk/bctoolbox/cmake/BcToolboxCMakeUtils.cmake
--- a/linphone-sdk/bctoolbox/cmake/BcToolboxCMakeUtils.cmake
+++ b/linphone-sdk/bctoolbox/cmake/BcToolboxCMakeUtils.cmake
@@ -22,6 +22,27 @@
set(BCTOOLBOX_CMAKE_UTILS_DIR "${CMAKE_CURRENT_LIST_DIR}")
+# Start description of difficulties:
+# STATUS: Clean-up of the added modification cod
+# BcToolbox has to work without .git folder and therefore each
+# place that requires .git folder information must not halt the
+# compilation in abscence of .git folder
+# Reason: OBS OpenSUSE build service (https://build.opensuse.org)
+# has no possibility to include git files to run commands like:
+# git describe
+# because the tar file does not contain any .git directory.
+# TODO: To be able to compile the software, each part dependent on git
+# must also compile if .git folder is not present.
+# TODO: Somehow implement:
+# git describe --always
+# git describe --abbrev=0
+# git rev-parse <branch>..HEAD
+# git rev-list --count <branch>..HEAD
+# to work without the presence of .git folder, which usually is very large.
+# A possible solution would be to supply a text file with the information that
+# git describe is supposed to output if .git folder was present.
+# End description of difficulties
+
macro(bc_init_compilation_flags CPP_FLAGS C_FLAGS CXX_FLAGS STRICT_COMPILATION)
set(${CPP_FLAGS} )
set(${C_FLAGS} )
@@ -104,7 +125,12 @@
)
endif()
if (NOT PROJECT_VERSION_BUILD)
- set(PROJECT_VERSION_BUILD 0)
+ # Start fix
+ # git rev-list --count --branches master
+ # gives: 2300 (assumed: no need to change it really, makes no real difference)
+ #set(PROJECT_VERSION_BUILD 0)
+ set(PROJECT_VERSION_BUILD 2300)
+ # End fix
endif()
endmacro()
@@ -131,6 +157,10 @@
endmacro()
# Rules are following https://semver.org/
+# Start Fix:
+# function(bc_compute_full_version OUTPUT_VERSION)
+# need to be rewritten so it works when .git folder is missing.
+# End Fix
function(bc_compute_full_version OUTPUT_VERSION)
find_program(GIT_EXECUTABLE git NAMES Git CMAKE_FIND_ROOT_PATH_BOTH)
if(GIT_EXECUTABLE)
@@ -141,10 +171,29 @@
ERROR_QUIET
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
)
+ # Start Fix:
+ # Git may fail because there is no .git folder
+ # cd linphone-sdk
+ # git describe
+ # gives: 5.2.98
+ if(GIT_DESCRIBE_VERSION)
+ message("We have GIT_DESCRIBE which gives us ${GIT_DESCRIBE_VERSION}")
+ else()
+ message(STATUS "We probably miss .git folder ...")
+ message(STATUS "Fix: hard code GIT_DESCRIBE_VERSION to 5.2.98")
+ set(GIT_DESCRIBE_VERSION "5.2.98")
+ message(STATUS "GIT_DESCRIBE_VERSION=${GIT_DESCRIBE_VERSION}")
+ message(STATUS "End Fix BcToolboxMakeUtils.cmake line 186")
+ endif()
+ # End Fix
# parse git describe version
if (NOT (GIT_DESCRIBE_VERSION MATCHES "^([0-9]+)[.]([0-9]+)[.]([0-9]+)(-alpha|-beta)?(-[0-9]+)?(-g[0-9a-f]+)?$"))
- message(FATAL_ERROR "invalid git describe version: '${GIT_DESCRIBE_VERSION}'")
+ # Start Fix:
+ # Git may fail because there is no .git folder
+ # message(FATAL_ERROR "invalid git describe version: '${GIT_DESCRIBE_VERSION}'")
+ message(STATUS "invalid git describe version: '${GIT_DESCRIBE_VERSION}'")
+ # End Fix
endif()
set(version_major ${CMAKE_MATCH_1})
set(version_minor ${CMAKE_MATCH_2})
@@ -180,10 +229,21 @@
set(short_git_version "${version_major}.${version_minor}")
set(short_project_version "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
if(NOT (short_project_version VERSION_EQUAL short_git_version))
- message(FATAL_ERROR
- "project and git version are not compatible (project: '${PROJECT_VERSION}', git: '${full_version}', at: '${CMAKE_CURRENT_SOURCE_DIR}'): "
- "major and minor version are not equal !"
+ # Start Fix:
+ # Git may fail because there is no .git folder
+ # When .git folder is not present,
+ # we cannot dynamically control version checks.
+ # Instead we have to know that everything is compatible.
+ # When .git folder is not present,
+ # change the FATAL_ERROR to STATUS to avoid cmake to
+ # terminate compilation:
+ #message(FATAL_ERROR
+ #"project and git version are not compatible (project: '${PROJECT_VERSION}', git: '${full_version}'): "
+ message(STATUS
+ "project and git version differ as you may be aware of (project: '${PROJECT_VERSION}', git: '${full_version}'): "
+ "major and minor version are not equal, but you know what you are doing so this is just for information to avoid halting the compilation."
)
+ # End Fix
endif()
endif()
@@ -246,7 +306,26 @@
set(${ARGV5} "${CMAKE_MATCH_5}" PARENT_SCOPE)
endif()
else()
- message(FATAL_ERROR "invalid full version '${version}'")
+ # Start Fix:
+ message("bc_parse_full_version alpha format example: 5.2.98-alpha.1-gabcdefab")
+ message("bc_parse_full_version beta format example: 5.2.98-beta.1-gabcdefab")
+ message("bc_parse_full_version beta format example: 5.2.98-beta-1-gabcdefab")
+ message("bc_parse_full_version release format example: 5.2.98")
+ # Not allowed to write 5.2.98-2 or 5.2.98-2-g1234567
+ set(${version} "5.2.98")
+ set(${major} "5") # from (VERSION 5.2.98)
+ set(${minor} "2") # from (VERSION 5.2.98)
+ set(${patch} "98") # from (VERSION 5.2.98)
+ # set(${ARGV4} "-alpha.1-gabcdefab")
+ # Set empty for release:
+ set(${ARGV4} "")
+ # set(${ARGV4} "-2-ga73267191")
+ # Last argument appears to always be empty in every occasion.
+ set(${ARGV5} "")
+ # To avoid halting the compilation when .git folder is missing:
+ # message(FATAL_ERROR "invalid full version '${version}'")
+ message(STATUS "invalid full version '${version}'")
+ # End Fix
endif()
endfunction()
