From: benalb <benalb@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] gkrellm: install include files, remove libressl patch, adopt.
Date: Thu, 27 Jan 2022 18:59:11 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35260@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1083 bytes --]
There is a new pull request by benalb against master on the void-packages repository
https://github.com/benalb/void-packages gkrellm
https://github.com/void-linux/void-packages/pull/35260
gkrellm: install include files, remove libressl patch, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35260.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gkrellm-35260.patch --]
[-- Type: text/x-diff, Size: 2607 bytes --]
From 975fa2cfe250d9ce11c9535f42885f3b484e9710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
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 f37a2d00f9f3..000000000000
--- 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 f2c1721ac5ee..d981d2576274 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 <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}
}
next reply other threads:[~2022-01-27 17:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-27 17:59 benalb [this message]
2022-01-28 6:36 ` [PR REVIEW] " ericonr
2022-01-28 15:21 ` benalb
2022-02-06 20:59 ` Piraty
2022-02-06 20:59 ` [PR PATCH] [Merged]: " Piraty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35260@inbox.vuxu.org \
--to=benalb@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).