summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrealgagu2018-06-26 22:01:12 -0500
committerfrealgagu2018-06-26 22:01:12 -0500
commit69af5be673be5c63809cd9e34681a23d0bbae43b (patch)
treec1cbe7de48cb3d623d6d7e23ebc7f593ab80b103
parentf92a2e0a393a0c885f8d4afac8671460b1620d2b (diff)
downloadaur-69af5be673be5c63809cd9e34681a23d0bbae43b.tar.gz
Using relative paths
Diffstat
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD34
-rw-r--r--linphone.desktop2
-rw-r--r--linphone.patch14
4 files changed, 47 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1c2008f7b3b7..5bfb5332ec6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linphone-desktop-all-git
pkgdesc = A free VoIP and video softphone based on the SIP protocol (Installed in /opt with all deps included).
pkgver = 4.1.1.r415.efa3e107
- pkgrel = 1
+ pkgrel = 3
url = https://www.linphone.org/
arch = x86_64
license = GPL2
@@ -18,14 +18,17 @@ pkgbase = linphone-desktop-all-git
depends = qt5-quickcontrols2
depends = qt5-svg
depends = qt5-tools
+ conflicts = linphone-dekstop
source = linphone-desktop::git://git.linphone.org/linphone-desktop
+ source = linphone.desktop
source = mediastreamer2.patch
source = belle-sip.patch
source = linphone.patch
sha256sums = SKIP
+ sha256sums = 346d983f503873811b3a4f72772e5afe4990275526c9e15c1b5cde2ad69a0544
sha256sums = bc0589eb2739aee429db9c67aa4308fcd817324ef5248b1766efee717798a900
sha256sums = 8a365864cfa8c6eb517701bcb2a2a7d51009bf504c104884ed3fbd05a36b3a84
- sha256sums = 1db32dff8a93d7508dbbb7d293860f72a33a54da3e3499f5a5535d2a351a88ce
+ sha256sums = 2657947c9311cdb3fd5167526943346bccd05a9433a242a280d9ed7f49b6ae6d
pkgname = linphone-desktop-all-git
diff --git a/PKGBUILD b/PKGBUILD
index 6eab242cf314..c84497e0e35c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=linphone-desktop-all-git
pkgver=4.1.1.r415.efa3e107
-pkgrel=2
+pkgrel=3
pkgdesc="A free VoIP and video softphone based on the SIP protocol (Installed in /opt with all deps included)."
arch=("x86_64")
url="https://www.${pkgname%-desktop-all-git}.org/"
@@ -16,10 +16,10 @@ source=("${pkgname%-all-git}::git://git.${pkgname%-desktop-all-git}.org/${pkgnam
"belle-sip.patch"
"${pkgname%-desktop-all-git}.patch")
sha256sums=("SKIP"
- "08c3c4620f4734c9d3a4f1f1b2ff99ee6ddbf27f23505e670e4930733051eb43"
+ "346d983f503873811b3a4f72772e5afe4990275526c9e15c1b5cde2ad69a0544"
"bc0589eb2739aee429db9c67aa4308fcd817324ef5248b1766efee717798a900"
"8a365864cfa8c6eb517701bcb2a2a7d51009bf504c104884ed3fbd05a36b3a84"
- "1db32dff8a93d7508dbbb7d293860f72a33a54da3e3499f5a5535d2a351a88ce")
+ "2657947c9311cdb3fd5167526943346bccd05a9433a242a280d9ed7f49b6ae6d")
prepare() {
cd "${srcdir}/${pkgname%-all-git}"
@@ -49,7 +49,7 @@ build() {
msg2 "Preparing build..."
./prepare.py -c
- ./prepare.py --list-cmake-variables
+ ./prepare.py --list-cmake-variables -DENABLE_RELATIVE_PREFIX=YES
msg2 "Building..."
make
@@ -67,4 +67,30 @@ package() {
install -d "${pkgdir}/usr/share"
mv "${pkgdir}/opt/${pkgname%-all-git}/share/icons" "${pkgdir}/usr/share"
+
+ #cp -r "OUTPUT/desktop" "${pkgdir}/usr"
+ #Conflicting packages if installed in /usr
+ #bcmatroska2-git
+ #bctoolbox-git
+ #belcard-git
+ #belle-sip-git
+ #belr-git
+ #bzrtp-git
+ #ffmpeg
+ #gsm
+ #libsrtp
+ #libvpx
+ #libxml2
+ #linphone-desktop-git
+ #linphone-git
+ #mbedtls
+ #mediastreamer-git
+ #minizip-git
+ #opus
+ #ortp-git
+ #speex
+ #speexdsp
+ #sqlite
+ #v4l-utils
+ #zlib
}
diff --git a/linphone.desktop b/linphone.desktop
index bc3f743e84a4..81961d1abcd8 100644
--- a/linphone.desktop
+++ b/linphone.desktop
@@ -3,7 +3,7 @@ Name=Linphone Desktop
GenericName=SIP Phone
Comment=Linphone is a libre SIP client
Type=Application
-Exec=LD_LIBRARY_PATH=/opt/linphone-desktop/lib64 /opt/linphone-desktop/bin/linphone %u
+Exec=/opt/linphone-desktop/bin/linphone %u
Icon=linphone
Terminal=false
Categories=Network;Telephony;
diff --git a/linphone.patch b/linphone.patch
index 31e2967b36ab..ef730da9afd8 100644
--- a/linphone.patch
+++ b/linphone.patch
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 60350bc42..fa5d36835 100644
+index 60350bc42..5c1dc4bf3 100644
--- a/submodules/linphone/CMakeLists.txt
+++ b/submodules/linphone/CMakeLists.txt
@@ -37,7 +37,7 @@ string(REPLACE ";" " " LINPHONE_ALL_LANGS "${LINPHONE_ALL_LANGS_LIST}")
@@ -11,11 +11,13 @@ index 60350bc42..fa5d36835 100644
option(ENABLE_CONSOLE_UI "Turn on or off compilation of console interface." YES)
option(ENABLE_CSHARP_WRAPPER "Build the C# wrapper for Liblinphone." OFF)
-@@ -51,14 +51,14 @@ option(ENABLE_JAVADOC "Add a target to generate documentation for Java API" NO)
+@@ -50,20 +50,20 @@ option(ENABLE_GTK_UI "Turn on or off compilation of gtk interface." NO)
+ option(ENABLE_JAVADOC "Add a target to generate documentation for Java API" NO)
option(ENABLE_LDAP "Enable LDAP support." NO)
option(ENABLE_NLS "Build with internationalisation support" YES)
- option(ENABLE_RELATIVE_PREFIX "Find resources relatively to the installation directory." NO)
+-option(ENABLE_RELATIVE_PREFIX "Find resources relatively to the installation directory." NO)
-option(ENABLE_ROOTCA_DOWNLOAD "Download rootca.pem at build time." YES)
++option(ENABLE_RELATIVE_PREFIX "Find resources relatively to the installation directory." YES)
+option(ENABLE_ROOTCA_DOWNLOAD "Download rootca.pem at build time." NO)
option(ENABLE_SOCI_STORAGE "Turn on compilation soci storage, for messages, contacts, history" YES)
option(ENABLE_SQLITE_STORAGE "Turn on compilation sqlite storage, for messages, contacts, history" YES)
@@ -29,3 +31,9 @@ index 60350bc42..fa5d36835 100644
option(ENABLE_UPDATE_CHECK "Enable update check." NO)
option(ENABLE_VCARD "Turn on compilation of vcard4 support." YES)
option(ENABLE_VIDEO "Build with video support." YES)
+
+-cmake_dependent_option(ENABLE_LIME "Enable Instant Messaging Encryption." YES "ENABLE_SQLITE_STORAGE" NO)
++cmake_dependent_option(ENABLE_LIME "Enable Instant Messaging Encryption." YES "ENABLE_SQLITE_STORAGE" YES)
+ cmake_dependent_option(ENABLE_NOTIFY "Enable libnotify support." YES "ENABLE_GTK_UI;NOT APPLE" NO)
+ cmake_dependent_option(ENABLE_ASSISTANT "Turn on assistant compiling." YES "ENABLE_GTK_UI" NO)
+ cmake_dependent_option(ENABLE_SPHINX_DOC "Turn on the generation of the multi-language API documentation based on Sphinx." NO "ENABLE_DOC" NO)