Remove obsolete protobuf payment requests

contrib/agrarian-qt.pro

@@ -188,7 +188,6 @@ HEADERS += src/activemasternode.h \
            src/qt/optionsdialog.h \
            src/qt/optionsmodel.h \
            src/qt/overviewpage.h \
-           src/qt/paymentrequest.pb.h \
            src/qt/paymentrequestplus.h \
            src/qt/paymentserver.h \
            src/qt/peertablemodel.h \
@@ -481,7 +480,6 @@ SOURCES += src/activemasternode.cpp \
            src/qt/optionsdialog.cpp \
            src/qt/optionsmodel.cpp \
            src/qt/overviewpage.cpp \
-           src/qt/paymentrequest.pb.cc \
            src/qt/paymentrequestplus.cpp \
            src/qt/paymentserver.cpp \
            src/qt/peertablemodel.cpp \

contrib/build-linux-wallet.sh

@@ -7,8 +7,6 @@ BUILD_HOST="${BUILD_HOST:-$("$ROOT/depends/config.guess")}"
 HOST="${HOST:-$BUILD_HOST}"
 PREFIX="$ROOT/depends/$HOST"
 BASE_CONFIG="$PREFIX/share/config.site"
-NATIVE_BIN="$ROOT/depends/build/$BUILD_HOST/bin"
-PROTOC="$NATIVE_BIN/protoc"
 
 require_cmd() {
   if ! command -v "$1" >/dev/null 2>&1; then
@@ -94,54 +92,6 @@ EOF
   echo "  $QT_SYSTEM_PKG_CONFIG_LIBDIR"
 }
 
-ensure_native_protoc() {
-  local archive found
-
-  if [[ -x "$PROTOC" ]]; then
-    return 0
-  fi
-
-  archive="$(find "$ROOT/depends/built/$HOST/native_protobuf" \
-    -name 'native_protobuf-*.tar.gz' -type f 2>/dev/null | sort | tail -n 1 || true)"
-
-  if [[ -n "$archive" ]]; then
-    echo "Extracting native protoc from $archive"
-    mkdir -p "$ROOT/depends/build/$BUILD_HOST"
-    tar -xzf "$archive" -C "$ROOT/depends/build/$BUILD_HOST" ./bin/protoc
-  fi
-
-  if [[ -x "$PROTOC" ]]; then
-    return 0
-  fi
-
-  found="$(find "$ROOT/depends/build" "$ROOT/depends/work/staging" \
-    -path '*/bin/protoc' -type f 2>/dev/null | sort | head -n 1 || true)"
-
-  if [[ -n "$found" ]]; then
-    echo "Staging native protoc from $found"
-    mkdir -p "$NATIVE_BIN"
-    cp "$found" "$PROTOC"
-    chmod +x "$PROTOC"
-  fi
-
-  require_path "$PROTOC"
-}
-
-remove_invalid_native_protobuf_cache() {
-  local archive
-
-  archive="$(find "$ROOT/depends/built/$HOST/native_protobuf" \
-    -name 'native_protobuf-*.tar.gz' -type f 2>/dev/null | sort | tail -n 1 || true)"
-
-  [[ -n "$archive" ]] || return 0
-  if tar -tzf "$archive" ./bin/protoc >/dev/null 2>&1; then
-    return 0
-  fi
-
-  echo "Removing invalid native_protobuf cache without bin/protoc: $archive"
-  rm -rf "$ROOT/depends/built/$HOST/native_protobuf"
-}
-
 reset_configure_state() {
   rm -f config.cache config.log config.status libtool
 
@@ -170,7 +120,6 @@ else
 fi
 
 reset_qt_configure_state
-remove_invalid_native_protobuf_cache
 
 echo "Building native depends for $HOST..."
 # The legacy depends system mutates depends/$HOST while configuring each
@@ -180,7 +129,6 @@ echo "Building native depends for $HOST..."
 make -C depends clean
 make -C depends HOST="$HOST" NO_QT=0 -j1
 require_path "$BASE_CONFIG"
-ensure_native_protoc
 
 reset_configure_state
 ./autogen.sh
@@ -191,8 +139,7 @@ QT_SYSTEM_PKG_CONFIG_LIBDIR="$QT_SYSTEM_PKG_CONFIG_LIBDIR" CONFIG_SITE="$BASE_CO
   --disable-tests \
   --disable-bench \
   --with-gui=qt6 \
-  --with-qtdbus=no \
-  --with-protoc-bindir="$NATIVE_BIN"
+  --with-qtdbus=no
 
 echo "Cleaning stale target objects before compiling..."
 make clean

contrib/build-win64-wallet.sh

@@ -7,9 +7,6 @@ HOST="${HOST:-x86_64-w64-mingw32}"
 BUILD_HOST="${BUILD_HOST:-$("$ROOT/depends/config.guess")}"
 PREFIX="$ROOT/depends/$HOST"
 NATIVE_BIN="$ROOT/depends/build/$BUILD_HOST/bin"
-PROTOBUF_VERSION="${PROTOBUF_VERSION:-2.6.1}"
-PROTOBUF_SOURCE="$ROOT/depends/sources/protobuf-$PROTOBUF_VERSION.tar.bz2"
-PROTOBUF_BUILD="${PROTOBUF_BUILD:-/tmp/agrarian-protobuf-$PROTOBUF_VERSION-native}"
 
 require_cmd() {
   if ! command -v "$1" >/dev/null 2>&1; then
@@ -51,20 +48,6 @@ EOF
   fi
 }
 
-build_native_protoc() {
-  require_path "$PROTOBUF_SOURCE"
-  rm -rf "$PROTOBUF_BUILD"
-  mkdir -p "$PROTOBUF_BUILD"
-  tar -xjf "$PROTOBUF_SOURCE" -C "$PROTOBUF_BUILD" --strip-components=1
-  chmod -R u+rwX "$PROTOBUF_BUILD"
-  (
-    cd "$PROTOBUF_BUILD"
-    bash configure --disable-shared --without-zlib
-    make -C src protoc -j"$JOBS" SHELL=/bin/bash
-  )
-  cp "$PROTOBUF_BUILD/src/protoc" "$NATIVE_BIN/protoc"
-}
-
 ensure_native_tools() {
   mkdir -p "$NATIVE_BIN"
 
@@ -77,10 +60,6 @@ ensure_native_tools() {
   if [[ ! -x "$NATIVE_BIN/lupdate" ]] && command -v lupdate >/dev/null 2>&1; then
     cp "$(command -v lupdate)" "$NATIVE_BIN/lupdate"
   fi
-
-  if [[ ! -x "$NATIVE_BIN/protoc" ]] || ! "$NATIVE_BIN/protoc" --version | grep -q "libprotoc $PROTOBUF_VERSION"; then
-    build_native_protoc
-  fi
 }
 
 cd "$ROOT"
@@ -130,8 +109,7 @@ CONFIG_SITE="$PREFIX/share/config.site" ./configure \
   --with-qt-libdir="$PREFIX/lib" \
   --with-qt-plugindir="$PREFIX/plugins" \
   --with-qt-translationdir="$PREFIX/translations" \
-  --with-qt-bindir="$NATIVE_BIN" \
-  --with-protoc-bindir="$NATIVE_BIN"
+  --with-qt-bindir="$NATIVE_BIN"
 
 echo "Cleaning stale target objects before compiling..."
 make clean

contrib/debian/control

@@ -23,7 +23,6 @@ Build-Depends: debhelper,
  xvfb,
  qtbase5-dev, qttools5-dev-tools, qttools5-dev,
  libqrencode-dev,
- libprotobuf-dev, protobuf-compiler,
  python,
  libzmq3-dev,
  dh-systemd

contrib/rpm/agrarian.spec

@@ -71,7 +71,6 @@ BuildRequires:	qt5-qtbase-devel
 # for /usr/bin/lrelease-qt5
 BuildRequires:	qt5-linguist
 %endif
-BuildRequires:	protobuf-devel
 BuildRequires:	qrencode-devel
 BuildRequires:	%{_bindir}/desktop-file-validate
 # for icon generation from SVG