diff options
| author | Ted Alff | 2017-09-26 20:56:10 -0400 |
|---|---|---|
| committer | Ted Alff | 2017-09-26 20:56:10 -0400 |
| commit | dfe56692e36c7a394d9e84517481171173dc710d (patch) | |
| tree | 4d8dea084c4d7e3eaff9b515d4495f495846c640 | |
| parent | 90f13841565433af4d727aa0f67b8cf9317603e9 (diff) | |
| download | aur-dfe56692e36c7a394d9e84517481171173dc710d.tar.gz | |
Update gmock patch. Fix upstreamed for including boost thread library
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | remove_GMock_check.patch | 2 |
3 files changed, 6 insertions, 8 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Sep 23 20:05:10 UTC 2017 +# Wed Sep 27 00:55:29 UTC 2017 pkgbase = radiotray-ng-git pkgdesc = An Internet radio player for Linux - pkgver = 0.1.8.r26.08e56c7 + pkgver = 0.1.8.r27.8e772f7 pkgrel = 1 url = https://github.com/ebruck/radiotray-ng arch = i686 @@ -28,7 +28,7 @@ pkgbase = radiotray-ng-git source = radiotray-ng::git+https://github.com/ebruck/radiotray-ng#branch=v0.1.8-dev source = remove_GMock_check.patch sha256sums = SKIP - sha256sums = c08b2a85ad7b83e70c9bfd843abaa2b13381736a9acf837eb68ca341b79e89e1 + sha256sums = d2af2f79007ddf2aad38b9531d0adc69859632a14a562983f5be3dcec973df02 pkgname = radiotray-ng-git @@ -4,7 +4,7 @@ _pkgname=radiotray-ng pkgname=${_pkgname}-git _pkgver=0.1.8 _branch=v${_pkgver}-dev -pkgver=0.1.8.r26.08e56c7 +pkgver=0.1.8.r27.8e772f7 pkgrel=1 pkgdesc="An Internet radio player for Linux" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ conflicts=("${_pkgname}") source=("${_pkgname}::git+https://github.com/ebruck/radiotray-ng#branch=${_branch}" 'remove_GMock_check.patch') sha256sums=('SKIP' - 'c08b2a85ad7b83e70c9bfd843abaa2b13381736a9acf837eb68ca341b79e89e1') + 'd2af2f79007ddf2aad38b9531d0adc69859632a14a562983f5be3dcec973df02') pkgver() { cd "${srcdir}/${_pkgname}" @@ -31,8 +31,6 @@ prepare() { cd "${srcdir}/${_pkgname}" # Build fails when GMock is found, so don't check for it, don't compile tests patch -uNp2 -r- -i ../remove_GMock_check.patch - # Fix for boost >= 1.65 - sed -i 's:find_package(Boost REQUIRED [^)]*:& thread:' CMakeLists.txt } build() { diff --git a/remove_GMock_check.patch b/remove_GMock_check.patch index 01d878e3d756..0f3a1a9a43ef 100644 --- a/remove_GMock_check.patch +++ b/remove_GMock_check.patch @@ -4,7 +4,7 @@ diff -Naur ./radiotray-ng.bak/CMakeLists.txt ./radiotray-ng/CMakeLists.txt @@ -37,7 +37,6 @@ find_package(CURL REQUIRED) find_package(PkgConfig REQUIRED) - find_package(Boost REQUIRED filesystem system log program_options) + find_package(Boost REQUIRED filesystem system log program_options thread) -find_package(GMock) pkg_search_module(JSONCPP REQUIRED jsoncpp) |