[packages/linphoneqt] - fix bctoolbox 4.5 detection, rel 2

baggins baggins at pld-linux.org
Mon Jul 12 13:31:45 CEST 2021


commit 258e0208f68590c41c4e8fc0698840d9a34723b6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jul 12 13:31:18 2021 +0200

    - fix bctoolbox 4.5 detection, rel 2

 bctoolbox-4.5.patch | 18 ++++++++++++++++++
 linphoneqt.spec     |  6 ++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/linphoneqt.spec b/linphoneqt.spec
index f8b0b37..69b1f6a 100644
--- a/linphoneqt.spec
+++ b/linphoneqt.spec
@@ -6,12 +6,13 @@ Summary:	Free VoIP and video softphone based on SIP protocol
 Summary(pl.UTF-8):	Wolnodostępne oprogramowanie do VoIP i połączeń wideo oparte na protokole SIP
 Name:		linphoneqt
 Version:	4.1.1
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 Source0:	https://linphone.org/releases/sources/linphoneqt/%{name}-%{version}.tar.gz
 # Source0-md5:	0cf77a6e823a09ea765316ce536674cd
 Patch0:		%{name}-use-pkgconfig.patch
+Patch1:		bctoolbox-4.5.patch
 URL:		https://linphone.org/
 BuildRequires:	Qt5Concurrent-devel >= 5.9
 BuildRequires:	Qt5Core-devel >= 5.9
@@ -24,7 +25,7 @@ BuildRequires:	Qt5Svg-devel >= 5.9
 BuildRequires:	Qt5Test-devel >= 5.9
 #BuildRequires:	Qt5TextToSpeech-devel >= 5.9
 BuildRequires:	Qt5Widgets-devel >= 5.9
-BuildRequires:	bctoolbox-devel
+BuildRequires:	bctoolbox-devel >= 4.5
 BuildRequires:	belcard-devel
 BuildRequires:	cmake >= 3.1
 BuildRequires:	linphone-devel
@@ -55,6 +56,7 @@ protokole SIP.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
diff --git a/bctoolbox-4.5.patch b/bctoolbox-4.5.patch
new file mode 100644
index 0000000..3d78feb
--- /dev/null
+++ b/bctoolbox-4.5.patch
@@ -0,0 +1,18 @@
+--- linphoneqt-4.1.1/CMakeLists.txt~	2021-07-12 13:19:56.000000000 +0200
++++ linphoneqt-4.1.1/CMakeLists.txt	2021-07-12 13:20:57.419884701 +0200
+@@ -93,13 +93,13 @@
+ if (LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+   include("${EP_linphone_CONFIG_DIR}/LinphoneConfig.cmake")
+   include("${EP_linphone_CONFIG_DIR}/wrappers/cpp/LinphoneCxxConfig.cmake")
+-  include("${EP_bctoolbox_CONFIG_DIR}/BcToolboxConfig.cmake")
++  include("${EP_bctoolbox_CONFIG_DIR}/bctoolboxConfig.cmake")
+   include("${EP_belcard_CONFIG_DIR}/BelcardConfig.cmake")
+ else ()
+   include(FindPkgConfig)
+   pkg_search_module(LINPHONE REQUIRED linphone)
+   pkg_search_module(LINPHONECXX REQUIRED linphone++)
+-  find_package(BcToolbox REQUIRED)
++  find_package(bctoolbox REQUIRED)
+   pkg_search_module(BELCARD REQUIRED belcard)
+ endif ()
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/linphoneqt.git/commitdiff/258e0208f68590c41c4e8fc0698840d9a34723b6



More information about the pld-cvs-commit mailing list