diff --git a/net-libs/gloox/gloox-1.0.24.recipe b/net-libs/gloox/gloox-1.0.25.recipe similarity index 87% rename from net-libs/gloox/gloox-1.0.24.recipe rename to net-libs/gloox/gloox-1.0.25.recipe index fda766889..9bad4da59 100644 --- a/net-libs/gloox/gloox-1.0.24.recipe +++ b/net-libs/gloox/gloox-1.0.25.recipe @@ -1,11 +1,11 @@ SUMMARY="Full-featured Jabber/XMPP client library" DESCRIPTION="Rock-solid, full-featured Jabber/XMPP client library, written in clean ANSI C++." HOMEPAGE="https://camaya.net/gloox/" -COPYRIGHT="2002-2020 Jakob Schröter" +COPYRIGHT="2002-2023 Jakob Schröter" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="http://camaya.net/download/gloox-$portVersion.tar.bz2" -CHECKSUM_SHA256="ae1462be2a2eb8fe5cd054825143617c53c2c9c7195606cb5a5ba68c0f68f9c9" +CHECKSUM_SHA256="cffe1cbd86dbe98be856024215321cd225001d1fa7d39118b99cb9453ba22754" PATCHES="gloox-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -54,7 +54,7 @@ defineDebugInfoPackage gloox$secondaryArchSuffix \ BUILD() { autoreconf -fi - runConfigure ./configure + CFLAGS="-D_BSD_SOURCE" CXXFLAGS="-D_BSD_SOURCE" runConfigure ./configure --enable-xhtmlim make $jobArgs } diff --git a/net-libs/gloox/patches/gloox-1.0.24.patchset b/net-libs/gloox/patches/gloox-1.0.25.patchset similarity index 58% rename from net-libs/gloox/patches/gloox-1.0.24.patchset rename to net-libs/gloox/patches/gloox-1.0.25.patchset index 06c06ee70..9bd262b61 100644 --- a/net-libs/gloox/patches/gloox-1.0.24.patchset +++ b/net-libs/gloox/patches/gloox-1.0.25.patchset @@ -95,93 +95,3 @@ index 682f758..2a1a3b7 100644 -- 2.30.2 - -From de56500f16d3d8794c1379c160f3e0dd0a665f37 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sun, 13 Feb 2022 19:17:29 +0100 -Subject: Make Node and NodeList public - -These are required to process XHTML-IM content - -diff --git a/src/tag.h b/src/tag.h -index 1e37d46..d1efbf9 100644 ---- a/src/tag.h -+++ b/src/tag.h -@@ -50,6 +50,28 @@ namespace gloox - - public: - -+ enum NodeType -+ { -+ TypeTag, /**< The Node is a Tag. */ -+ TypeString /**< The Node is a std::string. */ -+ }; -+ -+ struct Node -+ { -+ Node( NodeType _type, Tag* _tag ) : type( _type ), tag( _tag ) {} -+ Node( NodeType _type, std::string* _str ) : type( _type ), str( _str ) {} -+ ~Node() {} -+ -+ NodeType type; -+ union -+ { -+ Tag* tag; -+ std::string* str; -+ }; -+ }; -+ -+ typedef std::list NodeList; -+ - /** - * An XML element's attribute. - * -@@ -411,6 +433,16 @@ namespace gloox - */ - const TagList& children() const; - -+ /** -+ * Use this function to fetch a const list of child elements. -+ * The list includes both tags and cdata nodes, all in order. -+ * @return A constant reference to the list of child elements. -+ */ -+ const NodeList& nodes() const { -+ static const NodeList empty; -+ return m_nodes ? *m_nodes : empty; -+ } -+ - /** - * This function can be used to retrieve the value of a Tag's attribute. - * @param name The name of the attribute to look for. -@@ -604,28 +636,6 @@ namespace gloox - XPUnexpectedToken - }; - -- enum NodeType -- { -- TypeTag, /**< The Node is a Tag. */ -- TypeString /**< The Node is a std::string. */ -- }; -- -- struct Node -- { -- Node( NodeType _type, Tag* _tag ) : type( _type ), tag( _tag ) {} -- Node( NodeType _type, std::string* _str ) : type( _type ), str( _str ) {} -- ~Node() {} -- -- NodeType type; -- union -- { -- Tag* tag; -- std::string* str; -- }; -- }; -- -- typedef std::list NodeList; -- - Tag* m_parent; - TagList* m_children; - StringPList* m_cdata; --- -2.30.2 -