Date: Tue, 4 Oct 2016 12:44:05 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423260 - in head/sysutils/conky: . files Message-ID: <201610041244.u94Ci59Q062929@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Tue Oct 4 12:44:05 2016 New Revision: 423260 URL: https://svnweb.freebsd.org/changeset/ports/423260 Log: - Update to 1.10.5 - Remove patches which have been accepted upstream Deleted: head/sysutils/conky/files/patch-src_c++wrap.cc head/sysutils/conky/files/patch-src_core.cc head/sysutils/conky/files/patch-src_freebsd.cc head/sysutils/conky/files/patch-src_freebsd.h Modified: head/sysutils/conky/Makefile head/sysutils/conky/distinfo head/sysutils/conky/files/patch-src_conky.cc head/sysutils/conky/files/patch-src_luamm.cc head/sysutils/conky/files/patch-src_luamm.hh Modified: head/sysutils/conky/Makefile ============================================================================== --- head/sysutils/conky/Makefile Tue Oct 4 12:42:26 2016 (r423259) +++ head/sysutils/conky/Makefile Tue Oct 4 12:44:05 2016 (r423260) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= conky -PORTVERSION= 1.10.4 +PORTVERSION= 1.10.5 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= madpilot@FreeBSD.org Modified: head/sysutils/conky/distinfo ============================================================================== --- head/sysutils/conky/distinfo Tue Oct 4 12:42:26 2016 (r423259) +++ head/sysutils/conky/distinfo Tue Oct 4 12:44:05 2016 (r423260) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470249422 -SHA256 (brndnmtthws-conky-v1.10.4_GH0.tar.gz) = ed61ffb3be9fd24965d40401c7d54553e732038f3da2e03454915779384f59b4 -SIZE (brndnmtthws-conky-v1.10.4_GH0.tar.gz) = 365145 +TIMESTAMP = 1475571819 +SHA256 (brndnmtthws-conky-v1.10.5_GH0.tar.gz) = 3bcf1ae93721e0575cd4ef8fd60da9e5bf1b2fbceb365fb9792f2aec6139f569 +SIZE (brndnmtthws-conky-v1.10.5_GH0.tar.gz) = 365176 Modified: head/sysutils/conky/files/patch-src_conky.cc ============================================================================== --- head/sysutils/conky/files/patch-src_conky.cc Tue Oct 4 12:42:26 2016 (r423259) +++ head/sysutils/conky/files/patch-src_conky.cc Tue Oct 4 12:44:05 2016 (r423260) @@ -1,4 +1,4 @@ ---- src/conky.cc.orig 2016-07-20 16:53:48 UTC +--- src/conky.cc.orig 2016-10-04 07:49:19 UTC +++ src/conky.cc @@ -129,7 +129,7 @@ #include <microhttpd.h> @@ -9,37 +9,3 @@ #include <bsd/bsd.h> #endif -@@ -728,13 +728,6 @@ int percent_print(char *buf, int size, u - return spaced_print(buf, size, "%u", pad_percents.get(*state), value); - } - --#if defined(__FreeBSD__) --unsigned long long llabs(long long num) { -- if(num < 0) return -num; -- else return num; --} --#endif -- - /* converts from bytes to human readable format (K, M, G, T) - * - * The algorithm always divides by 1024, as unit-conversion of byte -@@ -1811,8 +1804,8 @@ int draw_each_line_inner(char *s, int sp - #endif /* BUILD_X11 */ - case GOTO: - if (current->arg >= 0) { -- cur_x = (int) current->arg; - #ifdef BUILD_X11 -+ cur_x = (int) current->arg; - //make sure shades are 1 pixel to the right of the text - if(draw_mode == BG) cur_x++; - #endif /* BUILD_X11 */ -@@ -1934,7 +1927,9 @@ static void draw_text(void) - - static void draw_stuff(void) - { -+#ifdef BUILD_X11 - text_offset_x = text_offset_y = 0; -+#endif - #ifdef BUILD_IMLIB2 - cimlib_render(text_start_x, text_start_y, window.width, window.height); - #endif /* BUILD_IMLIB2 */ Modified: head/sysutils/conky/files/patch-src_luamm.cc ============================================================================== --- head/sysutils/conky/files/patch-src_luamm.cc Tue Oct 4 12:42:26 2016 (r423259) +++ head/sysutils/conky/files/patch-src_luamm.cc Tue Oct 4 12:44:05 2016 (r423260) @@ -1,4 +1,4 @@ ---- src/luamm.cc.orig 2016-07-20 16:53:48 UTC +--- src/luamm.cc.orig 2016-10-04 07:49:19 UTC +++ src/luamm.cc @@ -57,7 +57,8 @@ namespace lua { lua_pushstring(l, e.what()); Modified: head/sysutils/conky/files/patch-src_luamm.hh ============================================================================== --- head/sysutils/conky/files/patch-src_luamm.hh Tue Oct 4 12:42:26 2016 (r423259) +++ head/sysutils/conky/files/patch-src_luamm.hh Tue Oct 4 12:44:05 2016 (r423260) @@ -1,16 +1,6 @@ ---- src/luamm.hh.orig 2016-07-20 16:53:48 UTC +--- src/luamm.hh.orig 2016-10-04 07:49:19 UTC +++ src/luamm.hh -@@ -25,7 +25,9 @@ - #include <assert.h> - #include <memory> - #include <mutex> -+#include <exception> - #include <stdexcept> -+#include <string> - - #include <lua.hpp> - -@@ -210,7 +212,7 @@ namespace lua { +@@ -212,7 +212,7 @@ namespace lua { bool islightuserdata(int index) throw() { return lua_islightuserdata(cobj.get(), index); } bool isnil(int index) throw() { return lua_isnil(cobj.get(), index); } bool isnone(int index) throw() { return lua_isnone(cobj.get(), index); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610041244.u94Ci59Q062929>