From nobody Fri Jul 28 06:33:09 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 4RByW96xwpz4pcFl; Fri, 28 Jul 2023 06:33:09 +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 4RByW96Q1Kz3R6B; Fri, 28 Jul 2023 06:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690525989; 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=FYDcygoVqFghtk0OcETrNU0kdqpkx+0K0TWNzVzuSD8=; b=X9C1uJf5Tzoh9UyknzutPqjTPhigmtGdrRZLCtdaS0gavpfR7uRiha2CA2/pwC8DgV13gG VU/L8cjjGXOUSSqGiLExoE3PoNpizA9JFdYxmIMpW3z3txymXoqVnm3UCAqCWKh3XMhZlt acJBW12+KWLQVYY7a55Bgo5C8L48CuE1ugFR3kJ/UaRbQ+TGZ6jX9aWPb3H73G8+05+V1w GgGahkp5dZs46uHGGiGQiyiOv3iCE3wahK2W5um3eCVKiuKJR4gXyvv6YMJl9tnPKN3ENn a3cVPZt2THBNeSOM2b9oJu1XW0c/m5lJj/sp/m3mfJEbBzbYnH5kjZNID4AOQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690525989; 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=FYDcygoVqFghtk0OcETrNU0kdqpkx+0K0TWNzVzuSD8=; b=nx179uH0u+Li3IrWOHY+z37qH+mnA6Yzp5xeLZKTvKJwHNMxk1UmJ9oSnS9C1Qqb34KuJQ LwXwIvMVQyi+p5R+MsYIkAsGOjYlupcHch0s1QSxjsYcJHSYS/HIf5yDEZSP3P0LHFkCJw G6LHDVsEpVmB1NpH4yzUz5QxQ79Iiu86U0rcsmxShKNQigEmYX6K1CRfNIJ7HHA/e6YI/C mIVAv/Fug/2Jy6JN2helL5Efzq2COlic1r6fO0CAwAFtTJrGkifRK1VvD4E4KBOn+NoFMr IIlgUjm7vksI5BW6zoOcNOqhNR4n8iNtw660oe4ESG5zMVnOXHH56NE5d4e2VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690525989; a=rsa-sha256; cv=none; b=QexnnM3uAn/7SQ+TcyOqTa9/Tnc2LSld5hYC2IQ0aJIrE7RKTspHkP5jsU6/7EyGzS32B8 jzZ8FubpkN6xaIApL4WEig0pHPFB5WT0G/C7qN8/DIkpsRob2BNRLusWqsCN0QI8bUkjwD veyjLDOfB5X0mQmNGFA9XO4T4Onu9n6IWsOgZTrz16tN55nViBa/VhAkYlUtsfd3NPf7yI bJeyImsCwQRNXKAUS7Kjyy2dcz3UvJlktWmTOxUjvOg4WSpHh39bMTjnjK24KEz6kDWVEZ KS7HSp4QfNnWyboYXsmqM2B2Tx//9wc8nxykbcoXKl+rhmicQNbRVjO1nYkinw== 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 4RByW95WGbzh4Z; Fri, 28 Jul 2023 06:33:09 +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 36S6X954013860; Fri, 28 Jul 2023 06:33:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36S6X9gQ013859; Fri, 28 Jul 2023 06:33:09 GMT (envelope-from git) Date: Fri, 28 Jul 2023 06:33:09 GMT Message-Id: <202307280633.36S6X9gQ013859@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 1bd91c34660f - main - x11-wm/blackbox: switch from std::mem_fun to std::mem_fn 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bd91c34660f630db4d1414a2d64b47162a5baad Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=1bd91c34660f630db4d1414a2d64b47162a5baad commit 1bd91c34660f630db4d1414a2d64b47162a5baad Author: Trond Endrestol AuthorDate: 2023-07-27 06:48:20 +0000 Commit: Fernando Apesteguía CommitDate: 2023-07-28 06:32:51 +0000 x11-wm/blackbox: switch from std::mem_fun to std::mem_fn The former is deprecated. PR: 272660 Reported by: Trond.Endrestol@ximalas.info Approved by: A.J.Caines@halplant.com (maintainer) --- x11-wm/blackbox/Makefile | 2 +- x11-wm/blackbox/files/patch-src_Screen.cc | 24 ++++++++++++++++++++++++ x11-wm/blackbox/files/patch-src_blackbox.cc | 25 +++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile index c4097601a3f0..73b775d435b8 100644 --- a/x11-wm/blackbox/Makefile +++ b/x11-wm/blackbox/Makefile @@ -1,6 +1,6 @@ PORTNAME= blackbox PORTVERSION= 0.70.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-wm MASTER_SITES= SF/${PORTNAME}wm/${PORTNAME}wm/Blackbox%20${PORTVERSION} diff --git a/x11-wm/blackbox/files/patch-src_Screen.cc b/x11-wm/blackbox/files/patch-src_Screen.cc index 4bb2df4678be..edab37f53e0b 100644 --- a/x11-wm/blackbox/files/patch-src_Screen.cc +++ b/x11-wm/blackbox/files/patch-src_Screen.cc @@ -17,3 +17,27 @@ removeLastWorkspace(); } } else if (event->message_type == _blackbox->ewmh().desktopNames()) { +@@ -1927,12 +1928,12 @@ void BScreen::toggleFocusModel(FocusModel model) { + + void BScreen::toggleFocusModel(FocusModel model) { + std::for_each(windowList.begin(), windowList.end(), +- std::mem_fun(&BlackboxWindow::ungrabButtons)); ++ std::mem_fn(&BlackboxWindow::ungrabButtons)); + + _blackbox->resource().setFocusModel(model); + + std::for_each(windowList.begin(), windowList.end(), +- std::mem_fun(&BlackboxWindow::grabButtons)); ++ std::mem_fn(&BlackboxWindow::grabButtons)); + } + + +@@ -1976,7 +1977,7 @@ void BScreen::updateClientListHint(void) const { + bt::EWMH::WindowList clientList(windowList.size()); + + std::transform(windowList.begin(), windowList.end(), clientList.begin(), +- std::mem_fun(&BlackboxWindow::clientWindow)); ++ std::mem_fn(&BlackboxWindow::clientWindow)); + + _blackbox->ewmh().setClientList(screen_info.rootWindow(), clientList); + } diff --git a/x11-wm/blackbox/files/patch-src_blackbox.cc b/x11-wm/blackbox/files/patch-src_blackbox.cc index 0fbb12cbe04c..7821c234a12c 100644 --- a/x11-wm/blackbox/files/patch-src_blackbox.cc +++ b/x11-wm/blackbox/files/patch-src_blackbox.cc @@ -17,6 +17,24 @@ #include // #define FOCUS_DEBUG +@@ -113,7 +116,7 @@ void Blackbox::shutdown(void) { + XSetInputFocus(XDisplay(), PointerRoot, RevertToPointerRoot, XTime()); + + std::for_each(screen_list, screen_list + screen_list_count, +- std::mem_fun(&BScreen::shutdown)); ++ std::mem_fn(&BScreen::shutdown)); + + XSync(XDisplay(), false); + +@@ -367,7 +370,7 @@ void Blackbox::timeout(bt::Timer *) { + menuTimestamps.clear(); + + std::for_each(screen_list, screen_list + screen_list_count, +- std::mem_fun(&BScreen::reconfigure)); ++ std::mem_fn(&BScreen::reconfigure)); + + bt::Font::clearCache(); + bt::PixmapCache::clearCache(); @@ -422,7 +425,7 @@ Blackbox::Blackbox(char **m_argv, const char *dpy_name if (managed == 0) { fprintf(stderr, "%s: no managable screens found, exiting...\n", @@ -26,3 +44,10 @@ } screen_list_count = managed; +@@ -620,5 +623,5 @@ void Blackbox::rereadMenu(void) { + menuTimestamps.clear(); + + std::for_each(screen_list, screen_list + screen_list_count, +- std::mem_fun(&BScreen::rereadMenu)); ++ std::mem_fn(&BScreen::rereadMenu)); + }