haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gloox: update to 1.0.27, remove upstreamed patches

Browse Source
This commit is contained in:
PulkoMandy
2023-05-29 13:23:59 +02:00
parent 4d0a872326
commit 358c5a2b64
2 changed files with 1 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net-libs/gloox/gloox-1.0.26.recipe → net-libs/gloox/gloox-1.0.27.recipe
View File

@@ -5,7 +5,7 @@ COPYRIGHT="2002-2023 Jakob Schröter"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://camaya.net/download/gloox-$portVersion.tar.bz2"
CHECKSUM_SHA256="6b45b390d3b0346a3cf6cc118d5ccafcdf10d51be57a02b0076edf064033ab6f"
CHECKSUM_SHA256="0b8b7371439bc58d9e51384b616c964b18b7b41b87af1b7855104380eda86ffb"
PATCHES="gloox-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"

75
net-libs/gloox/patches/gloox-1.0.26.patchset → net-libs/gloox/patches/gloox-1.0.27.patchset
View File

@@ -70,78 +70,3 @@ index 2d1c210..cc03de2 100644
AC_DEFINE(HAVE_RES_QUERY)
--
2.37.3
From caf6cb2ff803b9e4e670ebaf05d6f6803b6f45fb Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Tue, 4 Apr 2023 13:03:27 +0200
Subject: Add a way to send a message to a MUC Room with stanza extensions
This is not possible otherwise because the internal mucmessagesession is
not available to the client.
diff --git a/src/mucroom.cpp b/src/mucroom.cpp
index 2a06485..7b9950d 100644
--- a/src/mucroom.cpp
+++ b/src/mucroom.cpp
@@ -702,6 +702,12 @@ namespace gloox
m_session->send( message );
}
+ void MUCRoom::send( const std::string& message, const std::string& subject, const StanzaExtensionList& sel )
+ {
+ if( m_session && m_joined )
+ m_session->send( message, subject, sel );
+ }
+
void MUCRoom::setSubject( const std::string& subject )
{
if( m_session && m_joined )
diff --git a/src/mucroom.h b/src/mucroom.h
index 73b8c93..4509d94 100644
--- a/src/mucroom.h
+++ b/src/mucroom.h
@@ -411,6 +411,7 @@ namespace gloox
* @param message The message to send.
*/
void send( const std::string& message );
+ void send( const std::string& message, const std::string& subject, const StanzaExtensionList& sel = StanzaExtensionList() );
/**
* Sets the subject of the room to the given string.
--
2.37.3
From a2a0fd3431deba7ed8f2ce6c2b36dc3cdfbb3313 Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Tue, 4 Apr 2023 13:42:40 +0200
Subject: Bookmark storage: allow empty bookmarks
XEP-0048 says the name is RECOMMENDED. So it's allowed to not have one.
diff --git a/src/bookmarkstorage.cpp b/src/bookmarkstorage.cpp
index 91ca58e..397443e 100644
--- a/src/bookmarkstorage.cpp
+++ b/src/bookmarkstorage.cpp
@@ -76,7 +76,7 @@ namespace gloox
const std::string& url = (*it)->findAttribute( "url" );
const std::string& name = (*it)->findAttribute( "name" );
- if( !url.empty() && !name.empty() )
+ if( !url.empty() )
{
BookmarkListItem item;
item.url = url;
@@ -89,7 +89,7 @@ namespace gloox
const std::string& jid = (*it)->findAttribute( "jid" );
const std::string& name = (*it)->findAttribute( "name" );
- if( !jid.empty() && !name.empty() )
+ if( !jid.empty() )
{
const std::string& join = (*it)->findAttribute( "autojoin" );
ConferenceListItem item;
--
2.37.3