[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/

[Patrice Clement]

commit:     0869a72937fa388f705dff3ff864d7fb02655d91
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Jun 16 19:28:36 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 06:13:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0869a729

app-admin/conky: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/1688

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 app-admin/conky/files/conky-1.10.0-cmake.patch     | 11 --------
 .../conky/files/conky-1.10.0-includefiles.patch    | 29 ----------------------
 2 files changed, 40 deletions(-)

diff --git a/app-admin/conky/files/conky-1.10.0-cmake.patch b/app-admin/conky/files/conky-1.10.0-cmake.patch
deleted file mode 100644
index 4f9d276..0000000
--- a/app-admin/conky/files/conky-1.10.0-cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/Docbook.cmake	2014-06-21 09:51:44.857916287 +0200
-+++ cmake/Docbook.cmake.new	2014-06-21 09:53:37.251924303 +0200
-@@ -72,7 +72,7 @@
- 			COMMAND ${APP_XSLTPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml > ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html
- 
- 			COMMAND ${APP_DB2X_XSLTPROC} -s man ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml -o ${FIL}.mxml
--			COMMAND ${APP_DB2X_MANXML} ${FIL}.mxml --output-dir ${CMAKE_CURRENT_SOURCE_DIR}
-+			COMMAND ${APP_DB2X_MANXML} ${FIL}.mxml --encoding=UTF8 --output-dir ${CMAKE_CURRENT_SOURCE_DIR}
- 			COMMAND ${APP_XSLTPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml > ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html
- 			COMMAND ${APP_MAN} -P '${APP_LESS} -is' ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.1 > ${CMAKE_SOURCE_DIR}/README
- 			COMMAND ${APP_SED} -i "s/[[:cntrl:]]\\[[0-9]*m//g" ${CMAKE_SOURCE_DIR}/README

diff --git a/app-admin/conky/files/conky-1.10.0-includefiles.patch b/app-admin/conky/files/conky-1.10.0-includefiles.patch
deleted file mode 100644
index 9480720..0000000
--- a/app-admin/conky/files/conky-1.10.0-includefiles.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/cmake/ConkyPlatformChecks.cmake
-+++ b/cmake/ConkyPlatformChecks.cmake
-@@ -22,7 +22,7 @@
- 
- include(FindPkgConfig)
- include(CheckFunctionExists)
--include(CheckIncludeFile)
-+include(CheckIncludeFiles)
- include(CheckSymbolExists)
- 
- # Check for some headers
-@@ -119,7 +119,7 @@ if(BUILD_HTTP)
- endif(BUILD_HTTP)
- 
- if(BUILD_NCURSES)
--	check_include_file(ncurses.h NCURSES_H)
-+	check_include_files(ncurses.h NCURSES_H)
- 	find_library(NCURSES_LIB NAMES ncurses)
- 	if(NOT NCURSES_H OR NOT NCURSES_LIB)
- 		message(FATAL_ERROR "Unable to find ncurses library")
-@@ -167,7 +167,7 @@ endif(BUILD_PORT_MONITORS)
- 
- # Check for iconv
- if(BUILD_ICONV)
--	check_include_file(iconv.h HAVE_ICONV_H)
-+	check_include_files(iconv.h HAVE_ICONV_H)
- 	find_library(ICONV_LIBRARY NAMES iconv)
- 	if(NOT ICONV_LIBRARY)
- 		# maybe iconv() is provided by libc

[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/

[Daniel Pielmeier]

commit:     736b2f1955b4852b71ce8891b719cd482878cac7
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 20:09:27 2016 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 20:09:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736b2f19

app-admin/conky: Remove unused patches.

Package-Manager: portage-2.3.0

 .../conky/files/conky-1.10.1-includewlan.patch     | 13 --------
 .../conky/files/conky-1.10.1-ncurses-tinfo.patch   | 35 ----------------------
 2 files changed, 48 deletions(-)

diff --git a/app-admin/conky/files/conky-1.10.1-includewlan.patch b/app-admin/conky/files/conky-1.10.1-includewlan.patch
deleted file mode 100644
index 82b09a7..00000000
--- a/app-admin/conky/files/conky-1.10.1-includewlan.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
---- a/cmake/ConkyPlatformChecks.cmake	2015-11-18 20:47:45.000000000 +0500
-+++ b/cmake/ConkyPlatformChecks.cmake	2016-01-31 20:04:58.036144590 +0500
-@@ -141,7 +141,8 @@
- endif(BUILD_MYSQL)
- 
- if(BUILD_WLAN)
--	check_include_file(iwlib.h IWLIB_H -D_GNU_SOURCE)
-+	set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) 
-+	check_include_files(iwlib.h IWLIB_H -D_GNU_SOURCE)
- 	if(NOT IWLIB_H)
- 		message(FATAL_ERROR "Unable to find iwlib.h")
- 	endif(NOT IWLIB_H)

diff --git a/app-admin/conky/files/conky-1.10.1-ncurses-tinfo.patch b/app-admin/conky/files/conky-1.10.1-ncurses-tinfo.patch
deleted file mode 100644
index a603959..00000000
--- a/app-admin/conky/files/conky-1.10.1-ncurses-tinfo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From dbf26f0a42a7f46d363abb150192bfcd1ccb204b Mon Sep 17 00:00:00 2001
-From: Laurent Georget <laurent@lgeorget.eu>
-Date: Sat, 14 May 2016 19:38:55 +0200
-Subject: [PATCH] Fix the `symbol stdscr not found` compilation error (#254)
-
-The compilation fails when the symbols of terminfo are not present in
-the libncurses.so. This can happen when the terminfo library libtinfo.so
-is compiled separately. Using pkg_config is the correct approach to
-handle all cases.
----
- cmake/ConkyPlatformChecks.cmake | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
-index 05d8bbd..f19ac24 100644
---- a/cmake/ConkyPlatformChecks.cmake
-+++ b/cmake/ConkyPlatformChecks.cmake
-@@ -119,12 +119,12 @@ if(BUILD_HTTP)
- endif(BUILD_HTTP)
- 
- if(BUILD_NCURSES)
--	check_include_files(ncurses.h NCURSES_H)
--	find_library(NCURSES_LIB NAMES ncurses)
--	if(NOT NCURSES_H OR NOT NCURSES_LIB)
-+	pkg_check_modules(NCURSES ncurses)
-+	if(NOT NCURSES_FOUND)
- 		message(FATAL_ERROR "Unable to find ncurses library")
--	endif(NOT NCURSES_H OR NOT NCURSES_LIB)
--	set(conky_libs ${conky_libs} ${NCURSES_LIB})
-+	endif(NOT NCURSES_FOUND)
-+	set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES})
-+	set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS})
- endif(BUILD_NCURSES)
- 
- if(BUILD_MYSQL)

[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/

[Daniel Pielmeier]

commit:     4108b3018d0df635c6c5b0e8f7ee3c990a697a6a
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  9 20:50:00 2017 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Thu Mar  9 20:50:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4108b301

app-admin/conky: Remove unused patches.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../conky/files/conky-1.8.1-utf8-scroll.patch      | 104 --------------------
 app-admin/conky/files/conky-1.9.0-apcupsd.patch    | 106 ---------------------
 .../files/conky-1.9.0-default-graph-size.patch     |  18 ----
 .../conky/files/conky-1.9.0-diskio-dmmajor.patch   |  23 -----
 app-admin/conky/files/conky-1.9.0-lines-fix.patch  |  36 -------
 app-admin/conky/files/conky-1.9.0-ncurses.patch    |  31 ------
 app-admin/conky/files/conky-1.9.0-tinfo.patch      |  22 -----
 .../files/conky-1.9.0-update-noaa-metar-uri.patch  |  11 ---
 ...1.9.0-update-when-message-count-decreases.patch |  75 ---------------
 9 files changed, 426 deletions(-)

diff --git a/app-admin/conky/files/conky-1.8.1-utf8-scroll.patch b/app-admin/conky/files/conky-1.8.1-utf8-scroll.patch
deleted file mode 100644
index 8b9e1e8fb9d..00000000000
--- a/app-admin/conky/files/conky-1.8.1-utf8-scroll.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From b1f6a30bcce020b3c377434137de9856a09b899a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Fri, 11 Nov 2011 11:27:43 +0100
-Subject: [PATCH] Make scroll UTF-8 aware.  Fixes bug #3134941.
-
----
- src/scroll.c |   44 ++++++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 42 insertions(+), 2 deletions(-)
-
-diff --git a/src/scroll.c b/src/scroll.c
-index f78f807..738db0d 100644
---- a/src/scroll.c
-+++ b/src/scroll.c
-@@ -34,12 +34,33 @@
- 
- struct scroll_data {
- 	char *text;
-+	unsigned int show_orig;
- 	unsigned int show;
- 	unsigned int step;
- 	unsigned int start;
- 	long resetcolor;
- };
- 
-+int utf8_charlen(char c) {
-+	unsigned char uc = (unsigned char) c;
-+	int len = 0;
-+
-+	if ((uc & 0x80) == 0)
-+		return 1;
-+
-+	while ((uc & 0x80) != 0) {
-+		++len;
-+		uc <<= 1;
-+	}
-+
-+	return (len > 0 && len <= 4) ? len : -1;
-+}
-+
-+int is_utf8_char_tail(char c) {
-+	unsigned char uc = (unsigned char) c;
-+	return (uc & 0xc0) == 0x80;
-+}
-+
- void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_crash)
- {
- 	struct scroll_data *sd;
-@@ -60,15 +81,18 @@ void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_cr
- 		sd->step = 1;
- 	}
- 	sd->text = malloc(strlen(arg + n1) + sd->show + 1);
-+	// sd->show value may change when there are UTF-8 chars to be shown, so
-+	// save its origin value
-+	sd->show_orig = sd->show;
- 
- 	if (strlen(arg) > sd->show) {
- 		for(n2 = 0; (unsigned int) n2 < sd->show; n2++) {
--		    sd->text[n2] = ' ';
-+			sd->text[n2] = ' ';
- 		}
- 		sd->text[n2] = 0;
- 	}
- 	else
--	    sd->text[0] = 0;
-+		sd->text[0] = 0;
- 
- 	strcat(sd->text, arg + n1);
- 	sd->start = 0;
-@@ -82,9 +106,13 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor
- {
- 	struct scroll_data *sd = obj->data.opaque;
- 	unsigned int j, colorchanges = 0, frontcolorchanges = 0, visibcolorchanges = 0, strend;
-+	int charlen = 0;
-+	unsigned int utf8lenfix = 0;
- 	char *pwithcolors;
- 	char buf[max_user_text];
- 
-+	sd->show = sd->show_orig;
-+
- 	if (!sd)
- 		return;
- 
-@@ -109,6 +137,18 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor
- 	while(*(buf + sd->start) == SPECIAL_CHAR) {
- 		sd->start++;
- 	}
-+	//skip parts of UTF-8 character which messes up display
-+	while(is_utf8_char_tail(*(buf + sd->start))) {
-+		sd->start++;
-+	}
-+	//extend length to be shown for wide characters
-+	j = 0;
-+	while(j < sd->show + visibcolorchanges + utf8lenfix) {
-+		charlen = utf8_charlen(*(buf + sd->start + j));
-+		utf8lenfix += (charlen > 1 ? charlen - 1 : 0);
-+		j += charlen;
-+	}
-+	sd->show = sd->show_orig + utf8lenfix;
- 	//place all chars that should be visible in p, including colorchanges
- 	for(j=0; j < sd->show + visibcolorchanges; j++) {
- 		p[j] = *(buf + sd->start + j);
--- 
-1.7.8.rc1
-

diff --git a/app-admin/conky/files/conky-1.9.0-apcupsd.patch b/app-admin/conky/files/conky-1.9.0-apcupsd.patch
deleted file mode 100644
index 6b942d32c4c..00000000000
--- a/app-admin/conky/files/conky-1.9.0-apcupsd.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Description: Fix broken apcupsd support in Conky 1.8.1
- Revert apcupsd-related code to Conky 1.8.0 in order to fix broken apcupsd
- support. This is a workaround until upstream properly addresses this issue.
-From: Brian Derr <bderrly@gmail.com>
-Forwarded: https://sourceforge.net/support/tracker.php?aid=3083859
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/897495
-Last-Update: 2011-12-02
-
---- a/src/apcupsd.c
-+++ b/src/apcupsd.c
-@@ -154,7 +154,7 @@
- //
- // Conky update function for apcupsd data
- //
--int update_apcupsd(void) {
-+void update_apcupsd(void) {
- 
- 	int i;
- 	APCUPSD_S apc;
-@@ -164,41 +164,44 @@
- 		memcpy(apc.items[i], "N/A", 4); // including \0
- 
- 	do {
--		struct addrinfo hints;
--		struct addrinfo *ai, *rp;
--		int res;
-+		struct hostent* he = 0;
-+		struct sockaddr_in addr;
- 		short sz = 0;
--		char portbuf[8];
-+#ifdef HAVE_GETHOSTBYNAME_R
-+		struct hostent he_mem;
-+		int he_errno;
-+		char hostbuff[2048];
-+#endif
- 		//
- 		// connect to apcupsd daemon
- 		//
--		memset(&hints, 0, sizeof(struct addrinfo));
--		hints.ai_family = AF_UNSPEC;
--		hints.ai_socktype = SOCK_STREAM;
--		hints.ai_flags = 0;
--		hints.ai_protocol = 0;
--		snprintf(portbuf, 8, "%d", info.apcupsd.port);
--		res = getaddrinfo(info.apcupsd.host, portbuf, &hints, &ai);
--		if (res != 0) {
--			NORM_ERR("APCUPSD getaddrinfo: %s", gai_strerror(res));
-+		sock = socket(AF_INET, SOCK_STREAM, 0);
-+		if (sock < 0) {
-+			perror("socket");
- 			break;
- 		}
--		for (rp = ai; rp != NULL; rp = rp->ai_next) {
--			sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
--			if (sock == -1) {
--				continue;
--			}
--			if (connect(sock, rp->ai_addr, rp->ai_addrlen) != -1) {
--				break;
--			}
--			close(sock);
-+#ifdef HAVE_GETHOSTBYNAME_R
-+		if (gethostbyname_r(info.apcupsd.host, &he_mem, hostbuff, sizeof(hostbuff), &he, &he_errno) || !he ) {
-+			NORM_ERR("APCUPSD gethostbyname_r: %s", hstrerror(h_errno));
-+			break;
-+		}
-+#else /* HAVE_GETHOSTBYNAME_R */
-+		he = gethostbyname(info.apcupsd.host);
-+		if (!he) {
-+			herror("gethostbyname");
-+			break;
- 		}
--		freeaddrinfo(ai);
--		if (rp == NULL) {
-+#endif /* HAVE_GETHOSTBYNAME_R */
-+		
-+		memset(&addr, 0, sizeof(addr));
-+		addr.sin_family = AF_INET;
-+		addr.sin_port = info.apcupsd.port;
-+		memcpy(&addr.sin_addr, he->h_addr, he->h_length);
-+		if (connect(sock, (struct sockaddr*)&addr, sizeof(struct sockaddr)) < 0) {
- 			// no error reporting, the daemon is probably not running
- 			break;
- 		}
--
-+	
- 		//
- 		// send status request - "status" - 6B
- 		//
-@@ -222,5 +225,5 @@
- 	// "atomically" copy the data into working set
- 	//
- 	memcpy(info.apcupsd.items, apc.items, sizeof(info.apcupsd.items));
--	return 0;
-+	return;
- }
---- a/src/apcupsd.h
-+++ b/src/apcupsd.h
-@@ -49,6 +49,6 @@
- } APCUPSD_S, *PAPCUPSD_S;
- 
- /* Service routine for the conky main thread */
--int update_apcupsd(void);
-+void update_apcupsd(void);
- 
- #endif /*APCUPSD_H_*/

diff --git a/app-admin/conky/files/conky-1.9.0-default-graph-size.patch b/app-admin/conky/files/conky-1.9.0-default-graph-size.patch
deleted file mode 100644
index 02f64e314e0..00000000000
--- a/app-admin/conky/files/conky-1.9.0-default-graph-size.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -U 5 conky-1.9.0/src/specials.c conky-1.9.0/src/specials.c
---- conky-1.9.0/src/specials.c	2012-05-03 22:13:47.000000000 +0100
-+++ conky-1.9.0/src/specials.c	2013-02-27 21:16:15.856669451 +0000
-@@ -186,12 +186,12 @@
- 		g->scale = defscale;
- 		if (sscanf(args, "%1023s %d,%d %x %x", buf, &g->height, &g->width, &g->first_colour, &g->last_colour) == 5) {
- 			return strndup(buf, text_buffer_size);
- 		}
- 		buf[0] = '\0';
--		g->height = 25;
--		g->width = 0;
-+		g->height = default_graph_height;
-+		g->width = default_graph_width;
- 		if (sscanf(args, "%x %x %u", &g->first_colour, &g->last_colour, &g->scale) == 3) {
- 			return NULL;
- 		}
- 		g->scale = defscale;
- 		if (sscanf(args, "%x %x", &g->first_colour, &g->last_colour) == 2) {

diff --git a/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch b/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch
deleted file mode 100644
index db3516aa292..00000000000
--- a/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/linux.c
-+++ b/src/linux.c
-@@ -80,6 +80,10 @@
- #define NBD_MAJOR 43
- #endif
- 
-+#if !defined(DM_MAJOR)
-+#define DM_MAJOR 253
-+#endif
-+
- #ifdef HAVE_IWLIB
- #include <iwlib.h>
- #endif
-@@ -2336,7 +2340,8 @@ int update_diskio(void)
- 		 *
- 		 * XXX: ignore devices which are part of a SW RAID (MD_MAJOR) */
- 		if (col_count == 5 && major != LVM_BLK_MAJOR && major != NBD_MAJOR
--				&& major != RAMDISK_MAJOR && major != LOOP_MAJOR) {
-+				&& major != RAMDISK_MAJOR && major != LOOP_MAJOR
-+				&& major != DM_MAJOR ) {
- 			/* check needed for kernel >= 2.6.31, see sf #2942117 */
- 			if (is_disk(devbuf)) {
- 				total_reads += reads;

diff --git a/app-admin/conky/files/conky-1.9.0-lines-fix.patch b/app-admin/conky/files/conky-1.9.0-lines-fix.patch
deleted file mode 100644
index de48ab95e48..00000000000
--- a/app-admin/conky/files/conky-1.9.0-lines-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN old/src/conky.c new/src/conky.c
---- old/src/conky.c	2012-05-03 23:22:21.000000000 +0200
-+++ new/src/conky.c	2012-08-15 00:06:59.256311301 +0200
-@@ -3065,12 +3065,26 @@
- 								og = g;
- 							}
- 
--							/* this is mugfugly, but it works */
--							XDrawLine(display, window.drawable, window.gc,
--									  cur_x + i + 1,
--									  specials[special_index].dotgraph ? og : by + h,
--									  cur_x + i + 1,
--									  g);
-+							if (specials[special_index].dotgraph) {
-+								if (og == g) {
-+									XDrawPoint(display, window.drawable,
-+											   window.gc, cur_x + i + 1, g);
-+								} else {
-+									XDrawLine(display, window.drawable, window.gc,
-+											  cur_x + i + 1,
-+											  og,
-+											  cur_x + i + 1,
-+											  g);
-+								}
-+							} else {
-+								/* this is mugfugly, but it works */
-+								XDrawLine(display, window.drawable, window.gc,
-+										  cur_x + i + 1,
-+										  by + h,
-+										  cur_x + i + 1,
-+										  g);
-+							}
-+
- 							++j;
- 						}
- 						if (tmpcolour) free(tmpcolour);

diff --git a/app-admin/conky/files/conky-1.9.0-ncurses.patch b/app-admin/conky/files/conky-1.9.0-ncurses.patch
deleted file mode 100644
index 91043ed4205..00000000000
--- a/app-admin/conky/files/conky-1.9.0-ncurses.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fd9462da5ed12369fc6a72e42ebc45c6707403fb Mon Sep 17 00:00:00 2001
-From: Pavel Labath <pavelo@centrum.sk>
-Date: Fri, 13 Jul 2012 13:41:09 +0200
-Subject: [PATCH] Fix "conky failes to build with --disable-ncurses" (sf.net #3541329)
-
----
- src/conky.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/conky.c b/src/conky.c
-index c5b4bed..17fe1a7 100644
---- a/src/conky.c
-+++ b/src/conky.c
-@@ -885,12 +885,12 @@ void generate_text_internal(char *p, int p_max_size,
- 			OBJ(cpu) {
- 				if (cur->cpu_usage) {
- 					if (obj->data.i > info.cpu_count) {
--						static bool warned = false;
-+						static int warned = 0;
- 						if(!warned) {
- 							NORM_ERR("obj->data.i %i info.cpu_count %i",
- 									obj->data.i, info.cpu_count);
- 							NORM_ERR("attempting to use more CPUs than you have!");
--							warned = true;
-+							warned = 1;
- 						}
- 					} else  {
- 						percent_print(p, p_max_size,
--- 
-1.7.0.4
-

diff --git a/app-admin/conky/files/conky-1.9.0-tinfo.patch b/app-admin/conky/files/conky-1.9.0-tinfo.patch
deleted file mode 100644
index 0018a726f3f..00000000000
--- a/app-admin/conky/files/conky-1.9.0-tinfo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac.in
-+++ b/configure.ac.in
-@@ -134,7 +134,7 @@
- 
- AM_CONDITIONAL(BUILD_NCURSES, test x$want_ncurses = xyes)
- if test x$want_ncurses = xyes; then
--      conky_LIBS="$conky_LIBS -lncurses"
-+      PKG_CHECK_MODULES(ncurses,ncurses,conky_LIBS="$conky_LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses not found]))
-       AC_DEFINE(NCURSES, 1, [Define for ncurses support])
- 	  AC_CHECK_HEADERS([ncurses.h], [], AC_MSG_ERROR([required header(s) not found]))
- fi
---- a/configure.ac
-+++ b/configure.ac
-@@ -134,7 +134,7 @@
- 
- AM_CONDITIONAL(BUILD_NCURSES, test x$want_ncurses = xyes)
- if test x$want_ncurses = xyes; then
--      conky_LIBS="$conky_LIBS -lncurses"
-+      PKG_CHECK_MODULES(ncurses,ncurses,conky_LIBS="$conky_LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses not found]))
-       AC_DEFINE(NCURSES, 1, [Define for ncurses support])
- 	  AC_CHECK_HEADERS([ncurses.h], [], AC_MSG_ERROR([required header(s) not found]))
- fi

diff --git a/app-admin/conky/files/conky-1.9.0-update-noaa-metar-uri.patch b/app-admin/conky/files/conky-1.9.0-update-noaa-metar-uri.patch
deleted file mode 100644
index 0dbf3d3fada..00000000000
--- a/app-admin/conky/files/conky-1.9.0-update-noaa-metar-uri.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/weather.c
-+++ b/src/weather.c
-@@ -858,7 +858,7 @@
- 		}
- 	} else
- #endif /* XOAP */
--	if (strstr(uri, "weather.noaa.gov")) {
-+	if (strstr(uri, "tgftp.nws.noaa.gov")) {
- 		strcat(uri, locID);
- 		strcat(uri, ".TXT");
- 	} else  if (!strstr(uri, "localhost") && !strstr(uri, "127.0.0.1")) {

diff --git a/app-admin/conky/files/conky-1.9.0-update-when-message-count-decreases.patch b/app-admin/conky/files/conky-1.9.0-update-when-message-count-decreases.patch
deleted file mode 100644
index dd422c584e3..00000000000
--- a/app-admin/conky/files/conky-1.9.0-update-when-message-count-decreases.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/src/mail.c b/src/mail.c
-index 7f60ba3..882b7c8 100644
---- a/src/mail.c
-+++ b/src/mail.c
-@@ -630,8 +630,15 @@ int imap_check_status(char *recvbuf, struct mail_s *mail)
- 
- void imap_unseen_command(struct mail_s *mail, unsigned long old_unseen, unsigned long old_messages)
- {
--	if (strlen(mail->command) > 1 && (mail->unseen > old_unseen
--				|| (mail->messages > old_messages && mail->unseen > 0))) {
-+	/*
-+	 * Georg Hopp (2012-12-23):
-+	 * Well, i will read mails from time to time and i want the unseen
-+	 * count to be reduced when they are read...so, this seems wrong.
-+	 * Try a better one.... :)
-+	 */
-+	if (strlen(mail->command) > 1
-+			&& (mail->unseen != old_unseen
-+			 || mail->messages != old_messages)) {
- 		// new mail goodie
- 		if (system(mail->command) == -1) {
- 			perror("system()");
-@@ -813,7 +820,7 @@ static void *imap_thread(void *arg)
- 					if (strlen(recvbuf) > 2) {
- 						unsigned long messages, recent = 0;
- 						char *buf = recvbuf;
--						char force_check = 0;
-+						char force_check = 1;
- 						buf = strstr(buf, "EXISTS");
- 						while (buf && strlen(buf) > 1 && strstr(buf + 1, "EXISTS")) {
- 							buf = strstr(buf + 1, "EXISTS");
-@@ -825,9 +832,7 @@ static void *imap_thread(void *arg)
- 							}
- 							if (sscanf(buf, "* %lu EXISTS\r\n", &messages) == 1) {
- 								timed_thread_lock(mail->p_timed_thread);
--								if (mail->messages != messages) {
--									force_check = 1;
--								}
-+								force_check = 1;
- 								timed_thread_unlock(mail->p_timed_thread);
- 							}
- 						}
-@@ -850,7 +855,10 @@ static void *imap_thread(void *arg)
- 						 * something other than 0, or we had a timeout
- 						 */
- 						buf = recvbuf;
--						if (recent > 0 || (buf && strstr(buf, " FETCH ")) || fetchtimeout.tv_sec == 0 || force_check) {
-+						if (recent > 0
-+								|| (buf && strstr(buf, " FETCH "))
-+								|| (buf && strstr(buf, " EXPUNGE "))
-+								|| fetchtimeout.tv_sec == 0 || force_check) {
- 							// re-check messages and unseen
- 							if (imap_command(sockfd, "DONE\r\n", recvbuf, "a5 OK")) {
- 								fail++;
-@@ -868,6 +876,9 @@ static void *imap_thread(void *arg)
- 								fail++;
- 								break;
- 							}
-+							imap_unseen_command(mail, old_unseen, old_messages);
-+							old_unseen = mail->unseen;
-+							old_messages = mail->messages;
- 							strncpy(sendbuf, "a5 IDLE\r\n", MAXDATASIZE);
- 							if (imap_command(sockfd, sendbuf, recvbuf, "+ idling")) {
- 								fail++;
-@@ -886,10 +897,7 @@ static void *imap_thread(void *arg)
- 						fail++;
- 						break;
- 					}
--					imap_unseen_command(mail, old_unseen, old_messages);
- 					fail = 0;
--					old_unseen = mail->unseen;
--					old_messages = mail->messages;
- 				}
- 				if (fail) break;
- 			} else {

[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/

[Daniel Pielmeier]

commit:     9fca48d65af5a35a5b2773671563b2728edd799b
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  8 18:06:01 2018 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 18:06:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fca48d6

app-admin/conky: Remove unused patches.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../conky/files/conky-1.10.6-cpu-hotplug.patch     | 23 ----------
 .../conky/files/conky-1.10.6-fix-text-shades.patch | 12 ------
 app-admin/conky/files/conky-1.10.6-gcc-7.patch     | 11 -----
 .../conky/files/conky-1.10.6-new_graph-oor.patch   | 35 ----------------
 .../conky/files/conky-1.10.7-cpu-hotplug.patch     | 13 ------
 .../files/conky-1.10.7-out_to_x-segfault.patch     | 49 ----------------------
 6 files changed, 143 deletions(-)

diff --git a/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch b/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
deleted file mode 100644
index 00e1003617e..00000000000
--- a/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 7d2639e9c489c34fa9673fcaee8deec46043fbf8 Mon Sep 17 00:00:00 2001
-From: Daniel Pielmeier <billie80@users.noreply.github.com>
-Date: Sat, 18 Feb 2017 16:55:35 +0100
-Subject: [PATCH] Fix SEGV in a CPU hotplug environment #127
-
----
- src/linux.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/linux.cc b/src/linux.cc
-index 664ddf5e..63b3ea40 100644
---- a/src/linux.cc
-+++ b/src/linux.cc
-@@ -900,6 +900,9 @@ int update_stat(void)
- 			} else {
- 				idx = 0;
- 			}
-+			if (idx > info.cpu_count) {
-+				continue;
-+			}
- 			sscanf(buf, stat_template, &(cpu[idx].cpu_user),
- 				&(cpu[idx].cpu_nice), &(cpu[idx].cpu_system),
- 				&(cpu[idx].cpu_idle), &(cpu[idx].cpu_iowait),

diff --git a/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch b/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch
deleted file mode 100644
index 70b0c52d2a1..00000000000
--- a/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/conky.cc	2017-02-21 18:00:40.157275779 -0800
-+++ b/src/conky.cc	2017-02-21 18:05:16.137077877 -0800
-@@ -1930,7 +1930,9 @@
- 
- static void draw_stuff(void)
- {
-+#ifndef BUILD_X11
- 	static int text_offset_x, text_offset_y; /* offset for start position */
-+#endif
- 	text_offset_x = text_offset_y = 0;
- #ifdef BUILD_IMLIB2
- 	cimlib_render(text_start_x, text_start_y, window.width, window.height);

diff --git a/app-admin/conky/files/conky-1.10.6-gcc-7.patch b/app-admin/conky/files/conky-1.10.6-gcc-7.patch
deleted file mode 100644
index 6784129d39c..00000000000
--- a/app-admin/conky/files/conky-1.10.6-gcc-7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/src/luamm.hh b/src/luamm.hh
---- a/src/luamm.hh	2017-07-07 15:05:28.250032963 +0200
-+++ b/src/luamm.hh	2017-07-07 15:05:43.230033134 +0200
-@@ -28,6 +28,7 @@
- #include <exception>
- #include <stdexcept>
- #include <string>
-+#include <functional>
- 
- #include <lua.hpp>
- 

diff --git a/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch b/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch
deleted file mode 100644
index 18091702f68..00000000000
--- a/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2600d01373ce04b34f698f3887e90a35c77bda61 Mon Sep 17 00:00:00 2001
-From: labath <pavelo@centrum.sk>
-Date: Tue, 31 Jan 2017 01:31:09 +0000
-Subject: [PATCH] Fix an out-of-range error in new_graph (#356)
-
-The code was multiplying the index with the size of the element, and
-then adding it to the typed pointer (resulting in a double
-multiplication and an OOB access).
-
-Replace the buggy code with a slightly safer c++ alternative.
----
- src/specials.cc | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/specials.cc b/src/specials.cc
-index ee941eb..73bd2a2 100644
---- a/src/specials.cc
-+++ b/src/specials.cc
-@@ -519,14 +519,12 @@ void new_graph(struct text_object *obj, char *buf, int buf_max_size, double val)
- 		DBGP("reallocing graph from %d to %d", s->graph_allocated, s->graph_width);
- 		if (!s->graph) {
- 			/* initialize */
--			memset(graph, 0, s->graph_width * sizeof(double));
-+			std::fill_n(graph, s->graph_width, 0.0);
- 			s->scale = 100;
- 		} else {
- 			if (s->graph_width > s->graph_allocated) {
- 				/* initialize the new region */
--				memset(graph + (s->graph_allocated * sizeof(double)), 0,
--						(s->graph_width - s->graph_allocated) *
--						sizeof(double));
-+				std::fill(graph + s->graph_allocated, graph + s->graph_width, 0.0);
- 			}
- 		}
- 		s->graph = graph;

diff --git a/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch b/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch
deleted file mode 100644
index 18394828105..00000000000
--- a/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur conky-1.10.7_old/src/linux.cc conky-1.10.7/src/linux.cc
---- conky-1.10.7_old/src/linux.cc	2018-01-19 16:59:14.158830825 +0100
-+++ conky-1.10.7/src/linux.cc	2018-01-19 16:59:44.796144615 +0100
-@@ -923,6 +923,9 @@
- 			} else {
- 				idx = 0;
- 			}
-+			if (idx > info.cpu_count) {
-+				continue;
-+			}
- 			sscanf(buf, stat_template, &(cpu[idx].cpu_user),
- 				&(cpu[idx].cpu_nice), &(cpu[idx].cpu_system),
- 				&(cpu[idx].cpu_idle), &(cpu[idx].cpu_iowait),

diff --git a/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch b/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch
deleted file mode 100644
index fef22ac46e5..00000000000
--- a/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 562c7375883445acb58388ff16d9eb126b7e12a1 Mon Sep 17 00:00:00 2001
-From: Brenden Matthews <brenden@diddyinc.com>
-Date: Tue, 23 Jan 2018 13:52:11 -0500
-Subject: [PATCH] Fix segfault when out_to_x = false. (#455)
-
-This resolves #454.
----
- src/conky.cc | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/src/conky.cc b/src/conky.cc
-index 48256ecc..f10d08fb 100644
---- a/src/conky.cc
-+++ b/src/conky.cc
-@@ -2076,20 +2076,24 @@ static void main_loop(void)
- 	sigaddset(&newmask, SIGUSR1);
- #endif
- 
-+#ifdef BUILD_X11
- #ifdef BUILD_XSHAPE
--	/* allow only decorated windows to be given mouse input */
--	int major_version, minor_version;
--	if (!XShapeQueryVersion(display, &major_version, &minor_version)) {
--		NORM_ERR("Input shapes are not supported");
--	} else {
--		if (own_window.get(*state) &&
--		    (own_window_type.get(*state) != TYPE_NORMAL ||
--		     (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) {
--			XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0,
--			   NULL, 0, ShapeSet, Unsorted);
-+	if (out_to_x.get(*state)) {
-+		/* allow only decorated windows to be given mouse input */
-+		int major_version, minor_version;
-+		if (!XShapeQueryVersion(display, &major_version, &minor_version)) {
-+			NORM_ERR("Input shapes are not supported");
-+		} else {
-+			if (own_window.get(*state) &&
-+					(own_window_type.get(*state) != TYPE_NORMAL ||
-+					 (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) {
-+				XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0,
-+						NULL, 0, ShapeSet, Unsorted);
-+			}
- 		}
- 	}
- #endif /* BUILD_XSHAPE */
-+#endif /* BUILD_X11 */
- 
- 	last_update_time = 0.0;
- 	next_update_time = get_time() - fmod(get_time(), active_update_interval());

[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/

[Daniel Pielmeier]

commit:     b7aa42264e868c7f52b3f3b15b20e497c2a170dd
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 17 19:32:59 2018 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Fri Aug 17 19:32:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7aa4226

app-admin/conky: Fix bug #663886.

Add missing patch. Thanks to Toralf Förster for the report.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-admin/conky/files/conky-1.10.8-libical-3.patch | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/app-admin/conky/files/conky-1.10.8-libical-3.patch b/app-admin/conky/files/conky-1.10.8-libical-3.patch
new file mode 100644
index 00000000000..032a6d2ef26
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-libical-3.patch
@@ -0,0 +1,32 @@
+From 128c8cce3415839a3d19a5cb877fd77af2538d35 Mon Sep 17 00:00:00 2001
+From: Adam Majer <amajer@suse.de>
+Date: Tue, 6 Mar 2018 13:46:31 +0100
+Subject: [PATCH] Add support for libical 3.x (#465)
+
+In libical3, deprecated icaltime_from_timet is removed
+Use icaltime_from_timet_with_zone instead. This function
+exists in libical 2.x so no need to change requirements
+---
+ src/ical.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ical.cc b/src/ical.cc
+index e4b48511..ef069124 100644
+--- a/src/ical.cc
++++ b/src/ical.cc
+@@ -49,13 +49,13 @@ struct ical_event *add_event(struct ical_event *listend, icalcomponent *new_ev)
+ 	icaltimetype start;
+ 
+ 	start = icalcomponent_get_dtstart(new_ev);
+-	if(icaltime_compare(start, icaltime_from_timet(time(NULL), 0)) <= 0) {
++	if(icaltime_compare(start, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) <= 0) {
+ 		icalproperty *rrule = icalcomponent_get_first_property(new_ev, ICAL_RRULE_PROPERTY);
+ 		if(rrule) {
+ 			icalrecur_iterator* ritr = icalrecur_iterator_new(icalproperty_get_rrule(rrule), start);
+ 			icaltimetype nexttime = icalrecur_iterator_next(ritr);
+ 			while (!icaltime_is_null_time(nexttime)) {
+-				if(icaltime_compare(nexttime, icaltime_from_timet(time(NULL), 0)) > 0) {
++				if(icaltime_compare(nexttime, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) > 0) {
+ 					start = nexttime;
+ 					break;
+ 				}

[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/

[Daniel Pielmeier]

commit:     5051b44667d87153f34bcbd75f9c597d7a7f513f
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Mar  5 17:00:07 2019 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 19:40:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5051b446

app-admin/conky: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 app-admin/conky/files/conky-1.10.4-x11-build.patch | 31 ----------------------
 1 file changed, 31 deletions(-)

diff --git a/app-admin/conky/files/conky-1.10.4-x11-build.patch b/app-admin/conky/files/conky-1.10.4-x11-build.patch
deleted file mode 100644
index eb113a47fd5..00000000000
--- a/app-admin/conky/files/conky-1.10.4-x11-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 178015a9495b7d40031ed7459e4f6b6731633a7c Mon Sep 17 00:00:00 2001
-From: shizeeg <shizeeque@gmail.com>
-Date: Thu, 8 Sep 2016 18:24:29 +0300
-Subject: [PATCH] Fix build without X11 (#317)
-
----
- src/conky.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/conky.cc b/src/conky.cc
-index 0a812fc..4c5da94 100644
---- a/src/conky.cc
-+++ b/src/conky.cc
-@@ -1404,6 +1404,9 @@ static void draw_string(const char *s)
- 
- int draw_each_line_inner(char *s, int special_index, int last_special_applied)
- {
-+#ifndef BUILD_X11
-+	static int cur_x, cur_y;	/* current x and y for drawing */
-+#endif
- #ifdef BUILD_X11
- 	int font_h = 0;
- 	int cur_y_add = 0;
-@@ -1934,6 +1937,7 @@ static void draw_text(void)
- 
- static void draw_stuff(void)
- {
-+	static int text_offset_x, text_offset_y; /* offset for start position */
- 	text_offset_x = text_offset_y = 0;
- #ifdef BUILD_IMLIB2
- 	cimlib_render(text_start_x, text_start_y, window.width, window.height);

[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/

[Daniel Pielmeier]

commit:     e3b2a9cd009ed396385ee00d32926b9307baf78f
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 15:08:45 2021 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 15:08:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b2a9cd

app-admin/conky: Correct fix for building with libmicrohttpd.

Thanks to Samuel Bernardo and Ionen Wolkens.

Closes: https://bugs.gentoo.org/766869
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 .../conky/files/conky-1.11.6-fpermissive.patch     | 28 ++++++++++------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/app-admin/conky/files/conky-1.11.6-fpermissive.patch b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
index 1ac1173ba64..f608769b643 100644
--- a/app-admin/conky/files/conky-1.11.6-fpermissive.patch
+++ b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
@@ -1,17 +1,15 @@
-From 16be0e1571a586168855bedb6da1ddc732b0bbf4 Mon Sep 17 00:00:00 2001
-From: Brenden Matthews <brenden@brndn.io>
-Date: Thu, 22 Oct 2020 13:02:00 -0400
-Subject: [PATCH] Build fix for libmicrohttpd.
-
----
- src/conky.cc | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/conky.cc b/src/conky.cc
-index 79633a40..b1743466 100644
---- a/src/conky.cc
-+++ b/src/conky.cc
-@@ -322,12 +322,13 @@ struct MHD_Daemon *httpd;
+--- old/src/conky.cc	2021-01-24 17:05:43.361378726 +0100
++++ new/src/conky.cc	2021-01-24 17:05:49.055378611 +0100
+@@ -317,17 +321,22 @@
+ static FILE *append_fpointer = nullptr;
+ 
+ #ifdef BUILD_HTTP
++#ifdef MHD_YES
++/* older API */
++#define MHD_Result int
++#endif /* MHD_YES */
+ std::string webpage;
+ struct MHD_Daemon *httpd;
  static conky::simple_config_setting<bool> http_refresh("http_refresh", false,
                                                         true);
  
@@ -20,7 +18,7 @@ index 79633a40..b1743466 100644
 -               size_t *upload_data_size, void **con_cls) {
 +MHD_Result sendanswer(void *cls, struct MHD_Connection *connection,
 +                      const char *url, const char *method, const char *version,
-+                      const char *upload_data, unsigned long *upload_data_size,
++                      const char *upload_data, size_t *upload_data_size,
 +                      void **con_cls) {
    struct MHD_Response *response = MHD_create_response_from_buffer(
        webpage.length(), (void *)webpage.c_str(), MHD_RESPMEM_PERSISTENT);

[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/

[Daniel Pielmeier]

commit:     6c8daad8a569d2732f277bae713ff9c7bf3b3103
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 17 15:40:52 2021 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Wed Mar 17 15:41:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c8daad8

app-admin/conky: Remove unused patches.

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 app-admin/conky/files/conky-1.10.8-clang.patch     | 30 -------------
 .../conky/files/conky-1.10.8-fpermissive.patch     | 14 -------
 app-admin/conky/files/conky-1.10.8-libical-3.patch | 32 --------------
 app-admin/conky/files/conky-1.10.8-portmon.patch   | 20 ---------
 .../conky/files/conky-1.10.8-use-pkgconfig.patch   | 34 ---------------
 .../conky/files/conky-1.10.8-virtual-sinks.patch   | 49 ----------------------
 6 files changed, 179 deletions(-)

diff --git a/app-admin/conky/files/conky-1.10.8-clang.patch b/app-admin/conky/files/conky-1.10.8-clang.patch
deleted file mode 100644
index 2fc49fa9cf2..00000000000
--- a/app-admin/conky/files/conky-1.10.8-clang.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- conky-1.10.8/src/linux.cc	2018-02-07 17:16:39.000000000 +0300
-+++ conky-1.10.8.new/src/linux.cc	2020-02-22 00:43:52.336620654 +0300
-@@ -37,6 +37,7 @@
- #include <ctype.h>
- #include <errno.h>
- #include <limits.h>
-+#include <clocale>
- #include <sys/types.h>
- #include <sys/sysinfo.h>
- #include <sys/stat.h>
---- conky-1.10.8/src/luamm.cc	2020-02-22 00:57:25.847867585 +0300
-+++ conky-1.10.8.new/src/luamm.cc	2020-02-22 00:59:29.820510124 +0300
-@@ -23,6 +23,8 @@
- 
- #include "luamm.hh"
- 
-+#include <cxxabi.h>
-+
- namespace lua {
- 	namespace {
- 
-@@ -57,7 +59,7 @@
- 				lua_pushstring(l, e.what());
- 			}
- 			catch(...) {
--				lua_pushstring(l, ptr->__cxa_exception_type()->name());
-+				lua_pushstring(l, abi::__cxa_current_exception_type()->name());
- 			}
- 			return 1;
- 		}

diff --git a/app-admin/conky/files/conky-1.10.8-fpermissive.patch b/app-admin/conky/files/conky-1.10.8-fpermissive.patch
deleted file mode 100644
index 42abeb831cd..00000000000
--- a/app-admin/conky/files/conky-1.10.8-fpermissive.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- conky-1.10.8/src/conky.cc.orig	2020-08-28 13:17:22.330113596 -0400
-+++ conky-1.10.8/src/conky.cc	2020-08-28 13:19:48.564891015 -0400
-@@ -478,9 +478,9 @@
- struct MHD_Daemon *httpd;
- static conky::simple_config_setting<bool> http_refresh("http_refresh", false, true);
- 
--int sendanswer(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) {
-+MHD_Result sendanswer(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) {
- 	struct MHD_Response *response = MHD_create_response_from_data(webpage.length(), (void*) webpage.c_str(), MHD_NO, MHD_NO);
--	int ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
-+	MHD_Result ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
- 	MHD_destroy_response(response);
- 	if(cls || url || method || version || upload_data || upload_data_size || con_cls) {}	//make compiler happy
- 	return ret;

diff --git a/app-admin/conky/files/conky-1.10.8-libical-3.patch b/app-admin/conky/files/conky-1.10.8-libical-3.patch
deleted file mode 100644
index 032a6d2ef26..00000000000
--- a/app-admin/conky/files/conky-1.10.8-libical-3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 128c8cce3415839a3d19a5cb877fd77af2538d35 Mon Sep 17 00:00:00 2001
-From: Adam Majer <amajer@suse.de>
-Date: Tue, 6 Mar 2018 13:46:31 +0100
-Subject: [PATCH] Add support for libical 3.x (#465)
-
-In libical3, deprecated icaltime_from_timet is removed
-Use icaltime_from_timet_with_zone instead. This function
-exists in libical 2.x so no need to change requirements
----
- src/ical.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ical.cc b/src/ical.cc
-index e4b48511..ef069124 100644
---- a/src/ical.cc
-+++ b/src/ical.cc
-@@ -49,13 +49,13 @@ struct ical_event *add_event(struct ical_event *listend, icalcomponent *new_ev)
- 	icaltimetype start;
- 
- 	start = icalcomponent_get_dtstart(new_ev);
--	if(icaltime_compare(start, icaltime_from_timet(time(NULL), 0)) <= 0) {
-+	if(icaltime_compare(start, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) <= 0) {
- 		icalproperty *rrule = icalcomponent_get_first_property(new_ev, ICAL_RRULE_PROPERTY);
- 		if(rrule) {
- 			icalrecur_iterator* ritr = icalrecur_iterator_new(icalproperty_get_rrule(rrule), start);
- 			icaltimetype nexttime = icalrecur_iterator_next(ritr);
- 			while (!icaltime_is_null_time(nexttime)) {
--				if(icaltime_compare(nexttime, icaltime_from_timet(time(NULL), 0)) > 0) {
-+				if(icaltime_compare(nexttime, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) > 0) {
- 					start = nexttime;
- 					break;
- 				}

diff --git a/app-admin/conky/files/conky-1.10.8-portmon.patch b/app-admin/conky/files/conky-1.10.8-portmon.patch
deleted file mode 100644
index e7b17dd1119..00000000000
--- a/app-admin/conky/files/conky-1.10.8-portmon.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- conky-1.10.8/src/CMakeLists.txt	2019-03-09 08:24:26.315879386 +0100
-+++ conky-1.10.8/src/CMakeLists.txt	2019-03-09 08:24:38.555878656 +0100
-@@ -220,6 +220,15 @@
- install(TARGETS
- 	conky
- 	RUNTIME DESTINATION bin
--	LIBRARY DESTINATION lib
--	ARCHIVE DESTINATION lib
-+	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
-+
-+if(BUILD_PORT_MONITORS)
-+	install(TARGETS
-+	tcp-portmon
-+	RUNTIME DESTINATION bin
-+	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-+)
-+endif(BUILD_PORT_MONITORS)

diff --git a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
deleted file mode 100644
index 97e6bd02323..00000000000
--- a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Reversed patch
-
-From abd0be51a00444d3be6b213e0926675e5a4e5ed3 Mon Sep 17 00:00:00 2001
-From: Brenden Matthews <brenden@diddyinc.com>
-Date: Tue, 23 Jan 2018 12:56:06 -0500
-Subject: [PATCH] Use FindCurses instead of pkg_check_modules.
-
-This should resolve #217.
----
- cmake/ConkyPlatformChecks.cmake | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
-index c5b39b2f..19ec7b9b 100644
---- a/cmake/ConkyPlatformChecks.cmake
-+++ b/cmake/ConkyPlatformChecks.cmake
-@@ -129,12 +129,12 @@ if(BUILD_HTTP)
- endif(BUILD_HTTP)
- 
- if(BUILD_NCURSES)
-+	pkg_check_modules(NCURSES ncurses)
-+	if(NOT NCURSES_FOUND)
--	include(FindCurses)
--	if(NOT CURSES_FOUND)
- 		message(FATAL_ERROR "Unable to find ncurses library")
-+	endif(NOT NCURSES_FOUND)
-+	set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES})
-+	set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS})
--	endif(NOT CURSES_FOUND)
--	set(conky_libs ${conky_libs} ${CURSES_LIBRARIES})
--	set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR})
- endif(BUILD_NCURSES)
- 
- if(BUILD_MYSQL)

diff --git a/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch b/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch
deleted file mode 100644
index c0198ccc4ec..00000000000
--- a/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 8221ba62045012abf8a4443de20f17a0a8fc1288 Mon Sep 17 00:00:00 2001
-From: Jan Seeger <jan.seeger@thenybble.de>
-Date: Wed, 5 Aug 2020 15:39:20 +0200
-Subject: Fixed crash on virtual sinks.
-
-Taken from upstream commits
-https://github.com/brndnmtthws/conky/commit/ddf8a0f58f3110e31ec4c44ecff838d2b231f6f3 and
-https://github.com/brndnmtthws/conky/commit/2a7226d89331f7d5d0abf0b9aff6d75435dd3a2d.
-
-Signed-off-by: Jan Seeger <jan.seeger@thenybble.de>
----
- src/pulseaudio.cc | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/pulseaudio.cc b/src/pulseaudio.cc
-index 93226c1b..af814bd6 100644
---- a/src/pulseaudio.cc
-+++ b/src/pulseaudio.cc
-@@ -53,8 +53,13 @@ void pa_sink_info_callback(pa_context *c, const pa_sink_info *i, int eol, void *
-         pdr->sink_mute = i->mute;
-         pdr->sink_card = i->card;
-         pdr->sink_index = i->index;
--        pdr->sink_active_port_name.assign(i->active_port->name);
--        pdr->sink_active_port_description.assign(i->active_port->description);
-+		if (i->active_port != nullptr) {
-+			pdr->sink_active_port_name.assign(i->active_port->name);
-+			pdr->sink_active_port_description.assign(i->active_port->description);
-+		} else {
-+			pdr->sink_active_port_name.erase();
-+			pdr->sink_active_port_name.erase();
-+		}
-         pdr->sink_volume = round_to_int(100.0f * (float)pa_cvolume_avg(&(i->volume)) / (float)PA_VOLUME_NORM);
-         pa_threaded_mainloop_signal(pulseaudio->mainloop, 0);
-     }
-@@ -224,9 +229,10 @@ void init_pulseaudio(struct text_object *obj) {
-         return;
-     }
- 
--    if(pulseaudio->result.sink_card!=(uint32_t)-1)
-+    if(pulseaudio->result.sink_card!=(uint32_t)-1) {
-         PULSEAUDIO_WAIT(pa_context_get_card_info_by_index(pulseaudio->context, pulseaudio->result.sink_card,
-                                                           pa_card_info_callback, &pulseaudio->result));
-+	}
- 
- 	// get notification when something changes in PA
-     pa_context_set_subscribe_callback(pulseaudio->context, subscribe_cb, &pulseaudio->result);
--- 
-2.26.2
-

[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/

[Daniel Pielmeier]

commit:     e5e82df6de628f9453d24d487ac5b6b944046bb7
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 18:29:46 2021 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 18:29:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5e82df6

app-admin/conky: Remove unused patch.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 .../conky/files/conky-1.11.6-fpermissive.patch     | 29 ----------------------
 1 file changed, 29 deletions(-)

diff --git a/app-admin/conky/files/conky-1.11.6-fpermissive.patch b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
deleted file mode 100644
index f608769b643..00000000000
--- a/app-admin/conky/files/conky-1.11.6-fpermissive.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- old/src/conky.cc	2021-01-24 17:05:43.361378726 +0100
-+++ new/src/conky.cc	2021-01-24 17:05:49.055378611 +0100
-@@ -317,17 +321,22 @@
- static FILE *append_fpointer = nullptr;
- 
- #ifdef BUILD_HTTP
-+#ifdef MHD_YES
-+/* older API */
-+#define MHD_Result int
-+#endif /* MHD_YES */
- std::string webpage;
- struct MHD_Daemon *httpd;
- static conky::simple_config_setting<bool> http_refresh("http_refresh", false,
-                                                        true);
- 
--int sendanswer(void *cls, struct MHD_Connection *connection, const char *url,
--               const char *method, const char *version, const char *upload_data,
--               size_t *upload_data_size, void **con_cls) {
-+MHD_Result sendanswer(void *cls, struct MHD_Connection *connection,
-+                      const char *url, const char *method, const char *version,
-+                      const char *upload_data, size_t *upload_data_size,
-+                      void **con_cls) {
-   struct MHD_Response *response = MHD_create_response_from_buffer(
-       webpage.length(), (void *)webpage.c_str(), MHD_RESPMEM_PERSISTENT);
--  int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
-+  MHD_Result ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
-   MHD_destroy_response(response);
-   if (cls || url || method || version || upload_data || upload_data_size ||
-       con_cls) {}  // make compiler happy

[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/

[Daniel Pielmeier]

commit:     68aae342b93b2a0f351795215f4ed2a3499ddb03
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  2 17:17:16 2022 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Wed Feb  2 17:17:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68aae342

app-admin/conky: Remove unused patches.

https://github.com/gentoo/gentoo/pull/23925

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 app-admin/conky/files/conky-1.11.6-ipv6.patch      | 22 -------------
 .../conky/files/conky-1.12.1-network-speed.patch   | 36 ----------------------
 2 files changed, 58 deletions(-)

diff --git a/app-admin/conky/files/conky-1.11.6-ipv6.patch b/app-admin/conky/files/conky-1.11.6-ipv6.patch
deleted file mode 100644
index 65066270a750..000000000000
--- a/app-admin/conky/files/conky-1.11.6-ipv6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix no-ipv6
-From https://github.com/brndnmtthws/conky/issues/1033#issue-748414180
-
-diff '--color=auto' -aur a/src/linux.cc b/src/linux.cc
---- a/src/linux.cc	2019-08-12 14:53:54.000000000 -0700
-+++ b/src/linux.cc	2020-11-22 18:44:04.394329722 -0700
-@@ -667,6 +667,7 @@
-   }
- }
- 
-+#ifdef BUILD_IPV6
- void update_ipv6_net_stats() {
-   FILE *file;
-   char v6addr[33];
-@@ -731,6 +732,7 @@
- 
-   fclose(file);
- }
-+#endif /* BUILD_IPV6 */
- 
- /**
-  * Parses information from /proc/net/dev and stores them in ???

diff --git a/app-admin/conky/files/conky-1.12.1-network-speed.patch b/app-admin/conky/files/conky-1.12.1-network-speed.patch
deleted file mode 100644
index 46a7615c589a..000000000000
--- a/app-admin/conky/files/conky-1.12.1-network-speed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 415c730133476d6652f479242b0638496b5f673b Mon Sep 17 00:00:00 2001
-From: Steven Xu <stevenxxiu@gmail.com>
-Date: Tue, 23 Mar 2021 20:12:52 +1100
-Subject: [PATCH] fix: update `update last_update_time` earlier, so the network
- speed is correctly displayed, otherwise the speed shown is much lower than
- the actual speed (resolves #863)
-
----
- src/conky.cc | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/conky.cc b/src/conky.cc
-index b116b2bed..af5602c5b 100644
---- a/src/conky.cc
-+++ b/src/conky.cc
-@@ -766,6 +766,12 @@ static void generate_text() {
-    * some info.mem entries */
-   update_stuff();
- 
-+  /* Update `last_update_time` before `generate_text_internal()`, as the latter
-+   * calls `evaluate()` -> `update_net_stats()`, which needs `last_update_time`
-+   * to be set correctly. If this is not done, than the network speed being
-+   * shown will be much lower than the actual speed.*/
-+  last_update_time = current_update_time;
-+
-   /* populate the text buffer; generate_text_internal() iterates through
-    * global_root_object (an instance of the text_object struct) and calls
-    * any callbacks that were set on startup by construct_text_object(). */
-@@ -822,7 +828,6 @@ static void generate_text() {
-   if (next_update_time < time || next_update_time > time + ui) {
-     next_update_time = time - fmod(time, ui) + ui;
-   }
--  last_update_time = current_update_time;
-   total_updates++;
- }
-