From nobody Sat Feb 18 23:13:26 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PK4HC1H8jz3s2hg; Sat, 18 Feb 2023 23:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PK4HC0kJZz3rlR; Sat, 18 Feb 2023 23:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676762007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zq+dbrgHQrct8/qJzsENhukAtWB6Xqjq8MJNzBmxTQQ=; b=crD4cIQn4CF0pnFINTBWAD1BM6E9Vmw0+NIg3nYUgDydtmkHT/bW2Z+FAPdnogGrx1t0ZF 6PTDy3ospXqZmWBxpgnH934ExO4JQKyVFRo/JefcbbnZvs/CEGGx6pzcZiTvAs3fwZCYwl cBxkqZfr5jx1Ubsml/2DSw0himSgzWpWKGtwyOPdZX+R79hT0t+7T1oMy3Qv2P0CuT81gG w/ohLUbRx64shPM7AupeR/iUmEjSaowYDD+n3Yx1amaqmINu11FQS8mevYQr/dWCLyp8S7 Ymch5L5Si37wCiuhojdyG7gJOkZyZ4rUP8Jr1WaF/TvYL1MbAvDlV3nWo3s+ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676762007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zq+dbrgHQrct8/qJzsENhukAtWB6Xqjq8MJNzBmxTQQ=; b=LMDwAjC0WRSqfrtdGBZ01b1TAsrPVp77F6Nr4F/ooVIN2vdfL0Y3TyW/A8yUt9aKUX6CBN aPLhZrjJdhvgPh9L669BhJG1MXubOhuNablf+NkoBl1ft/MgCZS2h1H9hWjmaho/O6iRdj IHCIu59T5MjWXRSQER1jh+fwPpOrefuxYEMarbEVDFynzWBPTqkr/fb3956PmkqjnK1lg4 IiUQ4G8XdhuR0i4D0r/zQmNAksK0nGEGCCjwp11D3PnXDVjR98v+I9aKje2d3gDPXCyWVP q0CL5N1OKXZfN0KCGoZeiGuW9IiZJyi4blB61vsEqEaCrIk+DiC+Pkv2kiyrSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676762007; a=rsa-sha256; cv=none; b=lIzXK+kZ7yovWM6LjNh+FmlSj69AO0DbXFr0yO8uUV5jIm3iWQ9uvSniScfiVVDhQu9Piq 6rTQ2i5auGBx/CBX0A2/R5g81RYDD5cfpJjSntIAt05Y794V2W++tvvJw63sUAdwxG9s67 8bI6sknUwVbIYHpj1yYeWE9rWiweBxKfXBjU5XeWdV9Zx/cxrA1xjDJf+UBJNVKvPJ0fYd j6H84uYeN9G0t0P/IoGZ8BuXdSCPGJpDnSP2xWIPBXcBzLZeKwIJFRlYTSMWrJfLiuGrRQ 7QJTcye/CFHvjOOse3VBCPAurmjrBXrdleHTzfmcOWamjQlroUu39lm9OmXV5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PK4HB6YSjzgcj; Sat, 18 Feb 2023 23:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31INDQ6j042094; Sat, 18 Feb 2023 23:13:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31INDQT7042093; Sat, 18 Feb 2023 23:13:26 GMT (envelope-from git) Date: Sat, 18 Feb 2023 23:13:26 GMT Message-Id: <202302182313.31INDQT7042093@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 5ed62a09ebef - main - sysutils/conky: Update to 1.18.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ed62a09ebef87733abf5a4490768f2321b1f528 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ed62a09ebef87733abf5a4490768f2321b1f528 commit 5ed62a09ebef87733abf5a4490768f2321b1f528 Author: Guido Falsi AuthorDate: 2023-02-18 23:12:20 +0000 Commit: Guido Falsi CommitDate: 2023-02-18 23:12:20 +0000 sysutils/conky: Update to 1.18.0 --- sysutils/conky/Makefile | 13 ++----------- sysutils/conky/distinfo | 6 +++--- sysutils/conky/files/patch-lua_CMakeLists.txt | 11 +++++++++++ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 3b9d5f7c9a44..4f11010c3a95 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,5 +1,5 @@ PORTNAME= conky -PORTVERSION= 1.17.0 +PORTVERSION= 1.18.0 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -11,7 +11,7 @@ LIB_DEPENDS= libinotify.so:devel/libinotify BUILD_DEPENDS= gsed:textproc/gsed USES= cpe cmake compiler:c++11-lib gettext-runtime iconv \ - localbase lua:52-53 pkgconfig tar:bzip2 + localbase:ldflags lua:52-53 pkgconfig tar:bzip2 CMAKE_ARGS= -DBUILD_PORT_MONITORS:BOOL=false \ -DBUILD_IBM:BOOL=false \ @@ -152,15 +152,6 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_CMakeLists.txt post-patch: @${REINPLACE_CMD} -e 's,^set(INCLUDE_SEARCH_PATH \(.*\)),set(INCLUDE_SEARCH_PATH \1 ${LUA_INCDIR}),' \ ${WRKSRC}/cmake/ConkyPlatformChecks.cmake -.if ${LUA_DEFAULT} == 5.2 - # Force using lua 5.2 - @${REINPLACE_CMD} -e 's/lua.*5\.*3//' \ - ${WRKSRC}/cmake/ConkyPlatformChecks.cmake -.elif ${LUA_DEFAULT} == 5.3 - # Force using lua 5.3 - @${REINPLACE_CMD} -e 's/lua.*5\.*2//' \ - ${WRKSRC}/cmake/ConkyPlatformChecks.cmake -.endif post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index 2ade9c9a619f..5d96ea75e29e 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672604377 -SHA256 (brndnmtthws-conky-v1.17.0_GH0.tar.gz) = c3558bc028bcfc583d8e7775aed20a0f264ff47dbf0debdf70a95b3a180069dc -SIZE (brndnmtthws-conky-v1.17.0_GH0.tar.gz) = 1699311 +TIMESTAMP = 1676741723 +SHA256 (brndnmtthws-conky-v1.18.0_GH0.tar.gz) = 17a131689ac07dbf97b817f310a2f5ecb572f31ff7ca33dd3c14a276f18ab355 +SIZE (brndnmtthws-conky-v1.18.0_GH0.tar.gz) = 1703679 diff --git a/sysutils/conky/files/patch-lua_CMakeLists.txt b/sysutils/conky/files/patch-lua_CMakeLists.txt new file mode 100644 index 000000000000..9bd166966418 --- /dev/null +++ b/sysutils/conky/files/patch-lua_CMakeLists.txt @@ -0,0 +1,11 @@ +--- lua/CMakeLists.txt.orig 2023-02-18 14:34:53 UTC ++++ lua/CMakeLists.txt +@@ -31,6 +31,8 @@ if(BUILD_X11) + get_filename_component(X11_SM_LIB_PATH ${X11_SM_LIB} DIRECTORY) + link_directories(${X11_SM_LIB_PATH}) + ++ link_directories(${LIBS}) ++ + # cairo_set_dash() needs this special hack to work properly if you have a + # better solution, please let me know + wrap_tolua(luacairo_src cairo.pkg libcairo.patch)