protobuf: Update to 3.6.1

This commit is contained in:
Alexey Pavlov
2018-08-02 11:22:56 +03:00
parent 57cac99666
commit 11051c9fdb
4 changed files with 20 additions and 3274 deletions

View File

@@ -1,12 +1,12 @@
diff -rupN protobuf-2.6.1-orig/configure.ac protobuf-2.6.1/configure.ac
--- protobuf-2.6.1-orig/configure.ac 2015-07-09 21:26:04.124338200 +1000
+++ protobuf-2.6.1/configure.ac 2015-07-09 21:26:12.444697000 +1000
@@ -140,7 +140,7 @@ ACX_PTHREAD
diff -rupN protobuf-3.6.1-orig/configure.ac protobuf-3.6.1/configure.ac
--- protobuf-3.6.1-orig/configure.ac 2018-08-02 21:26:04.124338200 +1000
+++ protobuf-3.6.1/configure.ac 2018-08-02 21:26:12.444697000 +1000
@@ -190,7 +190,7 @@ ACX_PTHREAD
AC_CXX_STL_HASH
case "$target_os" in
- mingw* | cygwin* | win*)
+ mingw* | cygwin* | win* | msys*)
- mingw* | cygwin* | win* | aix*)
+ mingw* | cygwin* | win* | msys* | aix*)
;;
*)
# Need to link against rt on Solaris

View File

@@ -1,7 +1,8 @@
# Maintainer: James Ross-Gowan <rossymiles@gmail.com>
pkgbase=protobuf
pkgname=('protobuf' 'protobuf-devel')
pkgver=2.6.1
pkgver=3.6.1
pkgrel=1
pkgdesc="Protocol Buffers - Google's data interchange format"
arch=('i686' 'x86_64')
@@ -10,21 +11,14 @@ groups=('libraries')
license=('BSD')
depends=('gcc-libs' 'zlib')
makedepends=('zlib-devel')
source=("https://github.com/google/protobuf/releases/download/v$pkgver/protobuf-$pkgver.tar.bz2"
config.guess
config.sub
source=(protobuf-${pkgver}.tar.gz::https://github.com/google/protobuf/archive/v${pkgver}.tar.gz
01-msysize.patch)
sha256sums=('ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910'
'4bdec63f60b9ad86ac82c24df9b9b0537ac5c056a0effeed33923c807ea2983e'
'5f683355b19d4f2342c03a99dfc2c792593b4bd1b0eb4e4132cb1dfce2c5cd11'
'cb1c051303341a7619e8ed5dd9c268632c368449cacaa05ecb78d5a1000218b9')
sha256sums=('3d4e589d81b2006ca603c1ab712c9715a76227293032d05b26fca603f90b3f5b'
'9cfdfc73ccfd2234733cfef31c1fa88b78514f1368341fecdfd0a779c4da8893')
prepare() {
cd "${srcdir}/protobuf-${pkgver}"
cp "$srcdir/config.sub" .
cp "$srcdir/config.guess" .
patch -p1 -i "$srcdir/01-msysize.patch"
patch -p1 -i "${srcdir}/01-msysize.patch"
./autogen.sh
}
@@ -35,7 +29,7 @@ build() {
--host=${CHOST} \
--prefix=/usr
make
make DESTDIR="$srcdir/dest" install
make DESTDIR="${srcdir}/dest" install
}
check() {
@@ -44,9 +38,9 @@ check() {
}
package_protobuf() {
mkdir -p "$pkgdir/usr/bin"
cp -f "$srcdir/dest/usr/bin/"*.dll "$pkgdir/usr/bin/"
install -Dm644 "$srcdir/protobuf-${pkgver}/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
mkdir -p "${pkgdir}/usr/bin"
cp -f "${srcdir}/dest/usr/bin/"*.dll "${pkgdir}/usr/bin/"
install -Dm644 "${srcdir}/protobuf-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
package_protobuf-devel() {
@@ -54,8 +48,8 @@ package_protobuf-devel() {
groups=('development')
depends=("protobuf=${pkgver}")
mkdir -p "$pkgdir/usr/bin"
cp -f "$srcdir/dest/usr/bin/"*.exe "$pkgdir/usr/bin/"
cp -rf "$srcdir/dest/usr/include" "$pkgdir/usr/"
cp -rf "$srcdir/dest/usr/lib" "$pkgdir/usr/"
mkdir -p "${pkgdir}/usr/bin"
cp -f "${srcdir}/dest/usr/bin/"*.exe "${pkgdir}/usr/bin/"
cp -rf "${srcdir}/dest/usr/include" "${pkgdir}/usr/"
cp -rf "${srcdir}/dest/usr/lib" "${pkgdir}/usr/"
}

1438
protobuf/config.guess vendored

File diff suppressed because it is too large Load Diff

1810
protobuf/config.sub vendored

File diff suppressed because it is too large Load Diff