[arch-commits] Commit in arcus/trunk (PKGBUILD protobuf-3.18.patch)

[Evangelos Foutras]

    Date: Wednesday, December 22, 2021 @ 20:46:26
  Author: foutrelis
Revision: 1082876

Fix build with protobuf 3.18

Added:
  arcus/trunk/protobuf-3.18.patch
Modified:
  arcus/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   18 ++++++++++++------
 protobuf-3.18.patch |   15 +++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-22 20:00:33 UTC (rev 1082875)
+++ PKGBUILD	2021-12-22 20:46:26 UTC (rev 1082876)
@@ -11,14 +11,20 @@
 license=('LGPL')
 makedepends=('cmake' 'sip4')
 depends=('python' 'protobuf' 'python-sip4')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/libArcus/archive/${pkgver}.tar.gz")
-sha512sums=('3a23b63787121b510f35c77f8d184a1773a8e53e7e15a238a7454022c30674a687d9b74414516c24f3330e8689243fad93e82eb50f3d8a64b748020bd2c7b135')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/libArcus/archive/${pkgver}.tar.gz"
+        protobuf-3.18.patch)
+sha512sums=('3a23b63787121b510f35c77f8d184a1773a8e53e7e15a238a7454022c30674a687d9b74414516c24f3330e8689243fad93e82eb50f3d8a64b748020bd2c7b135'
+            '5aa03da6a8db4fd3145c61bca587aac6c622536dc8211ca19be2c37ce33bf8a53508a95aa35d40d7972c7f0fea3e66ee0c506eda932be35751238f4d7f7e0d61')
 
+prepare() {
+  cd libArcus-${pkgver}
+  mkdir build
+  patch -Np1 -i ../protobuf-3.18.patch
+}
+
 build() {
-  cd libArcus-${pkgver}
-  mkdir -p build
-  cd build
-  
+  cd libArcus-${pkgver}/build
+
   cmake .. \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DCMAKE_BUILD_TYPE=Release \

Added: protobuf-3.18.patch
===================================================================
--- protobuf-3.18.patch	                        (rev 0)
+++ protobuf-3.18.patch	2021-12-22 20:46:26 UTC (rev 1082876)
@@ -0,0 +1,15 @@
+# https://github.com/coryan/vcpkg/blob/master/ports/arcus/0001-fix-protobuf-deprecated.patch
+
+diff --git a/src/Socket_p.h b/src/Socket_p.h
+index 9c3c084..9ccabda 100644
+--- a/src/Socket_p.h
++++ b/src/Socket_p.h
+@@ -548,7 +548,7 @@ namespace Arcus
+ 
+         google::protobuf::io::ArrayInputStream array(wire_message->data, wire_message->size);
+         google::protobuf::io::CodedInputStream stream(&array);
+-        stream.SetTotalBytesLimit(message_size_maximum, message_size_warning);
++        stream.SetTotalBytesLimit(message_size_maximum);
+         if(!message->ParseFromCodedStream(&stream))
+         {
+             error(ErrorCode::ParseFailedError, "Failed to parse message:" + std::string(wire_message->data));