From nobody Sun Jan 21 15:08:11 2024 X-Original-To: dev-commits-ports-all@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 4THxYl605Mz57csC; Sun, 21 Jan 2024 15:08:11 +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 4THxYl5QhGz4jCy; Sun, 21 Jan 2024 15:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705849691; 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=BOiHHHKnpp0MdlUT5yAidSY+lJWU4oDzussB/uFN+b4=; b=gifcHHm7LAqqDrFx38aK3cn8pltUFusWe8O9XKPl06ll2PqcEc9b+7mlYmmp88O+e22WPg yOHSJnBdNgeyh4+/vOy+c52AXqwsBduMnq6zCh4h02A4Q3jSsj9ENzuJSmKXSCaYmULeFC y6tL/ayr2txuuPNzLLVUMWWFRjgMGBZYqXO767G28OxzPW1vBy6UnjVTq7zpJrBYNp7Cg9 SdDU7aZVx9U9dEXfKMdec/RoWbZYKanxC0sWKk9MrcXmTzSALvfBAPTMyxnrTuA6wT/Cp8 m3wXPzCAlsIhhjTgZagGOcTnsSEQYyheORiKjYe7PfdGYIJhRSmen2RVR+SXrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705849691; 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=BOiHHHKnpp0MdlUT5yAidSY+lJWU4oDzussB/uFN+b4=; b=wbLQ3SOdD6YPHOjhIfEOQeGKyu3m2Y93bie0lGymXL/D2IaCI9n6PWOTaMiBNlyWDU5crx uMilWxupIkWWXM6ALhfr7CgXvK1d/76QXQ/gOXNa8s+v4i8RS7ZdgnYd64i5Ig/mHvnjmD fdHktrG34GZ75amrMw1Pj03nrT1FEiheD9N/418DMChp3Fxb7iqnqiwEgSMlvJ37JamF0D Z+8WlUojveEV39PvM82c2exFX8q82zTYjMNLwcJPFTURNiiuLwuvSKhq709cKCCiJA7ha0 eJ8tNmn56wyXQmxmA5605l8GSO9soj61tPHv8C2X5yMWbjY3g2Qmjo8V6zqjug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705849691; a=rsa-sha256; cv=none; b=QpViEJCz8S/gCHn9pG75jX+Zuw69ft6rTnhfDlilkDhW8rKzicN7omtOuZ5hVNjau97VNQ GJBa1ZaUobtK7bNuS9hqyIBXLay34p8jHCnOdcK6XSz876qoQ843EMb247/fZY2dEr141A IstVVlbFmRfSFFAhnmPoG9C8hRgRD5VX1VrcyyOPcmzSiMvDHhWHWn2d0Xl/iNMqHWHJZl Xsp5HXb0z1Sppg4OF44J4nDzPrKFrGuCVaV9DLKQvDBKraln5GWZuX335BxcMWyk9sTttO 3EDlzvLluhmr+swzmrrsJD8iYbwkZtgi6RyDu0aeuQa2yTRfoT/UHZXaYGKA6g== 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 4THxYl4TJgzNFD; Sun, 21 Jan 2024 15:08:11 +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 40LF8BA4030042; Sun, 21 Jan 2024 15:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40LF8B6G030039; Sun, 21 Jan 2024 15:08:11 GMT (envelope-from git) Date: Sun, 21 Jan 2024 15:08:11 GMT Message-Id: <202401211508.40LF8B6G030039@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: e54574be5954 - main - databases/rubygem-mysql: fix build with mariadb 10.11 and ruby 3.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e54574be5954aa30e525b8ee53de3dbf69f172d3 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=e54574be5954aa30e525b8ee53de3dbf69f172d3 commit e54574be5954aa30e525b8ee53de3dbf69f172d3 Author: Dirk Meyer AuthorDate: 2024-01-21 15:06:25 +0000 Commit: Dirk Meyer CommitDate: 2024-01-21 15:08:05 +0000 databases/rubygem-mysql: fix build with mariadb 10.11 and ruby 3.2 --- databases/rubygem-mysql/files/patch-ext-mysql_api-extconf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databases/rubygem-mysql/files/patch-ext-mysql_api-extconf.rb b/databases/rubygem-mysql/files/patch-ext-mysql_api-extconf.rb index 945358044a3f..5a81b1eb5fb3 100644 --- a/databases/rubygem-mysql/files/patch-ext-mysql_api-extconf.rb +++ b/databases/rubygem-mysql/files/patch-ext-mysql_api-extconf.rb @@ -4,7 +4,7 @@ next unless l =~ /errmsg\.h|mysqld_error\.h/ fn = l.split(/\"/)[1] IO.foreach(fn) do |m| -+ next if m == 'ER_UNKNOWN_ERROR_CODE' ++ next if m =~ /ER_UNKNOWN_ERROR_CODE/ + if m =~ /^#define\s+([CE]R_[0-9A-Z_]+)/ then error_syms << $1