diff options
| author | Andy Postnikov <apostnikov@gmail.com> | 2018-10-05 21:38:11 +0300 |
|---|---|---|
| committer | Andy Postnikov <apostnikov@gmail.com> | 2018-10-06 02:35:02 +0300 |
| commit | 975de2c65ba9d333906207a03874204d528cb5e1 (patch) | |
| tree | 6aa09e0396468b1b38425e8f2ae45ec9b054883b /community | |
| parent | b6af8c59d58cf5489c03e945f920cecceaaee160 (diff) | |
| download | aports-975de2c65ba9d333906207a03874204d528cb5e1.tar.bz2 aports-975de2c65ba9d333906207a03874204d528cb5e1.tar.xz | |
community/libcouchbase: upgrade to 2.9.5 and modernize
Diffstat (limited to 'community')
| -rw-r--r-- | community/libcouchbase/APKBUILD | 10 | ||||
| -rw-r--r-- | community/libcouchbase/disable_git_version_check.patch | 37 |
2 files changed, 4 insertions, 43 deletions
diff --git a/community/libcouchbase/APKBUILD b/community/libcouchbase/APKBUILD index 49bd17c513..ffb4fc48f1 100644 --- a/community/libcouchbase/APKBUILD +++ b/community/libcouchbase/APKBUILD @@ -1,18 +1,16 @@ # Contributor: Nathan Johnson <nathan@nathanjohnson.info> # Maintainer: Nathan Johnson <nathan@nathanjohnson.info> pkgname=libcouchbase -pkgver=2.9.3 -pkgrel=1 +pkgver=2.9.5 +pkgrel=0 pkgdesc="C client library for Couchbase" url="https://developer.couchbase.com/community" arch="all" license="Apache-2.0" -depends= depends_dev="musl-dev libressl-dev snappy-dev" makedepends="$depends_dev cmake perl libtool libev-dev libevent-dev libuv-dev" subpackages="$pkgname-dev $pkgname-bin $pkgname-doc $pkgname-libevent $pkgname-libev $pkgname-libuv" source="$pkgname-$pkgver.tar.gz::https://github.com/couchbase/libcouchbase/archive/$pkgver.tar.gz - disable_git_version_check.patch fix_socktest.patch" builddir="$srcdir/$pkgname-$pkgver" @@ -21,6 +19,7 @@ build() { cd "$builddir"/build ../cmake/configure \ --prefix=/usr \ + --skip-git-version \ --disable-couchbasemock make } @@ -74,6 +73,5 @@ bin() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="79b842967beaec0f26244b8ea18fa588d00356e04c47c052234cb15a2b3b1b2134e9d8cad5f5c1958321ec0c762b59785d37b2ac275e80eab5693b7dd252bceb libcouchbase-2.9.3.tar.gz -987b76b9c8a38a1f144bcada3c24192b30b352c993c433f4a2a1e381b765ae6bb845ebc6393c794da1b4efbb68fd1d34b027104fecf5c9bcc29b0f58c7f6a474 disable_git_version_check.patch +sha512sums="ab6d03e5d05bf85d5d6626432895bc4eccc37a0efa56d0997fa4316fb54dcbade81ecfc04858a1a8f0e2747b1aff5184a5762860ce6280ca67bd8fa1bea813e9 libcouchbase-2.9.5.tar.gz 72319b86fdd91728723ccb091e72199788a84e2ec9ea12c0fcd1ed686eb155ec11e0addbff96735f83e7f31764a85650f0483b6e76d3a8bee16f71b2751fe4a9 fix_socktest.patch" diff --git a/community/libcouchbase/disable_git_version_check.patch b/community/libcouchbase/disable_git_version_check.patch deleted file mode 100644 index 438e37b8c4..0000000000 --- a/community/libcouchbase/disable_git_version_check.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/cmake/Modules/GetVersionInfo.cmake -+++ b/cmake/Modules/GetVersionInfo.cmake -@@ -7,34 +7,6 @@ - # LCB_VERSION_MINOR - # LCB_VERSION_PATCH - --## Try git first ## --FIND_PROGRAM(GIT_EXECUTABLE NAMES git git.exe) --MACRO(RUNGIT outvar) -- EXECUTE_PROCESS(COMMAND git ${ARGN} -- OUTPUT_VARIABLE ${outvar} -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} -- OUTPUT_STRIP_TRAILING_WHITESPACE) --ENDMACRO() -- --if (GIT_EXECUTABLE) -- RUNGIT(LCB_REVDESCRIBE describe --long) -- RUNGIT(LCB_VERSION describe) -- STRING(REPLACE "-" "_" LCB_VERSION "${LCB_VERSION}") -- MESSAGE(STATUS "Sanitized VERSION=${LCB_VERSION}") -- RUNGIT(LCB_VERSION_CHANGESET rev-parse HEAD) -- -- EXECUTE_PROCESS( -- COMMAND echo ${LCB_VERSION} -- COMMAND awk -F. "{printf \"0x%0.2d%0.2d%0.2d\", $1, $2, $3}" -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} -- OUTPUT_VARIABLE LCB_VERSION_HEX) --ENDIF() -- --IF(LCB_VERSION) -- # Have the version information -- CONFIGURE_FILE(${LCB_GENINFODIR}/distinfo.cmake.in ${LCB_GENINFODIR}/distinfo.cmake) --ENDIF() -- - # library version - IF(NOT LCB_VERSION AND EXISTS ${LCB_GENINFODIR}/distinfo.cmake) - INCLUDE(${LCB_GENINFODIR}/distinfo.cmake) |