Hi,

Attached is my attempt to fix sysutils/conky.  It's now working for me
in current but I am sure there is room for improvement.  Please let me
know if I need to do more.

Thanks,
Ryan
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/conky/Makefile,v
retrieving revision 1.60
diff -u -p -u -p -r1.60 Makefile
--- Makefile	17 Jul 2020 08:36:04 -0000	1.60
+++ Makefile	10 Feb 2021 15:01:45 -0000
@@ -7,7 +7,7 @@ COMMENT=	light-weight system monitor
 DISTNAME=	conky-1.9.0
 CATEGORIES=	sysutils
 HOMEPAGE=	http://conky.sourceforge.net/
-REVISION=	20
+REVISION=	21
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conky/}
 
Index: patches/patch-src_common_c
===================================================================
RCS file: patches/patch-src_common_c
diff -N patches/patch-src_common_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_common_c	10 Feb 2021 15:01:45 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/common.c
+--- src/common.c.orig
++++ src/common.c
+@@ -387,7 +387,7 @@ static void *run_update_callback(void *data)
+ 	}
+ }
+ 
+-int no_buffers;
++/*int no_buffers;*/
+ 
+ void update_stuff(void)
+ {
Index: patches/patch-src_conky_c
===================================================================
RCS file: /cvs/ports/sysutils/conky/patches/patch-src_conky_c,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-src_conky_c
--- patches/patch-src_conky_c	23 Sep 2018 21:00:17 -0000	1.7
+++ patches/patch-src_conky_c	10 Feb 2021 15:01:45 -0000
@@ -26,7 +26,24 @@ Index: src/conky.c
  long color0, color1, color2, color3, color4, color5, color6, color7, color8,
  	 color9;
  
-@@ -1015,7 +1011,7 @@ void generate_text_internal(char *p, int p_max_size,
+@@ -418,13 +414,15 @@ unsigned int text_buffer_size = DEFAULT_TEXT_BUFFER_SI
+ int utf8_mode = 0;
+ 
+ /* no buffers in used memory? */
+-int no_buffers;
++int no_buffers = 0;
+ 
+ /* pad percentages to decimals? */
+ static int pad_percents = 0;
+ 
+ static char *global_text = 0;
+ 
++enum IFUP_STRICTNESS ifup_strictness = IFUP_UP;
++
+ char *get_global_text(void)
+ {
+ 	return global_text;
+@@ -1015,7 +1013,7 @@ void generate_text_internal(char *p, int p_max_size,
  				get_powerbook_batt_info(p, p_max_size, obj->data.i);
  			}
  #endif /* __linux__ */
@@ -35,7 +52,7 @@ Index: src/conky.c
  			OBJ(if_up) {
  				if (!interface_up(obj)) {
  					DO_JUMP;
-@@ -1899,7 +1895,7 @@ void generate_text_internal(char *p, int p_max_size,
+@@ -1899,7 +1897,7 @@ void generate_text_internal(char *p, int p_max_size,
  			}
  #endif /* __linux__ */
  #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
@@ -44,7 +61,7 @@ Index: src/conky.c
  			OBJ(apm_adapter) {
  				char *msg;
  
-@@ -3494,6 +3490,7 @@ static void main_loop(void)
+@@ -3494,6 +3492,7 @@ static void main_loop(void)
  	info.looped = 0;
  	while (terminate == 0 && (total_run_times == 0 || info.looped < total_run_times)) {
  		if(update_interval_bat != NOBATTERY && update_interval_bat != update_interval_old) {
@@ -52,7 +69,7 @@ Index: src/conky.c
  			char buf[max_user_text];
  
  			get_battery_short_status(buf, max_user_text, "BAT0");
-@@ -3502,6 +3499,18 @@ static void main_loop(void)
+@@ -3502,6 +3501,18 @@ static void main_loop(void)
  			} else {
  				update_interval = update_interval_old;
  			}
Index: patches/patch-src_conky_h
===================================================================
RCS file: patches/patch-src_conky_h
diff -N patches/patch-src_conky_h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_conky_h	10 Feb 2021 15:01:45 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Index: src/conky.h
+--- src/conky.h.orig
++++ src/conky.h
+@@ -206,11 +206,13 @@ enum {
+ 
+ /* if_up strictness selector
+  * needed by conky.c and linux.c (and potentially others) */
+-enum {
++enum IFUP_STRICTNESS {
+ 	IFUP_UP,
+ 	IFUP_LINK,
+ 	IFUP_ADDR
+-} ifup_strictness;
++};
++
++extern enum IFUP_STRICTNESS ifup_strictness;
+ 
+ struct information {
+ 	unsigned int mask;

Reply via email to