public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/netatalk/files/, net-fs/netatalk/
Date: Wed,  8 Apr 2020 07:43:05 +0000 (UTC)	[thread overview]
Message-ID: <1586331778.18c9cd112e5f37795391d3f0b895741c79a047e7.grobian@gentoo> (raw)

commit:     18c9cd112e5f37795391d3f0b895741c79a047e7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  8 07:42:50 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Apr  8 07:42:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c9cd11

net-fs/netatalk-3.1.2: fix compilation due to my_bool, bug #692560

Closes: https://bugs.gentoo.org/692560
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch | 16 ++++++++++++++++
 net-fs/netatalk/netatalk-3.1.12.ebuild              |  1 +
 2 files changed, 17 insertions(+)

diff --git a/net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch b/net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch
new file mode 100644
index 00000000000..3b4ff99ec57
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch
@@ -0,0 +1,16 @@
+fix my_bool compilation issue due to newer MySQL removing the type
+
+https://bugs.gentoo.org/692560
+Patch by Kostiantyn Gorbunov
+
+--- a/libatalk/cnid/mysql/cnid_mysql.c	2016-03-10 10:06:20.000000000 +0200
++++ b/libatalk/cnid/mysql/cnid_mysql.c	2019-09-02 19:55:04.361132422 +0300
+@@ -848,7 +848,7 @@
+ 
+     /* Initialize and connect to MySQL server */
+     EC_NULL( db->cnid_mysql_con = mysql_init(NULL) );
+-    my_bool my_recon = true;
++    bool my_recon = true;
+     EC_ZERO( mysql_options(db->cnid_mysql_con, MYSQL_OPT_RECONNECT, &my_recon) );
+     int my_timeout = 600;
+     EC_ZERO( mysql_options(db->cnid_mysql_con, MYSQL_OPT_CONNECT_TIMEOUT, &my_timeout) );

diff --git a/net-fs/netatalk/netatalk-3.1.12.ebuild b/net-fs/netatalk/netatalk-3.1.12.ebuild
index da4f8e1ca7c..369ce4e2ac3 100644
--- a/net-fs/netatalk/netatalk-3.1.12.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.12.ebuild
@@ -59,6 +59,7 @@ REQUIRED_USE="
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.7-gentoo.patch
 	"${FILESDIR}"/${PN}-3.1.8-disable-ld-library-path.patch #564350
+	"${FILESDIR}"/${PN}-3.1.12-my_bool.patch #692560
 )
 
 src_prepare() {


             reply	other threads:[~2020-04-08  7:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-08  7:43 Fabian Groffen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-10-04 17:03 [gentoo-commits] repo/gentoo:master commit in: net-fs/netatalk/files/, net-fs/netatalk/ Hans de Graaff

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1586331778.18c9cd112e5f37795391d3f0b895741c79a047e7.grobian@gentoo \
    --to=grobian@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox