[arch-commits] Commit in arcus/repos/community-x86_64 (4 files)

Jelle van der Waa jelle at gemini.archlinux.org
Sat Feb 5 14:58:49 UTC 2022


    Date: Saturday, February 5, 2022 @ 14:58:49
  Author: jelle
Revision: 1126447

archrelease: copy trunk to community-x86_64

Added:
  arcus/repos/community-x86_64/PKGBUILD
    (from rev 1126446, arcus/trunk/PKGBUILD)
  arcus/repos/community-x86_64/protobuf-3.18.patch
    (from rev 1126446, arcus/trunk/protobuf-3.18.patch)
Deleted:
  arcus/repos/community-x86_64/PKGBUILD
  arcus/repos/community-x86_64/protobuf-3.18.patch

---------------------+
 PKGBUILD            |   89 +++++++++++++++++++++++++-------------------------
 protobuf-3.18.patch |   30 ++++++++--------
 2 files changed, 60 insertions(+), 59 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-05 14:58:43 UTC (rev 1126446)
+++ PKGBUILD	2022-02-05 14:58:49 UTC (rev 1126447)
@@ -1,44 +0,0 @@
-# Maintainer: Jelle van der Waa <jelle at archlinux.org>
-# Contributor: Grey Christoforo <first name [at] last name [dot] net>
-
-# upstreamed renamed to libarcus
-pkgname=arcus
-pkgver=4.13.0
-pkgrel=1
-pkgdesc="Communication library between internal components for Ultimaker software"
-url="https://github.com/Ultimaker/libArcus"
-arch=('x86_64')
-license=('LGPL')
-makedepends=('cmake' 'sip4')
-depends=('python' 'protobuf' 'python-sip4')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/libArcus/archive/${pkgver}.tar.gz"
-        protobuf-3.18.patch)
-sha512sums=('a48ab1cb286c13b817363e113707499f2619724c8d2f7672309f9aad78123a89f60e60e92932d8761af87ec5f868f8c319717457532d45e3f2d8e5c3cc010db5'
-            '5aa03da6a8db4fd3145c61bca587aac6c622536dc8211ca19be2c37ce33bf8a53508a95aa35d40d7972c7f0fea3e66ee0c506eda932be35751238f4d7f7e0d61')
-
-prepare() {
-  cd libArcus-${pkgver}
-  mkdir build
-  patch -Np1 -i ../protobuf-3.18.patch
-}
-
-build() {
-  cd libArcus-${pkgver}/build
-
-  cmake .. \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DBUILD_EXAMPLES=OFF  \
-  -DCMAKE_INSTALL_LIBDIR=/usr/lib/
-
-  make
-}
-
-package() {
-  cd libArcus-${pkgver}/build
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}/libArcus-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: arcus/repos/community-x86_64/PKGBUILD (from rev 1126446, arcus/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-02-05 14:58:49 UTC (rev 1126447)
@@ -0,0 +1,45 @@
+# Maintainer: Jelle van der Waa <jelle at archlinux.org>
+# Contributor: Grey Christoforo <first name [at] last name [dot] net>
+
+# upstreamed renamed to libarcus
+pkgname=arcus
+pkgver=4.13.1
+pkgrel=1
+pkgdesc="Communication library between internal components for Ultimaker software"
+url="https://github.com/Ultimaker/libArcus"
+arch=('x86_64')
+license=('LGPL')
+makedepends=('cmake' 'sip4')
+depends=('python' 'protobuf' 'python-sip4')
+options=('debug')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/libArcus/archive/${pkgver}.tar.gz"
+        protobuf-3.18.patch)
+sha512sums=('ffb14595f23c47f71082b994eae01471f45e2e9e1ae9a8ad01df577b9445594c30173388beab016a92be9723638ca6e46b5cecddddc6adc97e9d212fc0fa23fa'
+            '5aa03da6a8db4fd3145c61bca587aac6c622536dc8211ca19be2c37ce33bf8a53508a95aa35d40d7972c7f0fea3e66ee0c506eda932be35751238f4d7f7e0d61')
+
+prepare() {
+  cd libArcus-${pkgver}
+  mkdir build
+  patch -Np1 -i ../protobuf-3.18.patch
+}
+
+build() {
+  cd libArcus-${pkgver}/build
+
+  cmake .. \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_BUILD_TYPE=None \
+  -DBUILD_EXAMPLES=OFF  \
+  -DCMAKE_INSTALL_LIBDIR=/usr/lib/
+
+  make
+}
+
+package() {
+  cd libArcus-${pkgver}/build
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 "${srcdir}/libArcus-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: protobuf-3.18.patch
===================================================================
--- protobuf-3.18.patch	2022-02-05 14:58:43 UTC (rev 1126446)
+++ protobuf-3.18.patch	2022-02-05 14:58:49 UTC (rev 1126447)
@@ -1,15 +0,0 @@
-# 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));

Copied: arcus/repos/community-x86_64/protobuf-3.18.patch (from rev 1126446, arcus/trunk/protobuf-3.18.patch)
===================================================================
--- protobuf-3.18.patch	                        (rev 0)
+++ protobuf-3.18.patch	2022-02-05 14:58:49 UTC (rev 1126447)
@@ -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));



More information about the arch-commits mailing list