* [PR PATCH] apr-util: fix mysql error
@ 2022-10-16 1:20 classabbyamp
2022-10-16 1:26 ` [PR PATCH] [Updated] " classabbyamp
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: classabbyamp @ 2022-10-16 1:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 403 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages apr-util
https://github.com/void-linux/void-packages/pull/39977
apr-util: fix mysql error
fixes #39510
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/39977.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-39977.patch --]
[-- Type: text/x-diff, Size: 1337 bytes --]
From 87c65f4e61d9bb1812bdac62225914f42c775fa6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 15 Oct 2022 21:19:26 -0400
Subject: [PATCH] apr-util: fix mysql error
fixes #39510
---
srcpkgs/apr-util/patches/mysql.patch | 14 ++++++++++++++
srcpkgs/apr-util/template | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/apr-util/patches/mysql.patch
diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
new file mode 100644
index 000000000000..d58c45b5be0d
--- /dev/null
+++ b/srcpkgs/apr-util/patches/mysql.patch
@@ -0,0 +1,14 @@
+https://github.com/void-linux/void-packages/issues/39510
+
+--- a/dbd/apr_dbd_mysql.c
++++ b/dbd/apr_dbd_mysql.c
+@@ -1262,7 +1262,9 @@
+
+ static void dbd_mysql_init(apr_pool_t *pool)
+ {
++#if MYSQL_VERSION_ID < 100000
+ my_init();
++#endif
+ mysql_thread_init();
+
+ /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f01bfeb54158..ba1c9b06360a 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
# Template file for 'apr-util'
pkgname=apr-util
version=1.6.1
-revision=12
+revision=13
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] apr-util: fix mysql error
2022-10-16 1:20 [PR PATCH] apr-util: fix mysql error classabbyamp
@ 2022-10-16 1:26 ` classabbyamp
2022-10-16 1:37 ` classabbyamp
2022-10-16 1:40 ` [PR PATCH] [Merged]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2022-10-16 1:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 408 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages apr-util
https://github.com/void-linux/void-packages/pull/39977
apr-util: fix mysql error
fixes #39510
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/39977.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-39977.patch --]
[-- Type: text/x-diff, Size: 1679 bytes --]
From 7b1bbdce791c11563d624edf7e4ce941da0cce39 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 15 Oct 2022 21:19:26 -0400
Subject: [PATCH] apr-util: fix mysql error
fixes #39510
---
srcpkgs/apr-util/patches/mysql.patch | 14 ++++++++++++++
srcpkgs/apr-util/template | 4 +++-
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/apr-util/patches/mysql.patch
diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
new file mode 100644
index 000000000000..d58c45b5be0d
--- /dev/null
+++ b/srcpkgs/apr-util/patches/mysql.patch
@@ -0,0 +1,14 @@
+https://github.com/void-linux/void-packages/issues/39510
+
+--- a/dbd/apr_dbd_mysql.c
++++ b/dbd/apr_dbd_mysql.c
+@@ -1262,7 +1262,9 @@
+
+ static void dbd_mysql_init(apr_pool_t *pool)
+ {
++#if MYSQL_VERSION_ID < 100000
+ my_init();
++#endif
+ mysql_thread_init();
+
+ /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f01bfeb54158..f1cd4363365a 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
# Template file for 'apr-util'
pkgname=apr-util
version=1.6.1
-revision=12
+revision=13
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -19,6 +19,8 @@ license="Apache-2.0"
homepage="https://apr.apache.org/"
distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+# fails to build tests
+make_check=no
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] apr-util: fix mysql error
2022-10-16 1:20 [PR PATCH] apr-util: fix mysql error classabbyamp
2022-10-16 1:26 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-10-16 1:37 ` classabbyamp
2022-10-16 1:40 ` [PR PATCH] [Merged]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2022-10-16 1:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 418 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages apr-util
https://github.com/void-linux/void-packages/pull/39977
apr-util: fix mysql error
fixes #39510
#### Testing the changes
- I tested the changes in this PR: **briefly**
A patch file from https://github.com/void-linux/void-packages/pull/39977.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-39977.patch --]
[-- Type: text/x-diff, Size: 1809 bytes --]
From 4a37c804aee7f036d8b526781d119c5a2a53ac19 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 15 Oct 2022 21:19:26 -0400
Subject: [PATCH] apr-util: fix mysql error
fixes #39510
---
srcpkgs/apr-util/patches/mysql.patch | 15 +++++++++++++++
srcpkgs/apr-util/template | 4 +++-
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/apr-util/patches/mysql.patch
diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
new file mode 100644
index 000000000000..bf1792ed6ebb
--- /dev/null
+++ b/srcpkgs/apr-util/patches/mysql.patch
@@ -0,0 +1,15 @@
+fixes: https://github.com/void-linux/void-packages/issues/39510
+taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
+
+--- a/dbd/apr_dbd_mysql.c
++++ b/dbd/apr_dbd_mysql.c
+@@ -1262,7 +1262,9 @@
+
+ static void dbd_mysql_init(apr_pool_t *pool)
+ {
++#if MYSQL_VERSION_ID < 100000
+ my_init();
++#endif
+ mysql_thread_init();
+
+ /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f01bfeb54158..f1cd4363365a 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
# Template file for 'apr-util'
pkgname=apr-util
version=1.6.1
-revision=12
+revision=13
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -19,6 +19,8 @@ license="Apache-2.0"
homepage="https://apr.apache.org/"
distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+# fails to build tests
+make_check=no
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: apr-util: fix mysql error
2022-10-16 1:20 [PR PATCH] apr-util: fix mysql error classabbyamp
2022-10-16 1:26 ` [PR PATCH] [Updated] " classabbyamp
2022-10-16 1:37 ` classabbyamp
@ 2022-10-16 1:40 ` classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2022-10-16 1:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
There's a merged pull request on the void-packages repository
apr-util: fix mysql error
https://github.com/void-linux/void-packages/pull/39977
Description:
fixes #39510
#### Testing the changes
- I tested the changes in this PR: **briefly**
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-16 1:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-16 1:20 [PR PATCH] apr-util: fix mysql error classabbyamp
2022-10-16 1:26 ` [PR PATCH] [Updated] " classabbyamp
2022-10-16 1:37 ` classabbyamp
2022-10-16 1:40 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).