From de90af6c24eef0cfd0902a17609a401b88efd77a Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Wed, 6 Jun 2018 23:59:56 -0300
Subject: [PATCH] protobuf: update to 3.6.0.1.

---
 common/shlibs                           |  6 +++---
 srcpkgs/libprotobuf                     |  1 +
 srcpkgs/libprotoc                       |  1 +
 srcpkgs/protobuf/patches/musl-fix.patch | 24 ------------------------
 srcpkgs/protobuf/template               | 21 ++++++++++++++-------
 5 files changed, 19 insertions(+), 34 deletions(-)
 create mode 120000 srcpkgs/libprotobuf
 create mode 120000 srcpkgs/libprotoc
 delete mode 100644 srcpkgs/protobuf/patches/musl-fix.patch

diff --git a/common/shlibs b/common/shlibs
index cdecd2da52c..6dec0fb9511 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2994,9 +2994,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1
 libm17n-gui.so.0 m17n-lib-1.7.0_1
 libm17n-core.so.0 m17n-lib-1.7.0_1
 libm17n.so.0 m17n-lib-1.7.0_1
-libprotobuf-lite.so.15 protobuf-lite-3.5.0.1_1
-libprotoc.so.15 protobuf-3.5.0.1_1
-libprotobuf.so.15 protobuf-3.5.0.1_1
+libprotobuf-lite.so.16 protobuf-lite-3.6.0_1
+libprotoc.so.16 protobuf-3.6.0_1
+libprotobuf.so.16 protobuf-3.6.0_1
 libsombok.so.3 sombok-2.4.0_1
 libdeviceclient.so.0 pragha-1.3.3_1
 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1
diff --git a/srcpkgs/libprotobuf b/srcpkgs/libprotobuf
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/libprotobuf
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotoc b/srcpkgs/libprotoc
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/libprotoc
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf/patches/musl-fix.patch b/srcpkgs/protobuf/patches/musl-fix.patch
deleted file mode 100644
index 5c3b88b7c23..00000000000
--- a/srcpkgs/protobuf/patches/musl-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-seems like both musl libc and android has byteswap.h
-
-diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h
-index 376be5f..21223f4 100644
---- src/google/protobuf/stubs/port.h
-+++ src/google/protobuf/stubs/port.h
-@@ -87,7 +87,7 @@
- #include <stdlib.h>  // NOLINT(build/include)
- #elif defined(__APPLE__)
- #include <libkern/OSByteOrder.h>
--#elif defined(__GLIBC__) || defined(__CYGWIN__)
-+#elif defined(__linux__) || defined(__CYGWIN__)
- #include <byteswap.h>  // IWYU pragma: export
- #endif
- 
-@@ -299,7 +299,7 @@ inline void GOOGLE_UNALIGNED_STORE64(void *p, uint64 v) {
- #define bswap_32(x) OSSwapInt32(x)
- #define bswap_64(x) OSSwapInt64(x)
- 
--#elif !defined(__GLIBC__) && !defined(__CYGWIN__)
-+#elif !defined(__linux__) && !defined(__CYGWIN__)
- 
- static inline uint16 bswap_16(uint16 x) {
-   return static_cast<uint16>(((x & 0xFF) << 8) | ((x & 0xFF00) >> 8));
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 3bbd35e6146..cd1087d954a 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,16 +1,17 @@
 # Template file for 'protobuf'
 pkgname=protobuf
-version=3.5.2
+version=3.6.0.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="zlib-devel"
 short_desc="Google's data interchange format"
 maintainer="Michael Aldridge <maldridge@voidlinux.eu>"
-distfiles="https://github.com/google/protobuf/archive/v${version}.tar.gz"
-homepage="https://developers.google.com/protocol-buffers/"
 license="BSD-3-Clause"
-checksum=4ffd420f39f226e96aebc3554f9c66a912f6cad6261f39f194f16af8a1f6dab2
+homepage="https://developers.google.com/protocol-buffers/"
+#changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
+distfiles="https://github.com/google/protobuf/archive/v${version}.tar.gz"
+checksum=1144ef1fa9c50d3c04880f363b988df6ca6a66e337a945f1661cf4256ffba749
 
 CXXFLAGS="-std=c++14"
 
@@ -24,9 +25,14 @@ pre_configure() {
 	autoreconf -fi
 }
 
+post_install() {
+	vlicense LICENSE
+}
+
 protobuf-devel_package() {
-	depends="zlib-devel protobuf>=${version}_${revision} protobuf-lite>=${version}_${revision}"
-	short_desc="Google's data interchange format  - development files"
+	depends="zlib-devel protobuf-${version}_${revision}
+	 protobuf-lite-${version}_${revision}"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
@@ -34,8 +40,9 @@ protobuf-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
 protobuf-lite_package() {
-	short_desc="Google's data interchange format - Lite version"
+	short_desc+=" - Lite version"
 	pkg_install() {
 		vmove "usr/lib/libprotobuf-lite.so.*"
 	}