gkrellm: install include files, remove libressl patch, adopt.

This commit is contained in:
Benjamín Albiñana 2022-01-27 18:56:50 +01:00 committed by Piraty
parent e43725d530
commit 052e633bb2
2 changed files with 2 additions and 37 deletions

View file

@ -1,34 +0,0 @@
diff --git src/mail.c src/mail.c
index 6615f31..205b56f 100644
--- a/src/mail.c
+++ b/src/mail.c
-#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
static void
ssl_locking_cb(int mode, int n, const char *file, int line)
{
@@ -452,7 +452,7 @@ update_tooltip(void)
MailAccount *account;
GString *mboxes = NULL;
gchar buf[128];
-
+
if (show_tooltip)
{
mboxes = g_string_sized_new(512);
@@ -4399,8 +4399,10 @@ gkrellm_init_mail_monitor(void)
ssl_locks[i] = g_new(GMutex, 1);
g_mutex_init(ssl_locks[i]);
}
+#ifndef LIBRESSL_VERSION_NUMBER
CRYPTO_set_locking_callback(ssl_locking_cb);
#endif
+#endif
#endif
mail_fetch = g_new0(Mailbox, 1);
@@ -4526,4 +4528,3 @@ gkrellm_destroy_external_mbox(gpointer mbox_ptr)
}
/* =======================================================================*/
-

View file

@ -1,12 +1,12 @@
# Template file for 'gkrellm'
pkgname=gkrellm
version=2.3.11
revision=3
revision=4
build_style=gnu-makefile
hostmakedepends="pkg-config gettext which"
makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
short_desc="GTK2 based system monitor"
maintainer="Orphaned <orphan@voidlinux.org>"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-3.0.or-later"
homepage="http://gkrellm.srcbox.net"
distfiles="${homepage}/releases/gkrellm-${version}.tar.bz2"
@ -14,5 +14,4 @@ checksum=1ee0643ed9ed99f88c1504c89d9ccb20780cf29319c904b68e80a8e7c8678c06
do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} STRIP= install
rm -r ${DESTDIR}/usr/{include,lib}
}