From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51F98138359 for ; Mon, 27 Jul 2020 10:46:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51EA5E1600; Mon, 27 Jul 2020 10:46:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 388EAE1600 for ; Mon, 27 Jul 2020 10:46:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 30D3934EDB4 for ; Mon, 27 Jul 2020 10:46:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 009122DB for ; Mon, 27 Jul 2020 10:46:27 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1595846780.0a2bddbf014ae3b7bfa42203066f14f04fbe5ede.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch X-VCS-Directories: dev-libs/apr-util/files/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 0a2bddbf014ae3b7bfa42203066f14f04fbe5ede X-VCS-Branch: master Date: Mon, 27 Jul 2020 10:46:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 747e08e4-983b-47e0-879a-0f329215a5c3 X-Archives-Hash: da66d792a56ad3d95f435d2f61f03385 commit: 0a2bddbf014ae3b7bfa42203066f14f04fbe5ede Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Jul 27 10:45:54 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Jul 27 10:46:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a2bddbf dev-libs/apr-util: improve my_bool patch Closes: https://bugs.gentoo.org/734020 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann gentoo.org> dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch b/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch index 6cd875bcde8..48816555a21 100644 --- a/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch +++ b/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch @@ -1,17 +1,13 @@ -Description: Reintroduce my_bool to fix build with MySQL 8 -Author: Robie Basak -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1863026 -Forwarded: no -Last-Update: 2020-02-18 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/dbd/apr_dbd_mysql.c +++ b/dbd/apr_dbd_mysql.c -@@ -41,6 +41,7 @@ +@@ -41,6 +41,10 @@ #endif #endif #include ++#ifndef HAVE_TYPE_MY_BOOL ++#include +typedef bool my_bool; ++#endif #include #endif