From 052e633bb24e8a370d0b3d596f0f3726c73031ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Thu, 27 Jan 2022 18:56:50 +0100 Subject: [PATCH] gkrellm: install include files, remove libressl patch, adopt. --- srcpkgs/gkrellm/patches/libressl.patch | 34 -------------------------- srcpkgs/gkrellm/template | 5 ++-- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/gkrellm/patches/libressl.patch diff --git a/srcpkgs/gkrellm/patches/libressl.patch b/srcpkgs/gkrellm/patches/libressl.patch deleted file mode 100644 index f37a2d00f9..0000000000 --- a/srcpkgs/gkrellm/patches/libressl.patch +++ /dev/null @@ -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) - } - - /* =======================================================================*/ -- diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template index f2c1721ac5..d981d25762 100644 --- a/srcpkgs/gkrellm/template +++ b/srcpkgs/gkrellm/template @@ -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 " +maintainer="Benjamín Albiñana " 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} }