summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Horel2018-03-26 13:52:31 -0400
committerGuillaume Horel2018-03-26 13:52:31 -0400
commit4c620b04a4ed64e10d30e4cca5b45339cd23792e (patch)
tree4c2676f44919cabbab94e266880d1dddcc6ca536
parent409500c848b500cf7616df1f839bbc0ee97ff0b5 (diff)
downloadaur-4c620b04a4ed64e10d30e4cca5b45339cd23792e.tar.gz
remove patch that was applied upstream
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
-rw-r--r--find_minizip.patch11
3 files changed, 4 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dc2bedafe9b4..6882224cd38b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linphone-desktop-git
pkgdesc = A Voice-over-IP phone
- pkgver = 4.1.1.r288.g352e4985
+ pkgver = 4.1.1.r315.g2107ddff
pkgrel = 1
url = http://www.linphone.org
arch = i686
@@ -34,9 +34,7 @@ pkgbase = linphone-desktop-git
conflicts = linphone-desktop
options = !emptydirs
source = git+https://github.com/BelledonneCommunications/linphone-desktop.git
- source = find_minizip.patch
sha256sums = SKIP
- sha256sums = fe74b28500f73e81886f052f41e8946bac170249760f5fe694e96c4d75e0ed73
pkgname = linphone-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index 99259dd3bde6..d86d7f78816d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=linphone-desktop-git
_pkgname=linphone-desktop
-pkgver=4.1.1.r288.g352e4985
+pkgver=4.1.1.r315.g2107ddff
pkgrel=1
pkgdesc="A Voice-over-IP phone"
arch=('i686' 'x86_64')
@@ -17,21 +17,14 @@ optdepends=('pulseaudio')
options=('!emptydirs')
provides=('linphone-desktop')
conflicts=('linphone-desktop')
-source=("git+https://github.com/BelledonneCommunications/linphone-desktop.git"
- "find_minizip.patch")
-sha256sums=('SKIP'
- 'fe74b28500f73e81886f052f41e8946bac170249760f5fe694e96c4d75e0ed73')
+source=("git+https://github.com/BelledonneCommunications/linphone-desktop.git")
+sha256sums=('SKIP')
pkgver() {
cd "${srcdir}/${_pkgname}"
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/; s/-/./g'
}
-prepare() {
- cd $srcdir
- patch -p0 < ../find_minizip.patch
-}
-
build() {
cd $_pkgname
cmake -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/find_minizip.patch b/find_minizip.patch
deleted file mode 100644
index 58608d2f97c7..000000000000
--- a/find_minizip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN linphone-desktop-orig/cmake/FindMinizip.cmake linphone-desktop/cmake/FindMinizip.cmake
---- linphone-desktop-orig/cmake/FindMinizip.cmake 2018-03-18 11:08:14.925958855 -0400
-+++ linphone-desktop/cmake/FindMinizip.cmake 2018-03-18 11:08:34.051130410 -0400
-@@ -37,7 +37,6 @@
-
- find_library(MINIZIP_LIBRARIES
- NAMES minizip minizipd
-- NO_CMAKE_SYSTEM_PATH
- )
-
- include(FindPackageHandleStandardArgs)