- Update conky to 1.11.6

- Remove patch now included upstream
This commit is contained in:
Guido Falsi 2020-07-27 21:59:58 +00:00
parent ca2559efd4
commit e3f5ccd379
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=543553
3 changed files with 4 additions and 16 deletions

View file

@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= conky
PORTVERSION= 1.11.5
PORTVERSION= 1.11.6
DISTVERSIONPREFIX= v
PORTREVISION= 3
CATEGORIES= sysutils
MAINTAINER= madpilot@FreeBSD.org

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1565781705
SHA256 (brndnmtthws-conky-v1.11.5_GH0.tar.gz) = 4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13
SIZE (brndnmtthws-conky-v1.11.5_GH0.tar.gz) = 2400965
TIMESTAMP = 1595871488
SHA256 (brndnmtthws-conky-v1.11.6_GH0.tar.gz) = e7c01e4910744851e05f85f0a0aab3f5068215b1af850515189ac40e7deeb26d
SIZE (brndnmtthws-conky-v1.11.6_GH0.tar.gz) = 2402216

View file

@ -1,11 +0,0 @@
--- src/core.cc.orig 2019-08-12 21:53:54 UTC
+++ src/core.cc
@@ -1077,7 +1077,7 @@ struct text_object *construct_text_object(char *s, con
obj->data.s = STRNDUP_ARG;
obj->callbacks.iftest = &if_existing_iftest;
obj->callbacks.free = &gen_free_opaque;
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
END OBJ_IF_ARG(if_mounted, 0, "if_mounted needs an argument") obj->data.s =
STRNDUP_ARG;
obj->callbacks.iftest = &check_mount;