diff --git a/srcpkgs/linphone-desktop/patches/74f50933fd4eb3bdb29d9a766b249eb7c88c0bdd.patch b/srcpkgs/linphone-desktop/patches/74f50933fd4eb3bdb29d9a766b249eb7c88c0bdd.patch deleted file mode 100644 index 2b4c83d3ff..0000000000 --- a/srcpkgs/linphone-desktop/patches/74f50933fd4eb3bdb29d9a766b249eb7c88c0bdd.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 74f50933fd4eb3bdb29d9a766b249eb7c88c0bdd Mon Sep 17 00:00:00 2001 -From: Julien Wadel -Date: Sun, 5 Jul 2020 11:55:34 +0200 -Subject: [PATCH] Avoid to reduce window if it is already maximized - ---- - linphone-app/src/app/App.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp -index 199d8c9a..5a50057c 100644 ---- a/linphone-app/src/app/App.cpp -+++ b/linphone-app/src/app/App.cpp -@@ -405,7 +405,11 @@ void App::smartShowWindow (QQuickWindow *window) { - if (!window) - return; - window->setVisible(true); -- window->show();// Force show, maybe redundant with setVisible -+// Force show, maybe redundant with setVisible -+ if(window->visibility() == QWindow::Maximized)// Avoid to change visibility mode -+ window->showMaximized(); -+ else -+ window->show(); - window->raise();// Raise ensure to get focus on Mac - window->requestActivate(); - } --- -2.21.0 - diff --git a/srcpkgs/linphone-desktop/patches/version.patch b/srcpkgs/linphone-desktop/patches/version.patch new file mode 100644 index 0000000000..556061582d --- /dev/null +++ b/srcpkgs/linphone-desktop/patches/version.patch @@ -0,0 +1,26 @@ +--- linphone-desktop-4.3.2/linphone-app/CMakeLists.txt.orig 2021-12-08 16:02:45.190027494 +0100 ++++ linphone-desktop-4.3.2/linphone-app/CMakeLists.txt 2021-12-08 16:03:05.969026699 +0100 +@@ -21,18 +21,13 @@ + ################################################################################ + 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 ) +-bc_parse_full_version("${FULL_VERSION}" version_major version_minor version_patch identifiers metadata) ++set(FULL_VERSION 4.3.2) ++set(version_major 4) ++set(version_minor 3) ++set(version_patch 2) + + project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") +- ++find_package(bctoolbox CONFIG REQUIRED) + + if(ENABLE_BUILD_VERBOSE) + #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") diff --git a/srcpkgs/linphone-desktop/template b/srcpkgs/linphone-desktop/template index 3991291c0b..8699388aa9 100644 --- a/srcpkgs/linphone-desktop/template +++ b/srcpkgs/linphone-desktop/template @@ -1,10 +1,9 @@ # Template file for 'linphone-desktop' pkgname=linphone-desktop -version=4.2.1 -revision=2 +version=4.3.2 +revision=1 build_wrksrc="linphone-app" # The root cmake is glue code for their vendored libs build_style=cmake -configure_args="-DCMAKE_INSTALL_RPATH=OFF" hostmakedepends="qt5-qmake qt5-host-tools qt5-declarative" makedepends="bctoolbox-devel belcard-devel belle-sip-devel linphone-devel mediastreamer-devel qt5-declarative-devel qt5-quickcontrols2-devel @@ -15,7 +14,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://www.linphone.org/" distfiles="https://gitlab.linphone.org/BC/public/linphone-desktop/-/archive/${version}/linphone-desktop-${version}.tar.gz" -checksum=a9c520851ec40ebd6bc28b5ebc0e4d2b5f62ef3b53e5d60bb241c0b2bd56ad62 +checksum=dc7580816b5c289d9a4f21e9b3392a9b4a1a947c64ffbd6af504c8c01e3af111 replaces="linphone-gui>=0" CFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\"" CXXFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\"" @@ -29,6 +28,7 @@ linphone-gui_package() { # XXX: The cmake install does all kinds of stuff we don't want do_install() { vbin build/linphone + vinstall build/libapp-plugin.so 644 usr/lib vinstall build/linphone.desktop 644 usr/share/applications/ vinstall assets/images/linphone_logo.svg 644 usr/share/icons/hicolor/scalable/apps/ linphone.svg vinstall assets/linphonerc-factory 644 usr/share/linphone/