summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2020-04-08 09:42:50 +0200
committerFabian Groffen <grobian@gentoo.org>2020-04-08 09:42:58 +0200
commit18c9cd112e5f37795391d3f0b895741c79a047e7 (patch)
treeae9c69ac5b674b49a3813830bbfb953b296e9f17 /net-fs
parentprofiles: riscv: Mask dev-libs/boost[mpi,numpy,zstd] and sys-block/thin-provi... (diff)
downloadgentoo-18c9cd112e5f37795391d3f0b895741c79a047e7.tar.gz
gentoo-18c9cd112e5f37795391d3f0b895741c79a047e7.tar.bz2
gentoo-18c9cd112e5f37795391d3f0b895741c79a047e7.zip
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@gentoo.org>
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch16
-rw-r--r--net-fs/netatalk/netatalk-3.1.12.ebuild1
2 files changed, 17 insertions, 0 deletions
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() {