[packages/linphoneqt] - builds now

qboosh qboosh at pld-linux.org
Mon Jun 17 21:13:58 CEST 2019


commit 81f2d33fff70e0b58e8da273e92ca88cd491983d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Jun 17 21:14:55 2019 +0200

    - builds now

 linphoneqt-use-pkgconfig.patch | 11 +++++------
 linphoneqt.spec                |  7 +++++--
 2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/linphoneqt.spec b/linphoneqt.spec
index b8030f1..f8b0b37 100644
--- a/linphoneqt.spec
+++ b/linphoneqt.spec
@@ -6,7 +6,7 @@ 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:	0.1
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 Source0:	https://linphone.org/releases/sources/linphoneqt/%{name}-%{version}.tar.gz
@@ -28,6 +28,7 @@ BuildRequires:	bctoolbox-devel
 BuildRequires:	belcard-devel
 BuildRequires:	cmake >= 3.1
 BuildRequires:	linphone-devel
+BuildRequires:	linphone-c++-devel
 BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	qt5-build >= 5.9
 BuildRequires:	qt5-linguist >= 5.9
@@ -61,6 +62,8 @@ cd build
 %cmake .. \
 	%{?with_dbus:-DENABLE_DBUS=ON}
 
+echo '#define LINPHONE_QT_GIT_VERSION "%{version}"' > gitversion.h
+
 %{__make}
 
 %install
@@ -79,4 +82,4 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/linphone-tester
 %{_datadir}/linphone
 %{_desktopdir}/linphone.desktop
-%{_iconsdir}/hicolor/scalable/apps/linphone_logo.svg
+%{_iconsdir}/hicolor/scalable/apps/linphone.svg
diff --git a/linphoneqt-use-pkgconfig.patch b/linphoneqt-use-pkgconfig.patch
index f8544a9..6a2631e 100644
--- a/linphoneqt-use-pkgconfig.patch
+++ b/linphoneqt-use-pkgconfig.patch
@@ -6,13 +6,12 @@
  else ()
 -  find_package(Linphone REQUIRED)
 -  find_package(LinphoneCxx REQUIRED)
--  find_package(BcToolbox REQUIRED)
--  find_package(Belcard REQUIRED)
 +  include(FindPkgConfig)
-+  pkg_search_module(Linphone REQUIRED linphone)
-+  pkg_search_module(LinphoneCxx REQUIRED linphone)
-+  pkg_search_module(BcToolbox REQUIRED bctoolbox)
-+  pkg_search_module(Belcard REQUIRED belcard)
++  pkg_search_module(LINPHONE REQUIRED linphone)
++  pkg_search_module(LINPHONECXX REQUIRED linphone++)
+   find_package(BcToolbox REQUIRED)
+-  find_package(Belcard REQUIRED)
++  pkg_search_module(BELCARD REQUIRED belcard)
  endif ()
  
  set(SOURCES
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/linphoneqt.git/commitdiff/81f2d33fff70e0b58e8da273e92ca88cd491983d



More information about the pld-cvs-commit mailing list