*/*: rebuild against protobuf-31.1
Changes
49 files changed · +955 −54
Only the first 600 diff lines are shown. Download the complete patch.
community/android-tools/0002-protobuf-31.patch
View filediff --git a/community/android-tools/0002-protobuf-31.patch b/community/android-tools/0002-protobuf-31.patch
new file mode 100644
index 0000000..6580916
--- /dev/null
+++ b/community/android-tools/0002-protobuf-31.patch
@@ -0,0 +1,11 @@
+--- a/vendor/extras/libjsonpb/parse/jsonpb.cpp
++++ b/vendor/extras/libjsonpb/parse/jsonpb.cpp
+@@ -33,7 +33,7 @@
+ static constexpr char kTypeUrlPrefix[] = "type.googleapis.com";
+
+ std::string GetTypeUrl(const Message& message) {
+- return std::string(kTypeUrlPrefix) + "/" + message.GetDescriptor()->full_name();
++ return std::string(kTypeUrlPrefix) + "/" + std::string(message.GetDescriptor()->full_name());
+ }
+
+ ErrorOr<std::string> MessageToJsonString(const Message& message) {
community/android-tools/APKBUILD
View filediff --git a/community/android-tools/APKBUILD b/community/android-tools/APKBUILD
index e94207c..b99b873 100644
--- a/community/android-tools/APKBUILD
+++ b/community/android-tools/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Sören Tempel <[email protected]>
pkgname=android-tools
pkgver=35.0.2
-pkgrel=11
+pkgrel=12
pkgdesc="Android platform tools"
url="https://sites.google.com/a/android.com/tools/"
# s390x, ppc64le: Unsupported by vendored BoringSSL
@@ -14,7 +14,9 @@ makedepends="pcre2-dev linux-headers gtest-dev go perl cmake protobuf-dev
brotli-dev zstd-dev lz4-dev samurai abseil-cpp-dev fmt-dev"
subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
source="https://github.com/nmeum/android-tools/releases/download/$pkgver/android-tools-$pkgver.tar.xz
- 0001-Fix-libusb-enumeration.patch"
+ 0001-Fix-libusb-enumeration.patch
+ 0002-protobuf-31.patch
+ "
export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}"
export GOTMPDIR="${GOTMPDIR:-"$srcdir"}"
@@ -42,4 +44,5 @@ bashcomp() {
sha512sums="
391ce4d638b274d7bbae24a3df8de8b5812a982570f29b2aef37d12a3ba7ed6f66b5c0b7f908759e0b0da30d152b5319af0fef16c54bdc3b9f4074fb22f80d10 android-tools-35.0.2.tar.xz
941dddf82725b1f44d158e4ce361355004a63292f72f91e2008436bd687cf55e09cef12875f94057702d056e35cc0ba1df13432caefee7d37d039aa1fd31c65e 0001-Fix-libusb-enumeration.patch
+a67241924e6b83b9772efa99147f72278535ca306ff4311150ef45fd2228d186ccb0ba3759ece9f50c0f060859b2c809710224b5b290c34b0d92e08b484c96fc 0002-protobuf-31.patch
"
community/apache-orc/APKBUILD
View filediff --git a/community/apache-orc/APKBUILD b/community/apache-orc/APKBUILD
index 4cffaac..6d862cb 100644
--- a/community/apache-orc/APKBUILD
+++ b/community/apache-orc/APKBUILD
@@ -3,7 +3,7 @@
# based on arch linux PKGBUILD
pkgname=apache-orc
pkgver=2.1.2
-pkgrel=1
+pkgrel=2
pkgdesc="the smallest, fastest columnar storage for Hadoop workloads"
url="https://orc.apache.org/"
arch="all"
@@ -22,7 +22,10 @@ makedepends="
zstd-dev
"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://downloads.apache.org/orc/orc-$pkgver/orc-$pkgver.tar.gz"
+source="
+ https://downloads.apache.org/orc/orc-$pkgver/orc-$pkgver.tar.gz
+ protobuf-31.patch
+ "
builddir="$srcdir/orc-$pkgver"
build() {
@@ -57,4 +60,5 @@ package() {
sha512sums="
a2b2ddb120dbedc3f5b2bc315c83e177841dc089c09542404bdac330aaeea678063a2a654acfdfe63bced0307f970d22a790ddfee0ff9a7e231f67286344eed5 orc-2.1.2.tar.gz
+23bfa9781a6efbd7227f5bb95fcccf4136bd998e211a0d98b12933ef9721b7d2a03f1a902adb5e12854b2231df2cb5916a7d5a1a31bdf4ee66a4bfe3f7eceac9 protobuf-31.patch
"
community/apache-orc/protobuf-31.patch
View filediff --git a/community/apache-orc/protobuf-31.patch b/community/apache-orc/protobuf-31.patch
new file mode 100644
index 0000000..8febc3f
--- /dev/null
+++ b/community/apache-orc/protobuf-31.patch
@@ -0,0 +1,56 @@
+diff --git a/c++/src/io/InputStream.cc b/c++/src/io/InputStream.cc
+index 06ef40bd4..5e1dc00cc 100644
+--- a/c++/src/io/InputStream.cc
++++ b/c++/src/io/InputStream.cc
+@@ -112,8 +112,8 @@ namespace orc {
+ return false;
+ }
+
+- google::protobuf::int64 SeekableArrayInputStream::ByteCount() const {
+- return static_cast<google::protobuf::int64>(position_);
++ int64_t SeekableArrayInputStream::ByteCount() const {
++ return static_cast<int64_t>(position_);
+ }
+
+ void SeekableArrayInputStream::seek(PositionProvider& seekPosition) {
+diff --git a/c++/src/io/InputStream.hh b/c++/src/io/InputStream.hh
+index 07aa623b5..8b251c930 100644
+--- a/c++/src/io/InputStream.hh
++++ b/c++/src/io/InputStream.hh
+@@ -72,7 +72,7 @@ namespace orc {
+ virtual bool Next(const void** data, int* size) override;
+ virtual void BackUp(int count) override;
+ virtual bool Skip(int count) override;
+- virtual google::protobuf::int64 ByteCount() const override;
++ virtual int64_t ByteCount() const override;
+ virtual void seek(PositionProvider& position) override;
+ virtual std::string getName() const override;
+ };
+diff --git a/c++/src/io/OutputStream.cc b/c++/src/io/OutputStream.cc
+index fbf1ca61d..a55050d12 100644
+--- a/c++/src/io/OutputStream.cc
++++ b/c++/src/io/OutputStream.cc
+@@ -65,8 +65,8 @@ namespace orc {
+ // PASS
+ }
+
+- google::protobuf::int64 BufferedOutputStream::ByteCount() const {
+- return static_cast<google::protobuf::int64>(dataBuffer_->size());
++ int64_t BufferedOutputStream::ByteCount() const {
++ return static_cast<int64_t>(dataBuffer_->size());
+ }
+
+ bool BufferedOutputStream::WriteAliasedRaw(const void*, int) {
+diff --git a/c++/src/io/OutputStream.hh b/c++/src/io/OutputStream.hh
+index 6319de96d..b02981812 100644
+--- a/c++/src/io/OutputStream.hh
++++ b/c++/src/io/OutputStream.hh
+@@ -61,7 +61,7 @@ namespace orc {
+
+ virtual bool Next(void** data, int* size) override;
+ virtual void BackUp(int count) override;
+- virtual google::protobuf::int64 ByteCount() const override;
++ virtual int64_t ByteCount() const override;
+ virtual bool WriteAliasedRaw(const void* data, int size) override;
+ virtual bool AllowsAliasing() const override;
+
community/bitcoin/APKBUILD
View filediff --git a/community/bitcoin/APKBUILD b/community/bitcoin/APKBUILD
index 63f0f6b..6539406 100644
--- a/community/bitcoin/APKBUILD
+++ b/community/bitcoin/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Stuart Cardall <[email protected]>
pkgname=bitcoin
pkgver=27.0
-pkgrel=3
+pkgrel=4
pkgdesc="Decentralized P2P electronic cash system"
url="https://www.bitcoincore.org/"
# x86: segfault in check
community/bloaty/APKBUILD
View filediff --git a/community/bloaty/APKBUILD b/community/bloaty/APKBUILD
index eebc2de..22f1312 100644
--- a/community/bloaty/APKBUILD
+++ b/community/bloaty/APKBUILD
@@ -3,7 +3,7 @@
maintainer="Celeste <[email protected]>"
pkgname=bloaty
pkgver=1.1
-pkgrel=28
+pkgrel=29
pkgdesc="Bloaty McBloatface: a size profiler for binaries"
options="!check" # no test suite
url="https://github.com/google/bloaty"
community/curaengine/APKBUILD
View filediff --git a/community/curaengine/APKBUILD b/community/curaengine/APKBUILD
index ccb2ed2..03f6265 100644
--- a/community/curaengine/APKBUILD
+++ b/community/curaengine/APKBUILD
@@ -3,7 +3,7 @@
pkgname=curaengine
# If you plan to upgrade curaengine, libarcus probably needs to be upgraded too
pkgver=5.2.2
-pkgrel=14
+pkgrel=15
pkgdesc="3D slicer engine"
url="https://github.com/Ultimaker/CuraEngine"
license="AGPL-3.0-or-later"
community/flare/APKBUILD
View filediff --git a/community/flare/APKBUILD b/community/flare/APKBUILD
index 8b464d6..7d3d75b 100644
--- a/community/flare/APKBUILD
+++ b/community/flare/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Krassy Boykinov <[email protected]>
pkgname=flare
pkgver=0.16.0
-pkgrel=0
+pkgrel=1
pkgdesc="Unofficial Signal GTK client"
url="https://gitlab.com/schmiddi-on-mobile/flare"
arch="all"
community/grpc/APKBUILD
View filediff --git a/community/grpc/APKBUILD b/community/grpc/APKBUILD
index 603c422..fb1e8ac 100644
--- a/community/grpc/APKBUILD
+++ b/community/grpc/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: wener <[email protected]>
pkgname=grpc
pkgver=1.73.0
-pkgrel=0
+pkgrel=1
pkgdesc="The C based gRPC"
url="https://grpc.io/"
arch="all"
community/kicad/APKBUILD
View filediff --git a/community/kicad/APKBUILD b/community/kicad/APKBUILD
index 1f60c69..20d6c27 100644
--- a/community/kicad/APKBUILD
+++ b/community/kicad/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Marian Buschsieweke <[email protected]>
pkgname=kicad
pkgver=9.0.2
-pkgrel=1
+pkgrel=2
pkgdesc="Cross Platform and Open Source Electronics Design Automation Suite"
url="https://www.kicad.org/"
# No support for s390x/riscv64 in libcontext (shipped with kicad)
community/knot-resolver/APKBUILD
View filediff --git a/community/knot-resolver/APKBUILD b/community/knot-resolver/APKBUILD
index 79f5a9f..f8c915c 100644
--- a/community/knot-resolver/APKBUILD
+++ b/community/knot-resolver/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Jakub Jirutka <[email protected]>
pkgname=knot-resolver
pkgver=5.7.4
-pkgrel=2
+pkgrel=3
pkgdesc="Minimalistic caching DNS resolver implementation"
url="https://www.knot-resolver.cz/"
# s390x some problem with luajit
community/kosmindoormap/APKBUILD
View filediff --git a/community/kosmindoormap/APKBUILD b/community/kosmindoormap/APKBUILD
index d869be2..a67f986 100644
--- a/community/kosmindoormap/APKBUILD
+++ b/community/kosmindoormap/APKBUILD
@@ -5,7 +5,7 @@
maintainer="team/kde <[email protected]>"
pkgname=kosmindoormap
pkgver=25.04.0
-pkgrel=0
+pkgrel=1
# armhf blocked by qt6-qtdeclarative
arch="all !armhf"
url="https://invent.kde.org/libraries/kosmindoormap"
community/kpublictransport/APKBUILD
View filediff --git a/community/kpublictransport/APKBUILD b/community/kpublictransport/APKBUILD
index dadae92..07c7d84 100644
--- a/community/kpublictransport/APKBUILD
+++ b/community/kpublictransport/APKBUILD
@@ -3,7 +3,7 @@
maintainer="team/kde <[email protected]>"
pkgname=kpublictransport
pkgver=25.04.0
-pkgrel=0
+pkgrel=1
# armhf blocked by qt6-qtdeclarative
arch="all !armhf"
url="https://invent.kde.org/libraries/kpublictransport"
@@ -37,7 +37,11 @@ build() {
}
check() {
- ctest --test-dir build -E "(hafasmgaterequest|efarequest)test"
+ local _disabled_tests="hafasmgaterequest|efarequest"
+ case "$CARCH" in
+ riscv64) _disabled_tests="$_disabled_tests|cache" ;;
+ esac
+ ctest --test-dir build -E "($_disabled_tests)test"
}
package() {
community/libarcus/APKBUILD
View filediff --git a/community/libarcus/APKBUILD b/community/libarcus/APKBUILD
index 6ffde83..81983b3 100644
--- a/community/libarcus/APKBUILD
+++ b/community/libarcus/APKBUILD
@@ -5,7 +5,7 @@ pkgname=libarcus
# Should be in sync with the CuraEngine aport, but sometimes
# upstream doesn't version them together
pkgver=5.2.2
-pkgrel=7
+pkgrel=8
pkgdesc="Communication library for Cura"
url="https://github.com/Ultimaker/libArcus"
arch="all"
@@ -22,7 +22,9 @@ options="!check" # no test suite
source="https://github.com/Ultimaker/libArcus/archive/$pkgver/libArcus-$pkgver.tar.gz
cmake-build.patch
ArcusConfig.patch
- pb-errorcollector.patch"
+ pb-errorcollector.patch
+ protobuf-31.patch
+ "
builddir="$srcdir/libArcus-$pkgver"
build() {
@@ -45,4 +47,5 @@ d33fb7dae1fef4d99bad7a165b02767b9e8d1f48dc3e2d4fe635a56019f294c9703762421efcf3bc
87c8d80afca0be287d8686e3a2133753f95dbc361fbffda8f0cfd63a8890fff9a9374e00bb6d42040ef23def9a116126e0d5a1a001d596dc74934292ed0791d7 cmake-build.patch
9a058e240014de0c6698b3cc38a4b5064455adc0901fad05c0f78b67ae6cf82e9ca5dd4e74a8cc95d8915fd57b10336c7974b19f061e5a53a28d7b63f80c4851 ArcusConfig.patch
0d6c4fa0916bc3c0d7dbf3dadf8c99aa3b8161775094f3e00a21795baf146af37f02815f904010bdd3780ff942132e2a13b49808fad5497cf4770199fa6f72e5 pb-errorcollector.patch
+3c6118736038b7593a5975f813ed2a6e181fde4e14fc57c9784169037e1ab9181df64d13ef6af5d6dd035d4431778fdc2f84f57a774650b2b8c7443bf3da6496 protobuf-31.patch
"
community/libarcus/protobuf-31.patch
View filediff --git a/community/libarcus/protobuf-31.patch b/community/libarcus/protobuf-31.patch
new file mode 100644
index 0000000..df8bd2a
--- /dev/null
+++ b/community/libarcus/protobuf-31.patch
@@ -0,0 +1,31 @@
+diff --git a/src/MessageTypeStore.cpp b/src/MessageTypeStore.cpp
+index 44c94ec..3b66c06 100644
+--- a/src/MessageTypeStore.cpp
++++ b/src/MessageTypeStore.cpp
+@@ -114,7 +114,7 @@ MessagePtr Arcus::MessageTypeStore::createMessage(const std::string& type_name)
+
+ uint32_t Arcus::MessageTypeStore::getMessageTypeId(const MessagePtr& message)
+ {
+- return hash(message->GetTypeName());
++ return hash(std::string(message->GetTypeName()));
+ }
+
+ std::string Arcus::MessageTypeStore::getErrorMessages() const
+@@ -124,7 +124,7 @@ std::string Arcus::MessageTypeStore::getErrorMessages() const
+
+ bool Arcus::MessageTypeStore::registerMessageType(const google::protobuf::Message* message_type)
+ {
+- uint32_t type_id = hash(message_type->GetTypeName());
++ uint32_t type_id = hash(std::string(message_type->GetTypeName()));
+
+ if (hasType(type_id))
+ {
+@@ -185,7 +185,7 @@ bool Arcus::MessageTypeStore::registerAllMessageTypes(const std::string& file_na
+ {
+ auto message_type_descriptor = descriptor->message_type(i);
+ auto message_type = d->message_factory->GetPrototype(message_type_descriptor);
+- uint32_t type_id = hash(message_type->GetTypeName());
++ uint32_t type_id = hash(std::string(message_type->GetTypeName()));
+ #ifdef ARCUS_DEBUG
+ std::cerr << message_type->GetTypeName() << ": " << type_id << std::endl;
+ #endif // ARCUS_DEBUG
community/libphonenumber/APKBUILD
View filediff --git a/community/libphonenumber/APKBUILD b/community/libphonenumber/APKBUILD
index 0d5d318..a04327e 100644
--- a/community/libphonenumber/APKBUILD
+++ b/community/libphonenumber/APKBUILD
@@ -3,7 +3,7 @@
maintainer="fossdd <[email protected]>"
pkgname=libphonenumber
pkgver=9.0.5
-pkgrel=0
+pkgrel=1
pkgdesc="Library for parsing, formatting, and validating international phone numbers."
url="https://github.com/google/libphonenumber"
arch="all"
community/libssc/APKBUILD
View filediff --git a/community/libssc/APKBUILD b/community/libssc/APKBUILD
index 753954d..f7d05ce 100644
--- a/community/libssc/APKBUILD
+++ b/community/libssc/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Dylan Van Assche <[email protected]>
pkgname=libssc
pkgver=0.2.2
-pkgrel=0
+pkgrel=1
pkgdesc="Library to expose Qualcomm Sensor Core sensors"
url="https://codeberg.org/DylanVanAssche/libssc"
arch="all"
community/lighthouse/APKBUILD
View filediff --git a/community/lighthouse/APKBUILD b/community/lighthouse/APKBUILD
index 0eac55d..fff0941 100644
--- a/community/lighthouse/APKBUILD
+++ b/community/lighthouse/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Oleg Titov <[email protected]>
pkgname=lighthouse
pkgver=7.0.1
-pkgrel=0
+pkgrel=1
pkgdesc="Ethereum 2.0 Client"
url="https://lighthouse.sigmaprime.io/"
arch="x86_64 aarch64" # limited by upstream
community/mixxx/APKBUILD
View filediff --git a/community/mixxx/APKBUILD b/community/mixxx/APKBUILD
index 4720c9a..3410606 100644
--- a/community/mixxx/APKBUILD
+++ b/community/mixxx/APKBUILD
@@ -1,7 +1,7 @@
maintainer="fossdd <[email protected]>"
pkgname=mixxx
pkgver=2.5.1
-pkgrel=2
+pkgrel=3
pkgdesc="DJ mixing software"
url="https://www.mixxx.org/"
# armhf: qt6-qtdeclarative
community/mumble/APKBUILD
View filediff --git a/community/mumble/APKBUILD b/community/mumble/APKBUILD
index 922a1a9..b58be00 100644
--- a/community/mumble/APKBUILD
+++ b/community/mumble/APKBUILD
@@ -4,7 +4,7 @@
pkgname=mumble
pkgver=1.5.735
_srvname="mumble-server"
-pkgrel=3
+pkgrel=4
pkgdesc="Low-latency, high quality voice chat software"
url="https://wiki.mumble.info/"
arch="all"
community/netdata/APKBUILD
View filediff --git a/community/netdata/APKBUILD b/community/netdata/APKBUILD
index e4ee330..312dd2b 100644
--- a/community/netdata/APKBUILD
+++ b/community/netdata/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kevin Daudt <[email protected]>
pkgname=netdata
pkgver=1.47.5
-pkgrel=9
+pkgrel=10
pkgdesc="Real-time performance monitoring"
url="https://www.netdata.cloud/"
license="GPL-3.0-or-later"
community/nsjail/APKBUILD
View filediff --git a/community/nsjail/APKBUILD b/community/nsjail/APKBUILD
index d715ee8..8a908e4 100644
--- a/community/nsjail/APKBUILD
+++ b/community/nsjail/APKBUILD
@@ -2,7 +2,7 @@
maintainer="John Vogel <[email protected]>"
pkgname=nsjail
pkgver=3.4
-pkgrel=7
+pkgrel=8
pkgdesc="A light-weight process isolation tool"
url="https://github.com/google/nsjail"
# upstream supported architectures
community/ostinato/APKBUILD
View filediff --git a/community/ostinato/APKBUILD b/community/ostinato/APKBUILD
index cb8dc98..da06966 100644
--- a/community/ostinato/APKBUILD
+++ b/community/ostinato/APKBUILD
@@ -3,7 +3,7 @@
maintainer="Celeste <[email protected]>"
pkgname=ostinato
pkgver=1.3.0
-pkgrel=5
+pkgrel=6
pkgdesc="Packet/Traffic Generator and Analyzer"
url="https://ostinato.org/"
arch="all"
@@ -21,6 +21,7 @@ makedepends="
subpackages="$pkgname-drone $pkgname-gui"
source="$pkgname-$pkgver.tar.gz::https://github.com/pstavirs/ostinato/archive/v$pkgver.tar.gz
ModelTest.patch
+ protobuf-31.patch
"
# ModelTest::ModelTest is included and needed during linking even in release mode
@@ -55,4 +56,5 @@ gui() {
sha512sums="
8f94b95c8c9042960635228bb22fc12dbd28c44a66ed5b2c3296975eefeb274a341adf0d6126e8e9a13d2a9410b61ab3f35a9a58ce0bda970f1dbea8aaad6e38 ostinato-1.3.0.tar.gz
e0a3d2781c62b1898a80af8522b36d6b1a7aeae9831c33c42e4e76fe002ee7ebff50d432508a18046d7b5988f09d9a9f90a0433cfae1d2c1cbeaf664671abf6c ModelTest.patch
+6344bf9555d1e56b01c56e391dcf63e35815e303c8553aa65fccf67ccbfff5374ab0b72d9466a979d338aacd9ee237dc5e8d7bc516c5d6d15862cc29a809fd9b protobuf-31.patch
"
community/ostinato/protobuf-31.patch
View filediff --git a/community/ostinato/protobuf-31.patch b/community/ostinato/protobuf-31.patch
new file mode 100644
index 0000000..1b20411
--- /dev/null
+++ b/community/ostinato/protobuf-31.patch
@@ -0,0 +1,250 @@
+diff --git a/common/pythonfileformat.cpp b/common/pythonfileformat.cpp
+index b11efc8..a87c8ac 100644
+--- a/common/pythonfileformat.cpp
++++ b/common/pythonfileformat.cpp
+@@ -90,24 +90,24 @@ bool PythonFileFormat::save(const OstProto::StreamConfigList streams,
+ fields.at(k)->message_type()->file()->name()) {
+ imports.insert(
+ QString("%1 import %2").arg(
+- QString(fields.at(k)->message_type()
+- ->file()->name().c_str())
++ QString::fromStdString(std::string(fields.at(k)->message_type()
++ ->file()->name()))
+ .replace(".proto", "_pb2"),
+- fields.at(k)->message_type()->name().c_str()));
++ QString::fromStdString(std::string(fields.at(k)->message_type()->name()))));
+ imports.insert(
+ QString("%1 import %2").arg(
+- QString(fields.at(k)
+- ->file()->name().c_str())
++ QString::fromStdString(std::string(fields.at(k)
++ ->file()->name()))
+ .replace(".proto", "_pb2"),
+- fields.at(k)->name().c_str()));
++ QString::fromStdString(std::string(fields.at(k)->name()))));
+ }
+ else {
+ imports.insert(
+ QString("%1 import %2, %3").arg(
+- QString(fields.at(k)->file()->name().c_str())
++ QString::fromStdString(std::string(fields.at(k)->file()->name()))
+ .replace(".proto", "_pb2"),
+- fields.at(k)->message_type()->name().c_str(),
+- fields.at(k)->name().c_str()));
++ QString::fromStdString(std::string(fields.at(k)->message_type()->name())),
++ QString::fromStdString(std::string(fields.at(k)->name()))));
+ }
+ }
+ }
+@@ -166,7 +166,7 @@ bool PythonFileFormat::save(const OstProto::StreamConfigList streams,
+ refl->ListFields(stream.core(), &fields);
+ for (uint j = 0; j < fields.size(); j++) {
+ writeFieldAssignment(out, QString(" s.core.")
+- .append(fields.at(j)->name().c_str()),
++ .append(QString::fromStdString(std::string(fields.at(j)->name()))),
+ stream.core(), refl, fields.at(j));
+ }
+
+@@ -175,7 +175,7 @@ bool PythonFileFormat::save(const OstProto::StreamConfigList streams,
+ refl->ListFields(stream.control(), &fields);
+ for (uint j = 0; j < fields.size(); j++) {
+ writeFieldAssignment(out, QString(" s.control.")
+- .append(fields.at(j)->name().c_str()),
++ .append(QString::fromStdString(std::string(fields.at(j)->name()))),
+ stream.control(), refl, fields.at(j));
+ }
+
+@@ -186,9 +186,9 @@ bool PythonFileFormat::save(const OstProto::StreamConfigList streams,
+ out << "\n"
+ << " p = s.protocol.add()\n"
+ << " p.protocol_id.id = "
+- << QString(OstProto::Protocol_k_descriptor()
++ << QString::fromStdString(std::string(OstProto::Protocol_k_descriptor()
+ ->FindValueByNumber(protocol.protocol_id().id())
+- ->full_name().c_str())
++ ->full_name()))
+ .replace("OstProto", "ost_pb");
+ out << "\n";
+ refl = protocol.GetReflection();
+@@ -201,7 +201,7 @@ bool PythonFileFormat::save(const OstProto::StreamConfigList streams,
+ continue;
+ QString pfx(" p.Extensions[X]");
+ pfx.replace(fields.at(k)->is_extension()? "X": "Extensions[X]",
+- fields.at(k)->name().c_str());
++ QString::fromStdString(std::string(fields.at(k)->name())));
+ writeFieldAssignment(out, pfx, protocol,
+ refl, fields.at(k));
+ }
+@@ -352,7 +352,7 @@ void PythonFileFormat::writeFieldAssignment(
+ // if index >= 0 => we are writing a repeated element
+ if (fieldDesc->is_repeated() && (index < 0)) {
+ int n = refl->FieldSize(msg, fieldDesc);
+- QString var = singularize(fieldDesc->name().c_str());
++ QString var = singularize(QString::fromStdString(std::string(fieldDesc->name())));
+ for (int i = 0; i < n; i++) {
+ out << " " << var << " = " << fieldName.trimmed() << ".add()\n";
+ writeFieldAssignment(out, QString(" ").append(var),
+@@ -470,8 +470,8 @@ void PythonFileFormat::writeFieldAssignment(
+ QString module = fieldDesc->file()->name() == "protocol.proto" ?
+ "ost_pb." : "";
+ std::string val = fieldDesc->is_repeated() ?
+- refl->GetRepeatedEnum(msg, fieldDesc, index)->full_name() :
+- refl->GetEnum(msg, fieldDesc)->full_name();
++ std::string(refl->GetRepeatedEnum(msg, fieldDesc, index)->full_name()) :
++ std::string(refl->GetEnum(msg, fieldDesc)->full_name());
+ if (val != fieldDesc->default_value_enum()->full_name())
+ out << fieldName << " = " << QString::fromStdString(val)
+ .replace("OstProto.", module)
+@@ -499,7 +499,7 @@ void PythonFileFormat::writeFieldAssignment(
+ // We attempt a crude hack here to detect such fields and avoid
+ // writing assignment statements for them
+ for (uint i = 0; i < fields2.size(); i++) {
+- std::string name = fields2.at(i)->name();
++ std::string name = std::string(fields2.at(i)->name());
+ if ((fields2.at(i)->cpp_type()
+ == FieldDescriptor::CPPTYPE_BOOL)
+ && (name.find("is_override_") == 0)
+@@ -511,12 +511,12 @@ void PythonFileFormat::writeFieldAssignment(
+
+ for (uint i = 0 ; i < fields2.size(); i++) {
+ // skip auto fields that are not overridden
+- if (autoFields.contains(fields2.at(i)->name()))
++ if (autoFields.contains(std::string(fields2.at(i)->name())))
+ continue;
+
+ writeFieldAssignment(out,
+ QString("%1.%2").arg(pfxStr,
+- fields2.at(i)->name().c_str()),
++ QString::fromStdString(std::string(fields2.at(i)->name()))),
+ msg2, refl2, fields2.at(i));
+ }
+ break;
+diff --git a/rpc/pbrpcchannel.cpp b/rpc/pbrpcchannel.cpp
+index 8a87791..54481ae 100644
+--- a/rpc/pbrpcchannel.cpp
++++ b/rpc/pbrpcchannel.cpp
+@@ -108,7 +108,7 @@ void PbRpcChannel::CallMethod(
+ qDebug("RpcChannel: queueing rpc since method %d is pending;<----\n "
+ "queued method = %d:%s\n"
+ "queued message = \n%s\n---->",
+- pendingMethodId, method->index(), method->name().c_str(),
++ pendingMethodId, method->index(), std::string(method->name()),
+ req->DebugString().c_str());
+
+ call.method = method;
+@@ -128,7 +128,7 @@ void PbRpcChannel::CallMethod(
+ if (!req->IsInitialized())
+ {
+ qWarning("RpcChannel: missing required fields in request <----");
+- qDebug("req = %s\n%s", method->input_type()->name().c_str(),
This diff is incomplete. Download the complete patch.
community/pdns/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
community/protozero/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
community/qt6-qtgrpc/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
community/qt6-qtgrpc/protobuf-31.patch
View fileThis diff is incomplete. Download the complete patch.
community/seastar/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
community/usbguard/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
community/usbguard/protobuf-31.patch
View fileThis diff is incomplete. Download the complete patch.
community/valhalla/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
main/mosh/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
main/protobuf-c/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
testing/compiz/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
testing/criu/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
testing/kismet/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
testing/mir/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
testing/onnxruntime/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
testing/onnxruntime/fix-eigen.patch
View fileThis diff is incomplete. Download the complete patch.
testing/otpclient/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
testing/pulsar-client-cpp/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
testing/pulsar-client-cpp/no-werror.patch
View fileThis diff is incomplete. Download the complete patch.
testing/pulsar-client-cpp/protobuf-31.patch
View fileThis diff is incomplete. Download the complete patch.
testing/py3-arcus/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
testing/py3-arcus/protobuf-31.patch
View fileThis diff is incomplete. Download the complete patch.
testing/turn-rs/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
testing/vector/APKBUILD
View fileThis diff is incomplete. Download the complete patch.
testing/yosys/APKBUILD
View fileThis diff is incomplete. Download the complete patch.