Remove obsolete protobuf payment requests

depends/Makefile

@@ -114,31 +114,6 @@ ifneq ($(native_packages),)
 	  echo "  - $$p: $$f"; \
 	  tar --no-same-owner -xzf "$$f" -C "$(build_prefix)"; \
 	done
-	@if [[ " $(native_packages) " == *" native_protobuf "* ]] && [[ ! -x "$(build_prefix)/bin/protoc" ]]; then \
-	  found="$$(find "$(build_prefix)" -path '*/bin/protoc' -type f 2>/dev/null | sort | head -n 1)"; \
-	  if [[ -n "$$found" ]]; then \
-	    echo "== Staging native protoc from: $$found"; \
-	    mkdir -p "$(build_prefix)/bin"; \
-	    cp "$$found" "$(build_prefix)/bin/protoc"; \
-	    chmod +x "$(build_prefix)/bin/protoc"; \
-	  fi; \
-	fi
-	@if [[ " $(native_packages) " == *" native_protobuf "* ]] && [[ ! -x "$(build_prefix)/bin/protoc" ]]; then \
-	  archive="$$(ls "$(BASE_CACHE)/$(HOST)/native_protobuf/"*.tar.gz 2>/dev/null | sort | tail -n 1)"; \
-	  if [[ -n "$$archive" ]] && tar -tzf "$$archive" ./bin/protoc >/dev/null 2>&1; then \
-	    echo "== Extracting native protoc directly from: $$archive"; \
-	    tar --no-same-owner -xzf "$$archive" -C "$(build_prefix)" ./bin/protoc; \
-	    chmod +x "$(build_prefix)/bin/protoc"; \
-	  elif [[ -n "$$archive" ]]; then \
-	    echo "== native_protobuf archive contents:"; \
-	    tar -tzf "$$archive" | sed -n '1,40p'; \
-	  fi; \
-	fi
-	@if [[ " $(native_packages) " == *" native_protobuf "* ]] && [[ ! -x "$(build_prefix)/bin/protoc" ]]; then \
-	  echo "ERROR: missing native protoc under $(build_prefix)/bin/protoc"; \
-	  echo "Fix: make -C $(BASEDIR) HOST=$(HOST) NO_QT=$(NO_QT) native_protobuf"; \
-	  exit 1; \
-	fi
 endif
 	@echo "== Writing config.site: $(host_prefix)/share/config.site"
 	@mkdir -p "$(host_prefix)/share"
@@ -154,7 +129,6 @@ endif
 	  echo "with_qt_plugindir='$(host_prefix)/plugins'"; \
 	  echo "with_qt_translationdir='$(host_prefix)/translations'"; \
 	  echo "with_qt_bindir='$(host_prefix)/bin'"; \
-	  echo "with_protoc_bindir='$(build_prefix)/bin'"; \
 	  echo "CPPFLAGS='-I$(host_prefix)/include'"; \
 	  echo "LDFLAGS='-L$(host_prefix)/lib'"; \
 	  echo "BOOST_CPPFLAGS='-I$(host_prefix)/include'"; \

depends/README.md

@@ -38,8 +38,7 @@ points are the helpers in `contrib/`:
 - `contrib/build-win64-wallet.sh`
 - `contrib/agrarian-build-menu.sh`
 
-Those helpers set the correct Qt, host-tool, and protobuf paths around the
-depends prefix.
+Those helpers set the correct Qt and host-tool paths around the depends prefix.
 
 ### Install the required dependencies: Ubuntu & Debian
 

depends/config.site.in

@@ -16,11 +16,6 @@ fi
 if test -z $with_qt_bindir && test -z "@no_qt@"; then
   with_qt_bindir=$depends_prefix/native/bin
 fi
-if test -z $with_protoc_bindir && test -z "@no_qt@"; then
-  with_protoc_bindir=$depends_prefix/native/bin
-fi
-
-
 if test -z $enable_wallet && test -n "@no_wallet@"; then
   enable_wallet=no
 fi

depends/funcs.mk

@@ -201,7 +201,6 @@ $($(1)_postprocessed): | $($(1)_staged)
 	$(AT)touch $$@
 $($(1)_cached): | $($(1)_dependencies) $($(1)_postprocessed)
 	$(AT)echo Caching $(1)...
-	$(AT)if [[ "$(1)" == "native_protobuf" && ! -x "$$($(1)_staging_prefix_dir)/bin/protoc" ]]; then echo "ERROR: native_protobuf cache missing bin/protoc"; find "$$($(1)_staging_dir)" -maxdepth 5 -print; exit 1; fi
 	$(AT)cd $$($(1)_staging_prefix_dir); find . | sort | tar --no-recursion -czf $$($(1)_staging_dir)/$$(@F) -T -
 	$(AT)mkdir -p $$(@D)
 	$(AT)rm -rf $$(@D) && mkdir -p $$(@D)

depends/packages/native_protobuf.mk

@@ -1,29 +0,0 @@
-package=native_protobuf
-$(package)_version=2.6.1
-$(package)_download_path=https://github.com/google/protobuf/releases/download/v$($(package)_version)
-$(package)_file_name=protobuf-$($(package)_version).tar.bz2
-$(package)_sha256_hash=ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910
-
-define $(package)_set_vars
-$(package)_config_opts=--disable-shared --without-zlib
-endef
-
-define $(package)_config_cmds
-  $($(package)_autoconf)
-endef
-
-define $(package)_build_cmds
-  $(MAKE) -C src protoc
-endef
-
-define $(package)_stage_cmds
-  mkdir -p $($(package)_staging_prefix_dir)/bin && \
-  cp src/protoc $($(package)_staging_prefix_dir)/bin/protoc && \
-  $(build_STRIP) $($(package)_staging_prefix_dir)/bin/protoc
-endef
-
-define $(package)_postprocess_cmds
-  test -x bin/protoc || \
-    (echo "ERROR: native_protobuf staged without bin/protoc" && find . -maxdepth 3 -type f -o -type d && exit 1) && \
-  chmod +x bin/protoc
-endef

depends/packages/packages.mk

@@ -22,8 +22,8 @@ USE_ZMQ     ?= 0
 USE_UPNP    ?= 1
 
 # ---- Group definitions (as you had them) ----
-qt_native_packages := native_protobuf
-qt_packages := qrencode protobuf zlib
+qt_native_packages :=
+qt_packages := qrencode zlib
 
 qt_linux_packages := expat freetype fontconfig qt
 qt_darwin_packages := qt

depends/packages/protobuf.mk

@@ -1,34 +0,0 @@
-package=protobuf
-$(package)_version=$(native_$(package)_version)
-$(package)_download_path=$(native_$(package)_download_path)
-$(package)_file_name=$(native_$(package)_file_name)
-$(package)_sha256_hash=$(native_$(package)_sha256_hash)
-$(package)_dependencies=native_$(package)
-$(package)_cxxflags=-std=c++11
-
-define $(package)_set_vars
-  $(package)_config_opts=--disable-shared --with-protoc=$(build_prefix)/bin/protoc
-  $(package)_config_opts_linux=--with-pic
-endef
-
-define $(package)_preprocess_cmds
-   cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . &&\
-   cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub gtest/build-aux
-endef
-
-define $(package)_config_cmds
-  $($(package)_autoconf)
-endef
-
-define $(package)_build_cmds
-  $(MAKE) -C src libprotobuf.la
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) -C src install-libLTLIBRARIES install-nobase_includeHEADERS &&\
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install-pkgconfigDATA
-endef
-
-define $(package)_postprocess_cmds
-  rm lib/libprotoc.a
-endef