From nobody Fri May 31 06:32:03 2024 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 4VrCvm05M6z5MJBT; Fri, 31 May 2024 06:32:04 +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 4VrCvl4W2xz4JCg; Fri, 31 May 2024 06:32:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717137123; 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=oSEilUqys+LpbeX1VLs6WWjfPMDUMRzES7EiXRq2enw=; b=NvsA3aWMAEBsGDu1sa9duBdKBP4hMFRSQKtSpJN8DyNI5zR02DLSB/NYGGfSsXSOXBRDKC ngafeZvusSqy1bZneDhh6hkM3zSupdJ1rNflnKLeb/9Tt1pwH39dAa+sgYVNDsrgWPkXax STVdN/CEwA7MGLeWE8E/Qsz0PGtm+HfqG1Sg6Y1JpGg5LFG/K+5KAmx6FJnpZUHQmJtg+9 2+uvJ4tToYmrkPDlFwad9+F4p4jFEMra3QuHkaYbhazazci/qdpop09yWsZD9q8EF0uP9J Y1+IFa6LTSwrW+dXt3+1sTL+/W9s2C2TD934T8kFWVV18jxRLsFsO5FAB5PuRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717137123; a=rsa-sha256; cv=none; b=kOt9MAzRlRIQl88ikEsx8gziBIQMkln/eYv4N4FG5/8Kp/ojE+p3Ccf8wXMJzKmaLuEF+8 gRE/scdX5MGTekAEvjV5YXKBKVdW08mmtBVU1rsW4t0kaG3ZA5ipRDg+ofsHEEMxj3b9ln iuZu5M4QGG58sdWKdzBnfo4Oe27c7V13n51BhECyI/M3IgL+MClysrqEBLCb+eaNTsWeAU vwRhNHa3u6zfdgJN/V0zvtlt6MLCzUn4Kp/4Dl80KDsqc2/JJ3sa/r0Tt8kUrxcR4L3XE6 Qzbz20kVosQBym9PXZTEGgH5xBind1Cx4iQV77CVNRIWUfMLa20RUyNBPZ74hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717137123; 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=oSEilUqys+LpbeX1VLs6WWjfPMDUMRzES7EiXRq2enw=; b=uwryyUrtPsjVVrUdK/oG+9Aok/nlEpgv44nNAV8QmoJ6iT8Tuh83w+g2YHKkKCri3iR5bw hUpRFQydW1LqHmbGUxih3HCvXM6lRbk8PFWR0NuP0pRNtPkorkrjszTtuCJ35JlgA93Tao 79EZGySB0D6e/zxHrUj5GVu2sBKNwXGVEA2o46WfHp4n1hvCzUmjEcaswIsVJkhtvZl3qJ NG/sAuMgIlk56iVJbt/N3EM/JejjhU3ygwll4drBjfaKeI+1WnOmJHJ9ekgNHAHv2VVKkX /SvSbqFxv5Kek2meryGLXj7UdKX9lv1JVbMuckGVQl0Hn9OHPhZPOL11js4qqA== 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 4VrCvl46mbz1C4g; Fri, 31 May 2024 06:32:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44V6W3nc048288; Fri, 31 May 2024 06:32:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44V6W3uS048273; Fri, 31 May 2024 06:32:03 GMT (envelope-from git) Date: Fri, 31 May 2024 06:32:03 GMT Message-Id: <202405310632.44V6W3uS048273@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: cfc9a1e749ee - main - sysutils/conky{-awesome}: update to 1.21.2 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfc9a1e749ee6c2869d1139dcd395db2747712b8 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=cfc9a1e749ee6c2869d1139dcd395db2747712b8 commit cfc9a1e749ee6c2869d1139dcd395db2747712b8 Author: Fernando Apesteguía AuthorDate: 2024-05-30 15:17:33 +0000 Commit: Fernando Apesteguía CommitDate: 2024-05-31 06:31:24 +0000 sysutils/conky{-awesome}: update to 1.21.2 Remove upstreamed patches. ChangeLog: https://github.com/brndnmtthws/conky/releases/tag/v1.21.2 Features * Don't include the -pre in install dir path. Bug fixes * Fix build with specific option combination. * Remove dpi scaling of minimum_width & maximum_width * Make dpi_scale match original behavior * Don't test colour names without map * Fix typo in conky.cc Miscellaneous * Bump version * Docker: don't login without creds --- sysutils/conky/Makefile | 2 +- sysutils/conky/distinfo | 6 +++--- sysutils/conky/files/patch-CMakeLists.txt | 6 +++--- sysutils/conky/files/patch-src_x11-settings.cc | 11 ----------- sysutils/conky/files/patch-src_x11.cc | 16 ---------------- 5 files changed, 7 insertions(+), 34 deletions(-) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 6a84d03b15e5..fd26609ce559 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,5 +1,5 @@ PORTNAME= conky -PORTVERSION= 1.21.1 +PORTVERSION= 1.21.2 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index fd4e7cac4151..8253d0b857ee 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716140477 -SHA256 (brndnmtthws-conky-v1.21.1_GH0.tar.gz) = dccfee01fc208c4fde2bfb7c39c0fdc692d82de0f94e733ddf22e1199969bc5d -SIZE (brndnmtthws-conky-v1.21.1_GH0.tar.gz) = 2146994 +TIMESTAMP = 1717082241 +SHA256 (brndnmtthws-conky-v1.21.2_GH0.tar.gz) = d2196f4e61b696265145f6e0ad306376229147bd1cbe0c54ec87d5cd2473f752 +SIZE (brndnmtthws-conky-v1.21.2_GH0.tar.gz) = 2147033 diff --git a/sysutils/conky/files/patch-CMakeLists.txt b/sysutils/conky/files/patch-CMakeLists.txt index 6f3f5c0807f3..96f293f00010 100644 --- a/sysutils/conky/files/patch-CMakeLists.txt +++ b/sysutils/conky/files/patch-CMakeLists.txt @@ -1,10 +1,10 @@ ---- CMakeLists.txt.orig 2024-02-26 18:33:49 UTC +--- CMakeLists.txt.orig 2024-05-30 14:36:45 UTC +++ CMakeLists.txt -@@ -74,12 +74,15 @@ if(NOT DEFINED DOC_PATH) +@@ -79,12 +79,15 @@ if(NOT DEFINED DOC_PATH) endif() if(NOT DEFINED DOC_PATH) -- set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${VERSION}") +- set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${RELEASE_VERSION}") + set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}") endif(NOT DEFINED DOC_PATH) diff --git a/sysutils/conky/files/patch-src_x11-settings.cc b/sysutils/conky/files/patch-src_x11-settings.cc deleted file mode 100644 index b91b3e469084..000000000000 --- a/sysutils/conky/files/patch-src_x11-settings.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/x11-settings.cc.orig 2024-05-19 17:48:45 UTC -+++ src/x11-settings.cc -@@ -77,7 +77,7 @@ bool use_xpmdb_setting::set_up(lua::state &l) { - if (!out_to_x.get(l)) return false; - - window.back_buffer = -- XCreatePixmap(display, window.window, window.geometry.get_width() + 1, window.geometry.get_height() + 1, -+ XCreatePixmap(display, window.window, window.geometry.width() + 1, window.geometry.height() + 1, - DefaultDepth(display, screen)); - if (window.back_buffer != None) { - window.drawable = window.back_buffer; diff --git a/sysutils/conky/files/patch-src_x11.cc b/sysutils/conky/files/patch-src_x11.cc deleted file mode 100644 index 8ecbb03b3840..000000000000 --- a/sysutils/conky/files/patch-src_x11.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- src/x11.cc.orig 2024-05-19 17:48:25 UTC -+++ src/x11.cc -@@ -1219,10 +1219,10 @@ void xpmdb_swap_buffers(void) { - void xpmdb_swap_buffers(void) { - if (use_xpmdb.get(*state)) { - XCopyArea(display, window.back_buffer, window.window, window.gc, 0, 0, -- window.geometry.get_width(), window.geometry.get_height(), 0, 0); -+ window.geometry.width(), window.geometry.height(), 0, 0); - XSetForeground(display, window.gc, 0); -- XFillRectangle(display, window.drawable, window.gc, 0, 0, window.geometry.get_width(), -- window.geometry.get_height()); -+ XFillRectangle(display, window.drawable, window.gc, 0, 0, window.geometry.width(), -+ window.geometry.height()); - XFlush(display); - } - }