mirror of
https://github.com/termux/termux-packages.git
synced 2025-09-20 22:49:34 +00:00
1701bdf808
- Includes revision-bumps of all reverse dependencies; only one package, `apache-orc`, has a build failure because of newer `libprotobuf`. Its patch is copied and pasted from this PR: https://github.com/apache/orc/pull/2316 - `protobuf-static` is also bumped. It is an orphaned package and there have been, in the past several months since https://github.com/termux/termux-packages/pull/24131, **no known cases of anyone encountering any issues for which they need `protobuf-static` anymore**. This strongly suggests that the **new `libandroid-stub` invented by twaik** that I helped with https://github.com/termux/termux-packages/pull/23712 is probably a completely successful workaround in Android to this upstream `libprotobuf` issue: https://github.com/protocolbuffers/protobuf/issues/5254. However, because the original bug is very rare and only affects a very few Android devices, and among those few Android device where it is reproducible, there are some subtle variations in the content of the protobuf error message, for the time being, I think it is probably a good idea to keep `protobuf-static` unchanged, and eventually, maybe in 1 year from now, if still nobody has ever needed `protobuf-static` at that time, it can be completely disabled.
37 lines
1005 B
Diff
37 lines
1005 B
Diff
From ab5f21ade37569e42c90efde02b95bfcf4bb031d Mon Sep 17 00:00:00 2001
|
|
From: "H. Vetinari" <h.vetinari@gmx.com>
|
|
Date: Sun, 6 Jul 2025 17:33:04 +1100
|
|
Subject: [PATCH] add missing include for protobuf types
|
|
|
|
---
|
|
c++/src/io/InputStream.hh | 2 ++
|
|
c++/src/io/OutputStream.hh | 2 ++
|
|
2 files changed, 4 insertions(+)
|
|
|
|
diff --git a/c++/src/io/InputStream.hh b/c++/src/io/InputStream.hh
|
|
index 07aa623b5f..f0008e7b20 100644
|
|
--- a/c++/src/io/InputStream.hh
|
|
+++ b/c++/src/io/InputStream.hh
|
|
@@ -23,6 +23,8 @@
|
|
#include "orc/OrcFile.hh"
|
|
#include "wrap/zero-copy-stream-wrapper.h"
|
|
|
|
+#include "google/protobuf/stubs/port.h"
|
|
+
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <list>
|
|
diff --git a/c++/src/io/OutputStream.hh b/c++/src/io/OutputStream.hh
|
|
index 6319de96d6..328a9e65bb 100644
|
|
--- a/c++/src/io/OutputStream.hh
|
|
+++ b/c++/src/io/OutputStream.hh
|
|
@@ -24,6 +24,8 @@
|
|
#include "orc/OrcFile.hh"
|
|
#include "wrap/zero-copy-stream-wrapper.h"
|
|
|
|
+#include "google/protobuf/stubs/port.h"
|
|
+
|
|
namespace orc {
|
|
|
|
/**
|