From edefbbbd79ff8a6bce83b38703c4e33dca3fe0f2 Mon Sep 17 00:00:00 2001 From: Giuseppe Foti Date: Sat, 28 Feb 2026 19:29:06 +0100 Subject: [PATCH] net-libs/paho-mqtt-c: add 1.3.16, drop 1.3.14-r1 Signed-off-by: Giuseppe Foti Part-of: https://codeberg.org/gentoo/gentoo/pulls/176 Merges: https://codeberg.org/gentoo/gentoo/pulls/176 Signed-off-by: Sam James --- net-libs/paho-mqtt-c/Manifest | 2 +- ...c-1.3.14-changed-bool-typedef-to-bit.patch | 86 ------------------- ...14-r1.ebuild => paho-mqtt-c-1.3.16.ebuild} | 8 +- 3 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 net-libs/paho-mqtt-c/files/paho-mqtt-c-1.3.14-changed-bool-typedef-to-bit.patch rename net-libs/paho-mqtt-c/{paho-mqtt-c-1.3.14-r1.ebuild => paho-mqtt-c-1.3.16.ebuild} (93%) diff --git a/net-libs/paho-mqtt-c/Manifest b/net-libs/paho-mqtt-c/Manifest index d85641233fcc3..b153625d146c6 100644 --- a/net-libs/paho-mqtt-c/Manifest +++ b/net-libs/paho-mqtt-c/Manifest @@ -1,3 +1,3 @@ -DIST paho-mqtt-c-1.3.14.tar.gz 1198035 BLAKE2B dfc77990b24f6c12b082fdf48cea81e52cf2ac078fd3c47edd6999248bc02a67aa06646add0207a6c05cc3904e2bc9a6245a9478d71d44521a5dcfcb2606325d SHA512 5576ac3531a5c707f92a02cbfb9d60710b42acd99f57bcde311aa224780267a5152e8b92a6b077afab4780ee236d5e0c2a0b8986453439bce4323758b3d4385b DIST paho-mqtt-c-1.3.15.tar.gz 1163925 BLAKE2B 22a9917a66e57025d715d3969a9e3b7cb110929ec6a82bf50b001739899ecca10385ccdff4b602f26c00dfe56d1aad3f0be12aacaebd4072dfdebb3da981d23d SHA512 e2c47485624f47a895aeeb4f978dd8d98fefca1c8caf9512a2adc03d0bf3c0c2225ab3f96a6ad3513f6df1976e52645248666308c42f05ce25fc8d0980947d28 +DIST paho-mqtt-c-1.3.16.tar.gz 1166432 BLAKE2B a48dd269bf61f096a0fc6b55a5a207387ecf035912bd2eebf7d6e1a21ef163e443eb72972949edcf531bb6ccfff0ae6e0fe010681cafb9d36ba97ad737f4675e SHA512 a69cb4fdd9c56d7ed7b2275610b680bd9830d9e5b5d5151edf30db052da234b0ccce93e6b9e687be3f515699b79721d9282b5a77bf7a00e1719e5264e0ad9a4a DIST paho.mqtt.testing-9d7bb80bb8b9d9cfc0b52f8cb4c1916401281103.tar.gz 180793 BLAKE2B b59f320466f28c828d0a019253c197313a203196943932d37401c0877a6adfeb0a3fe25f65690ee203f461baf32f291bec807c518f54f17dd102b57ce25de8a7 SHA512 599539300f21f4dcf88513bc0da81cb93b866d9e7f8927d0ce3d6ded6357526912dcfe4889c43cbdedeac9d57d5ff49b3bad24dcd172627d12e79755ed2c0ca2 diff --git a/net-libs/paho-mqtt-c/files/paho-mqtt-c-1.3.14-changed-bool-typedef-to-bit.patch b/net-libs/paho-mqtt-c/files/paho-mqtt-c-1.3.14-changed-bool-typedef-to-bit.patch deleted file mode 100644 index db0af797d8943..0000000000000 --- a/net-libs/paho-mqtt-c/files/paho-mqtt-c-1.3.14-changed-bool-typedef-to-bit.patch +++ /dev/null @@ -1,86 +0,0 @@ -# Changed 'bool' typedef to 'bit' -# Bug: 955115 -# Upstream: https://github.com/eclipse-paho/paho.mqtt.c/commit/ff1d9229314079321272e521c165b18c92773c9f - ---- a/src/MQTTPacket.h -+++ b/src/MQTTPacket.h -@@ -28,7 +28,7 @@ - #include "LinkedList.h" - #include "Clients.h" - --typedef unsigned int bool; -+typedef unsigned int bit; - typedef void* (*pf)(int, unsigned char, char*, size_t); - - #include "MQTTProperties.h" -@@ -67,16 +67,16 @@ typedef union - struct - { - unsigned int type : 4; /**< message type nibble */ -- bool dup : 1; /**< DUP flag bit */ -+ bit dup : 1; /**< DUP flag bit */ - unsigned int qos : 2; /**< QoS value, 0, 1 or 2 */ -- bool retain : 1; /**< retained flag bit */ -+ bit retain : 1; /**< retained flag bit */ - } bits; - #else - struct - { -- bool retain : 1; /**< retained flag bit */ -+ bit retain : 1; /**< retained flag bit */ - unsigned int qos : 2; /**< QoS value, 0, 1 or 2 */ -- bool dup : 1; /**< DUP flag bit */ -+ bit dup : 1; /**< DUP flag bit */ - unsigned int type : 4; /**< message type nibble */ - } bits; - #endif -@@ -95,24 +95,24 @@ typedef struct - #if defined(REVERSED) - struct - { -- bool username : 1; /**< 3.1 user name */ -- bool password : 1; /**< 3.1 password */ -- bool willRetain : 1; /**< will retain setting */ -+ bit username : 1; /**< 3.1 user name */ -+ bit password : 1; /**< 3.1 password */ -+ bit willRetain : 1; /**< will retain setting */ - unsigned int willQoS : 2; /**< will QoS value */ -- bool will : 1; /**< will flag */ -- bool cleanstart : 1; /**< cleansession flag */ -+ bit will : 1; /**< will flag */ -+ bit cleanstart : 1; /**< cleansession flag */ - int : 1; /**< unused */ - } bits; - #else - struct - { - int : 1; /**< unused */ -- bool cleanstart : 1; /**< cleansession flag */ -- bool will : 1; /**< will flag */ -+ bit cleanstart : 1; /**< cleansession flag */ -+ bit will : 1; /**< will flag */ - unsigned int willQoS : 2; /**< will QoS value */ -- bool willRetain : 1; /**< will retain setting */ -- bool password : 1; /**< 3.1 password */ -- bool username : 1; /**< 3.1 user name */ -+ bit willRetain : 1; /**< will retain setting */ -+ bit password : 1; /**< 3.1 password */ -+ bit username : 1; /**< 3.1 user name */ - } bits; - #endif - } flags; /**< connect flags byte */ -@@ -140,12 +140,12 @@ typedef struct - struct - { - unsigned int reserved : 7; /**< message type nibble */ -- bool sessionPresent : 1; /**< was a session found on the server? */ -+ bit sessionPresent : 1; /**< was a session found on the server? */ - } bits; - #else - struct - { -- bool sessionPresent : 1; /**< was a session found on the server? */ -+ bit sessionPresent : 1; /**< was a session found on the server? */ - unsigned int reserved : 7; /**< message type nibble */ - } bits; - #endif diff --git a/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.14-r1.ebuild b/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.16.ebuild similarity index 93% rename from net-libs/paho-mqtt-c/paho-mqtt-c-1.3.14-r1.ebuild rename to net-libs/paho-mqtt-c/paho-mqtt-c-1.3.16.ebuild index 6ffda053ef5ac..2c5156194e091 100644 --- a/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.14-r1.ebuild +++ b/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ S="${WORKDIR}/paho.mqtt.c-${PV}" LICENSE="EPL-2.0" SLOT="1.3" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="doc examples +high-performance +ssl test" # Building samples needs ssl: #912262 @@ -36,10 +36,6 @@ BDEPEND=" app-shells/bash[net] ) " -PATCHES=( - # Changed 'bool' typedef to 'bit'. See bug #955115 - "${FILESDIR}/${P}-changed-bool-typedef-to-bit.patch" -) # Tests can be run only if a MQTT broker is available RESTRICT="!test? ( test )"