From 08d8094f3a6791f64f1503d96e4456e06ba646ef Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 23 Oct 2016 05:41:49 +0300
Subject: Revert "protobuf: use official release tarball instead of tarball
 from git tag"

This reverts commit 284f0a7ec3b43c0a918e3d5c85dc19f3ca561962.

New protobuf release (3.1.0) does not provide official
tarballs with prepared configure and googletest files.

Tag (and URL) changed since original version. Now tag start with 'v'.
---
 src/protobuf.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/protobuf.mk b/src/protobuf.mk
index d3b87d3..4a8cfe0 100644
--- a/src/protobuf.mk
+++ b/src/protobuf.mk
@@ -3,19 +3,21 @@
 PKG             := protobuf
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.6.1
-$(PKG)_CHECKSUM := dbbd7bdd2381633995404de65a945ff1a7610b0da14593051b4738c90c6dd164
+$(PKG)_CHECKSUM := 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/google/protobuf/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc zlib
+$(PKG)_URL      := https://github.com/google/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
+$(PKG)_DEPS     := gcc zlib googletest
 
 define $(PKG)_UPDATE
     $(call MXE_GET_GITHUB_TAGS, google/protobuf, v)
 endef
 
 define $(PKG)_BUILD
+    $(call PREPARE_PKG_SOURCE,googletest,$(1))
+    cd '$(1)' && mv googletest-release-$(googletest_VERSION)/ gtest
 # First step: Build for host system in order to create "protoc" binary.
-    cd '$(1)' && ./configure \
+    cd '$(1)' && ./autogen.sh && ./configure \
         --disable-shared
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     cp '$(1)/src/protoc' '$(PREFIX)/bin/$(TARGET)-protoc'
-- 
cgit v0.12