gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

x11-plugins/pidgin-gpg: fix compilation on musl

Browse Source 
Closes: https://bugs.gentoo.org/831185
Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35386
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Azamat H. Hackimov
2024-02-17 13:37:10 +03:00
committed by Joonas Niilola
parent dc02aea2e6
commit 9db4bdcc36
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
x11-plugins/pidgin-gpg/files/pidgin-gpg-0.9.3_musl-support.patch Normal file
View File

@@ -0,0 +1,32 @@
From https://github.com/Draghtnod/Pidgin-GPG/pull/9
From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
Date: Sat, 17 Feb 2024 13:28:40 +0300
Subject: [PATCH] Fix compilation on MUSL systems
In MUSL encrypt() is part of unistd.h, which conflicts with internal
static function encrypt(). Renamed last one to fix that.
See: https://bugs.gentoo.org/831185
--- a/src/pidgin-gpg.c
+++ b/src/pidgin-gpg.c
@@ -604,7 +604,7 @@ static char* verify( const char* sig_str ) {
* encrypt a plain string with the key found with fingerprint fpr
* FREE MEMORY AFTER USAGE OF RETURN VALUE!
* ------------------ */
-static char* encrypt( gpgme_ctx_t* ctx, gpgme_key_t* key_arr, const char* plain_str, const char* fpr ) {
+static char* pidgin_gpg_encrypt( gpgme_ctx_t* ctx, gpgme_key_t* key_arr, const char* plain_str, const char* fpr ) {
if( ctx == NULL ) {
purple_debug_error( PLUGIN_ID, "encrypt: missing ctx\n" );
return NULL;
@@ -1054,7 +1054,7 @@ void jabber_send_signal_cb( PurpleConnection* pc, xmlnode** packet, gpointer unu
g_free( bare_jid );
// encrypt message
- enc_str = encrypt( &item->ctx, item->key_arr, message, item->fpr );
+ enc_str = pidgin_gpg_encrypt( &item->ctx, item->key_arr, message, item->fpr );
g_free( message );
if( enc_str != NULL ) {
// remove message from body
--
2.43.0

6
x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3-r1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,6 +20,10 @@ BDEPEND="virtual/pkgconfig"
S="${WORKDIR}/Pidgin-GPG-${PV}"
PATCHES=(
"${FILESDIR}/pidgin-gpg-0.9.3_musl-support.patch"
)
src_prepare() {
default
eautoreconf