From nobody Mon Apr 29 13:42:46 2024 X-Original-To: dev-commits-ports-branches@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 4VSkzV2gWSz5JM8x; Mon, 29 Apr 2024 13:42:46 +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 4VSkzV2BLZz49YG; Mon, 29 Apr 2024 13:42:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714398166; 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=Biv5EeyYVXFd79+iDKcp03ZJSgdVO7/DnoPhyUAnVuM=; b=YmNDYtB4pdtsjWuIaotz9jf7rBewE9YpIvbZzvDA2acyTg55k3c7XYMX5oJnRDYB5V3qU5 XUYKBxSTT2vUr2wciXNIEfATdpmk/C9pumE+XyC4EWKTBd9UNvk2e4VIdi6l5X3KXetHiH 96Mwo7/+XcAK3RF9gl4pcHe1qboVZciLuevO1SFab0xQwnpytYwFam/7HcEMprdagyMlfj z6TVHibyTjQ3qB1FHkTOlPmzoRs99kdXKXV4wXL8pR/y5RwF5IFB0qrPlJoCxWkB7n0Iud oH8JlFTSu/2xX36y/gHmsK9XHWpKa7TCxXds7NMf61XtVOGKmIEX7F1hAJRkrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714398166; a=rsa-sha256; cv=none; b=KAQL4vQsiQY+vMAeg3b8XujQcZwSxU0VFhk56glngFL98jI/4EKRrbxXG5IriDpelqIg67 yasGfYWQpQVj7Q9D69U7zld5wxUuQRSgmeh5tyrw88bBLqDCRCmw2fmbzvCrLMFT2FpzV8 ne+aiCO902QDLlqjWBnGgDE2eqMsBq6W2YE2xPzFX/Kise8bxFAGBpoqLwY2VWm5Ibpv56 6/gcC/qfDb6r7ugzARfL/kqsmvqABWaUBUax3gLKkQpiCb7YcyuEg0T052/Nu73ioL52XB ZJpp66DlDnLmjHiOPtundf2/B/f2DKWogl2VZK8EOFx6brv+j3woWcpxK9j57A== 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=1714398166; 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=Biv5EeyYVXFd79+iDKcp03ZJSgdVO7/DnoPhyUAnVuM=; b=r+iOHTMKdk0dEJE9XhKnRzbbw1YiDcA4uCPqBM/lsqVIAfiJXfX4Vz+9ZN3VYqG2DEjf4S yxVHNFH2EFma6L1eA3irYmUCfsnYWaxS3dSFuNOTEnwQWhHwbxpxQhkdu3VtgMXs//8H6S 18cLi2SIaIf9LCNt0+X5Oanusl2zZur5LzkIuS/EowDHHiF782tNpTvlEb955i3XhsdCk/ 4kUb23/O2jPAsRulmVpdyKy/RJpHWSpT+0uk5SFTCWuKCw92FSUwN/7R2QmwKzBamv6z70 dhT1eymRS7+War7CveLj2tkIdqw92bTOUdj5C4x4rvh5GOId8VPOoXfXvk4KBg== 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 4VSkzV1pG0z1B7C; Mon, 29 Apr 2024 13:42:46 +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 43TDgkfn093954; Mon, 29 Apr 2024 13:42:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TDgkut093951; Mon, 29 Apr 2024 13:42:46 GMT (envelope-from git) Date: Mon, 29 Apr 2024 13:42:46 GMT Message-Id: <202404291342.43TDgkut093951@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 10a1c89b4d0e - 2024Q2 - Revert "graphics/glfw: fix build with EXAMPLES enabled and PREEDIT disabled" List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 10a1c89b4d0ece6cbd4d42a119a61aa5a664cd13 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=10a1c89b4d0ece6cbd4d42a119a61aa5a664cd13 commit 10a1c89b4d0ece6cbd4d42a119a61aa5a664cd13 Author: Vladimir Druzenko AuthorDate: 2024-04-29 13:38:55 +0000 Commit: Vladimir Druzenko CommitDate: 2024-04-29 13:42:01 +0000 Revert "graphics/glfw: fix build with EXAMPLES enabled and PREEDIT disabled" This reverts commit 0bcd20b238ac35ec0db95a496b8c9ce7b6015b4e. Mk/Uses/mysql.mk got there by accident (cherry picked from commit 817c2557b778ecc8b0bb920f055487e7d2415c6b) --- Mk/Uses/mysql.mk | 4 ++-- graphics/glfw/Makefile | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk index 2a5edc80bb3c..cf5840131744 100644 --- a/Mk/Uses/mysql.mk +++ b/Mk/Uses/mysql.mk @@ -5,8 +5,8 @@ # # version If no version is given (by the maintainer via the port), try to # find the currently installed version. Fall back to default if -# necessary (MariaDB-10.11 = 10.11m, look at bsd.default-versions.mk -# for possible values). +# necessary (MySQL-8.0 = 80, look at bsd.default-versions.mk for +# possible values). # client Depends on the libmysqlclient library (default) # server Depend on the server at run/build time. If none of these is # set, depends on the client. diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index 3b2e330c99ac..8b33dd90eda3 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -65,7 +65,6 @@ X11_CMAKE_BOOL= GLFW_BUILD_X11 .if ${PORT_OPTIONS:MEXAMPLES} && ${PORT_OPTIONS:MPREEDIT} LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig -TESTS_FILES= input_text .endif do-install-DOCS-on: @@ -84,9 +83,8 @@ do-install-EXAMPLES-on: ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/tests && ${INSTALL_PROGRAM} \ allocator clipboard cursor empty events gamma glfwinfo icon \ - iconify inputlag joysticks monitors msaa reopen \ + iconify input_text inputlag joysticks monitors msaa reopen \ tearing threads timeout title triangle-vulkan window \ - ${TESTS_FILES} \ ${STAGEDIR}${EXAMPLESDIR}/tests .include