updpkg: pcr/linphone-desktop 4.2.3-1

Signed-off-by: David P <megver83@parabola.nu>

4 files changed, 52 insertions, 72 deletions

diff --git a/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch b/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch
index 8020c50e9..512a16398 100644
--- a/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch
+++ b/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch
@@ -1,7 +1,7 @@
-From 0b3528dc56f12f42f0039a22598cc04e80d6cd31 Mon Sep 17 00:00:00 2001
+From a8153863fe1f1b9a92cbdb2eeab28ff9bc249c85 Mon Sep 17 00:00:00 2001
 From: David P <megver83@parabola.nu>
 Date: Wed, 22 Jul 2020 17:26:39 -0400
-Subject: [PATCH 1/3] do not build linphone-sdk
+Subject: [PATCH 1/2] do not build linphone-sdk
 
 Signed-off-by: David P <megver83@parabola.nu>
 ---
@@ -112,5 +112,5 @@ index 7f7fd573..a69a04e8 100644
    endif ()
  endif ()
 -- 
-2.28.0
+2.29.0
 
diff --git a/pcr/linphone-desktop/0002-Fix-building-out-of-git.patch b/pcr/linphone-desktop/0002-Fix-building-out-of-git.patch
deleted file mode 100644
index 1ae0505be..000000000
--- a/pcr/linphone-desktop/0002-Fix-building-out-of-git.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9eebcb33ed8e56f6ec237b83d426c7d8c2b69e7b Mon Sep 17 00:00:00 2001
-From: David P <megver83@parabola.nu>
-Date: Wed, 22 Jul 2020 17:55:02 -0400
-Subject: [PATCH 2/3] Fix building out-of-git
-
-Based in https://build.opensuse.org/package/view_file/openSUSE:Factory/linphoneqt/linphoneqt-fix-no-git.patch
-
-Signed-off-by: David P <megver83@parabola.nu>
----
- linphone-app/src/app/AppController.cpp | 4 ++++
- linphone-app/src/config.h.cmake        | 2 ++
- 2 files changed, 6 insertions(+)
-
-diff --git a/linphone-app/src/app/AppController.cpp b/linphone-app/src/app/AppController.cpp
-index e502d9fd..012981d2 100644
---- a/linphone-app/src/app/AppController.cpp
-+++ b/linphone-app/src/app/AppController.cpp
-@@ -28,6 +28,10 @@
- 
- #include "AppController.hpp"
- 
-+#ifndef LINPHONE_QT_GIT_VERSION
-+#define LINPHONE_QT_GIT_VERSION LINPHONE_QT_VERSION
-+#endif
-+
- #include "components/other/desktop-tools/DesktopTools.hpp"
- // =============================================================================
- 
-diff --git a/linphone-app/src/config.h.cmake b/linphone-app/src/config.h.cmake
-index 093539e0..a4e7e25a 100644
---- a/linphone-app/src/config.h.cmake
-+++ b/linphone-app/src/config.h.cmake
-@@ -20,6 +20,8 @@
- *
- *******************************************************************************/
- 
-+#define LINPHONE_QT_VERSION "${PROJECT_VERSION}"
-+
- #cmakedefine APPLICATION_DESCRIPTION "${APPLICATION_DESCRIPTION}"
- #cmakedefine APPLICATION_ID "${APPLICATION_ID}"
- #cmakedefine APPLICATION_NAME "${APPLICATION_NAME}"
--- 
-2.28.0
-
diff --git a/pcr/linphone-desktop/0003-remove-bc_compute_full_version-usage.patch b/pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch
index 2484c87a8..ecec4ade0 100644
--- a/pcr/linphone-desktop/0003-remove-bc_compute_full_version-usage.patch
+++ b/pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch
@@ -1,13 +1,37 @@
-From 7cf21c4f00b4a77613f5922e00789e60ded77536 Mon Sep 17 00:00:00 2001
+From b7bbebb8bf6f4fe8d321d4ace84b5a62326e5b89 Mon Sep 17 00:00:00 2001
 From: David P <megver83@parabola.nu>
-Date: Mon, 3 Aug 2020 12:51:55 -0400
-Subject: [PATCH 3/3] remove bc_compute_full_version usage
+Date: Fri, 23 Oct 2020 16:44:17 -0300
+Subject: [PATCH 2/2] remove bc_compute_full_version usage
 
 ---
- linphone-app/build/CMakeLists.txt                    |  5 -----
- .../cmake_builder/linphone_package/CMakeLists.txt    | 12 +-----------
- 2 files changed, 1 insertion(+), 16 deletions(-)
+ 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
@@ -25,10 +49,10 @@ index 8ef03faa..97d94bd6 100644
  
  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..f8634e1b 100644
+index 9549b595..6b05379c 100644
 --- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
 +++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
-@@ -38,17 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui")
+@@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui")
  # ==============================================================================
  # Build package version.
  # ==============================================================================
@@ -41,12 +65,10 @@ index 9549b595..f8634e1b 100644
 -    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.."
 -  )
 -elseif (NOT(APP_PROJECT_VERSION))
--  set(APP_PROJECT_VERSION "0.0.0")
--endif ()
-+set(APP_PROJECT_VERSION "0.0.0")
++if (NOT(APP_PROJECT_VERSION))
+   set(APP_PROJECT_VERSION "0.0.0")
+ endif ()
  string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}")
- string(REPLACE "." ";" SPLITTED_LINPHONE_VERSION "${LINPHONE_VERSION}")
- list(LENGTH SPLITTED_LINPHONE_VERSION SPLITTED_LINPHONE_VERSION_LENGTH)
 -- 
-2.28.0
+2.29.0
 
diff --git a/pcr/linphone-desktop/PKGBUILD b/pcr/linphone-desktop/PKGBUILD
index 55e73aa6f..63b1b364c 100644
--- a/pcr/linphone-desktop/PKGBUILD
+++ b/pcr/linphone-desktop/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: David P. <megver83@parabola.nu>
 
 pkgname=linphone-desktop
-pkgver=4.2.2
+pkgver=4.2.3
 pkgrel=1
 pkgdesc='A free VoIP and video softphone based on the SIP protocol'
 arch=(x86_64 i686)
@@ -11,19 +11,21 @@ depends=(qt5-quickcontrols qt5-quickcontrols2 qt5-graphicaleffects qt5-svg qt5-t
 makedepends=(cmake python-pystache doxygen nasm yasm python-six)
 source=("https://gitlab.linphone.org/BC/public/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz"
         0001-do-not-build-linphone-sdk.patch
-        0002-Fix-building-out-of-git.patch
-        0003-remove-bc_compute_full_version-usage.patch
+        0002-remove-bc_compute_full_version-usage.patch
 )
-sha512sums=('736b3448f309e8286acfdf724b765fcc77cb9d092ba892fd38f88f7af431c50f784c399bf5688cfe6caf45d2e6cc6e7d0c5e01b991be07b237f2f6bda35f338c'
-            '7c1d1782d02da7b24ac1b39548a0b995d9abcfd883e3dfc0611f6431542ad7e873d785cf1e15033562818f0ce9ec1021d47d6b8ac5dc64530902b997f051c886'
-            '8f90eed36db84369b8b44e7004d67f7634c3ef9549304491b56a1c0b18d676ab46afa0322353d6919f7317b4f0f387972be25dcfd09621d54fe63d74e8a1f52f'
-            'c09bce9a5fb51519bde651a6f25187274b2cb561b8590b9cd849f88d0cd35c4a8d4698578fe75d453c8c82135b8f5cf8e0a58093706dcfcb7382d07928c8dba9')
+sha512sums=('d0f0fbd99bd8ab20d89b525ac4f38774974aefedb36b311b51190682ffdceedaed205e918c3685124497aa14d95dfdf1bd6c1c2675a1dd2452fed44d7b171bce'
+            '24f9849692ca1f937661dfaa89695da38d5c1713f42d364446568fdef3fca54cc195bf815111c7bf570e4520f15846ecd5d0cd44cefa380384bf37d74c69e9a9'
+            'c41551388e590844b06e0ff23ec079c5a10a67a6ec9b1aec27d2662e5e8b22d8cbceb601e0277365f2e9b0c004af06b6481248b296b7645007d964e16dac197f')
 
 prepare() {
   cd "$pkgname-$pkgver"
   patch -Np1 -i ../0001-do-not-build-linphone-sdk.patch
-  patch -Np1 -i ../0002-Fix-building-out-of-git.patch
-  patch -Np1 -i ../0003-remove-bc_compute_full_version-usage.patch
+  patch -Np1 -i ../0002-remove-bc_compute_full_version-usage.patch
+
+  # Fix building out-of-git
+  echo '#define LINPHONE_QT_GIT_VERSION "${PROJECT_VERSION}"' >> linphone-app/src/config.h.cmake
+  # Hardcode linphoneqt version
+  echo "project(linphoneqt VERSION $pkgver)" > linphone-app/linphoneqt_version.cmake
 }
 
 build() {   
@@ -33,8 +35,8 @@ build() {
   cmake "../$pkgname-$pkgver"
   make
 
-  sed '/linphone-sdk/d' -i linphone-app/cmake_builder/linphone_package/cmake_install.cmake
-  sed "s|$srcdir/build/OUTPUT|$pkgdir/usr|" -i cmake_install.cmake
+  sed -i '/linphone-sdk/d' linphone-app/cmake_builder/linphone_package/cmake_install.cmake
+  sed -i "s|$srcdir/build/OUTPUT|$pkgdir/usr|" cmake_install.cmake
 }
 
 package() {