From nobody Mon Apr 29 13:32:20 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 4VSklT1JBhz5JLJf; Mon, 29 Apr 2024 13:32:21 +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 4VSklS57P4z47lF; Mon, 29 Apr 2024 13:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714397540; 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=q/q5BljILzuD+B7Ioe5sQ4/92+x8IJ7o8rETC1Ampkg=; b=ONjt4i1pv2C+B2HDIqM6SqbDH30oB5r65HUJwrIUClq5FJ/mvxcZ8yEAel4hTxMKa7vvgD 6juvUODv42PtYeguwBaFpGxqJwPNMUdVTHV+JXFZ4FWi549Mj7T9Kv+2CNoObf/RPvGRX0 HU3SAjc2UtubAMxurjcKB5RUBdahKLPrzNb5si3lhF0IeLueS57hncnMCrsjx1mpvB2q0W +zWyHMxbtd9xcTc1CRpi5Wdr2MdD/tNLCU27mXto4GERDTCA4K5ycu7hnxcigsrcSPrJ7i z8N23B8QSRNV/aamKIn4udrJ/LjnlwgV/Tf2eGvUkG3K/CvXkrkq6W1DxcZsFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714397540; a=rsa-sha256; cv=none; b=VAQmaWGcheiEJVDcOHSJPj1R4+bcMhPaapM8K/VKD4fNvuEogYZkSf1BKDt2/JfJ5hoBsI E18LfVLiofw0RNftQi01YsFe6yfEj1smq9EXSOsoYt6wXuBPrA7hGbyjl3mAmbL5CNDA4R ym2Q7QKmScmqcD18RLrNOQeNWasrw85+WYf8OK7wUO8F4TL4279vVKClmI1Xixw+JRlTZc SCwFlANdfxkaScdTYmMvME9VbpqU0uW5zsc5e/5YvALOrGYdZwpvt/xqH/knIVAMvHHiKN UsFaA4H65xtplHrTO/7z5yYmLpOy6xHGfYb4uzIxRdzx9NTj53h5ewBGm0SF6g== 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=1714397540; 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=q/q5BljILzuD+B7Ioe5sQ4/92+x8IJ7o8rETC1Ampkg=; b=T78FkDZ/NYIyztB6XtC5HtikxJGrSWx6pYC9B0lVjSLEow4Bvntf0FHBs4OvH5vm5nuTyN 5S5sAFWue9EDXr6vC8GhvkQODi5kJJ7RDQuxWD7GAVbhCAMF42bM4eSuZ5+nJfiBAecoD5 oRo6AAyj0vxLrbcFbXOc2gPYefPk3eVb4gp2OGuttU+ZTfLvaJ7h9H81AdiThilxmpFC9A /YeIj95bOHRTD2IvYoorPaMDgQayQhceym75XM2tJrt0ZGITbzd8BmEuQL8O3W/vQ77HCv UR/mQSuFBsIqnO6rn/NUabZVuGL8PaWGKPQZlg7rHHjfHrrWc52OQv4/HiKCDg== 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 4VSklS3kjzz19jP; Mon, 29 Apr 2024 13:32:20 +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 43TDWKmx075535; Mon, 29 Apr 2024 13:32:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TDWK5w075532; Mon, 29 Apr 2024 13:32:20 GMT (envelope-from git) Date: Mon, 29 Apr 2024 13:32:20 GMT Message-Id: <202404291332.43TDWK5w075532@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: 5cf7541407a0 - 2024Q2 - 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: 5cf7541407a0a81906720417c1ec22ebde519960 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=5cf7541407a0a81906720417c1ec22ebde519960 commit 5cf7541407a0a81906720417c1ec22ebde519960 Author: Vladimir Druzenko AuthorDate: 2024-04-29 13:12:16 +0000 Commit: Vladimir Druzenko CommitDate: 2024-04-29 13:32:06 +0000 graphics/glfw: fix build with EXAMPLES enabled and PREEDIT disabled Both options are non-default. MFH: 2024Q2 (cherry picked from commit 0bcd20b238ac35ec0db95a496b8c9ce7b6015b4e) --- Mk/Uses/mysql.mk | 4 ++-- graphics/glfw/Makefile | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk index cf5840131744..2a5edc80bb3c 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 (MySQL-8.0 = 80, look at bsd.default-versions.mk for -# possible values). +# necessary (MariaDB-10.11 = 10.11m, 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 8b33dd90eda3..3b2e330c99ac 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -65,6 +65,7 @@ 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: @@ -83,8 +84,9 @@ do-install-EXAMPLES-on: ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/tests && ${INSTALL_PROGRAM} \ allocator clipboard cursor empty events gamma glfwinfo icon \ - iconify input_text inputlag joysticks monitors msaa reopen \ + iconify inputlag joysticks monitors msaa reopen \ tearing threads timeout title triangle-vulkan window \ + ${TESTS_FILES} \ ${STAGEDIR}${EXAMPLESDIR}/tests .include