Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
From 9a501e6ecdaf65d28362e5888a0529fb734a353e Mon Sep 17 00:00:00 2001
From: Leon Adomaitis <leon@adomaitis.de>
Date: Fri, 27 Mar 2026 02:18:55 +0100
Subject: [PATCH] fix(omemo): add missing includes for libomemo-c builds

Signed-off-by: Leon Adomaitis <leon@adomaitis.de>
---
src/omemo/crypto.h | 7 +++++++
src/omemo/store.c | 2 +-
src/omemo/store.h | 8 ++++++--
3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/omemo/crypto.h b/src/omemo/crypto.h
index 313fcf4ac166..8bca9794e299 100644
--- a/src/omemo/crypto.h
+++ b/src/omemo/crypto.h
@@ -8,7 +8,14 @@
*/
#include <stdio.h>
#include <stdbool.h>
+#include "config.h"
+
+#ifdef HAVE_LIBOMEMO_C
+#include <omemo/signal_protocol_types.h>
+#else
#include <signal/signal_protocol_types.h>
+#endif
+
#include <gcrypt.h>

#define AES128_GCM_KEY_LENGTH 16
diff --git a/src/omemo/store.c b/src/omemo/store.c
index 3630076e0b2f..761e9b0e0b2f 100644
--- a/src/omemo/store.c
+++ b/src/omemo/store.c
@@ -7,6 +7,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
*/
#include <glib.h>
+#include "config.h"

#ifdef HAVE_LIBOMEMO_C
#include <omemo/signal_protocol.h>
@@ -14,7 +15,6 @@
#include <signal/signal_protocol.h>
#endif

-#include "config.h"
#include "log.h"
#include "omemo/omemo.h"
#include "omemo/store.h"
diff --git a/src/omemo/store.h b/src/omemo/store.h
index 99d1678892dd..23378d76c95c 100644
--- a/src/omemo/store.h
+++ b/src/omemo/store.h
@@ -6,10 +6,14 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
*/
-#include <signal/signal_protocol.h>
-
#include "config.h"

+#ifdef HAVE_LIBOMEMO_C
+#include <omemo/signal_protocol.h>
+#else
+#include <signal/signal_protocol.h>
+#endif
+
#define OMEMO_STORE_GROUP_IDENTITY "identity"
#define OMEMO_STORE_GROUP_PREKEYS "prekeys"
#define OMEMO_STORE_GROUP_SIGNED_PREKEYS "signed_prekeys"
--
2.53.0

17 changes: 9 additions & 8 deletions srcpkgs/profanity/template
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
# Template file for 'profanity'
pkgname=profanity
version=0.16.0
version=0.17.0
revision=1
build_style=gnu-configure
configure_args="--enable-notifications --enable-otr --enable-pgp
--enable-python-plugins --enable-plugins --with-xscreensaver --enable-omemo
--enable-c-plugins ac_cv_prog_PYTHON_CONFIG_EXISTS=yes PYTHON_VERSION=3"
build_style=meson
configure_args="-Dnotifications=enabled -Dotr=enabled -Dpgp=enabled
-Dpython-plugins=enabled -Dc-plugins=enabled -Dxscreensaver=enabled
-Domemo=enabled -Domemo-backend=libomemo-c -Domemo-qrcode=enabled
-Dicons-and-clipboard=enabled -Dtests=true"
hostmakedepends="pkg-config python3-devel gtk+3-devel"
makedepends="libcurl-devel libglib-devel libstrophe-devel readline-devel
sqlite-devel libnotify-devel libotr-devel libgcrypt-devel gpgme-devel
python3-devel gtk+3-devel libXScrnSaver-devel libsignal-protocol-c-devel
python3-devel gtk+3-devel libXScrnSaver-devel libomemo-c-devel
libgcrypt-devel qrencode-devel"
checkdepends="cmocka-devel"
short_desc="Console based XMPP client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://profanity-im.github.io/"
changelog="https://raw.githubusercontent.com/profanity-im/profanity/master/CHANGELOG"
distfiles="https://github.com/profanity-im/profanity/releases/download/${version}/profanity-${version}.tar.gz"
checksum=1f2e36a081cd299173f1c12b64b1cef971063e67bf226fb3f7048f2e67bd6a70
distfiles="https://github.com/profanity-im/profanity/archive/refs/tags/${version}.tar.gz"
checksum=1b3282e1ce22178570616b2309019c40c4c97f0b30562bd4b455f60534a4e170

case "$XBPS_TARGET_MACHINE" in
arm*)
Expand Down