Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] mariadb: merge mariadb-client into mariadb
@ 2022-05-25  4:27 classabbyamp
  2022-05-25  4:29 ` [PR PATCH] [Updated] " classabbyamp
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: classabbyamp @ 2022-05-25  4:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages fix/mariadb-client
https://github.com/void-linux/void-packages/pull/37284

mariadb: merge mariadb-client into mariadb
fixes #37282

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37284.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/mariadb-client-37284.patch --]
[-- Type: text/x-diff, Size: 2554 bytes --]

From d0abc1a0878967eb06b9810c858fc6a30ae8999e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 25 May 2022 00:25:46 -0400
Subject: [PATCH] mariadb: merge mariadb-client into mariadb

fixes #37282
---
 srcpkgs/mariadb/template | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 92cc4f15772f..8d9b0c42edda 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.5.10
-revision=2
+revision=3
 build_style=cmake
 build_helper=qemu
 configure_args="-DBUILD_CONFIG=mysql_release
@@ -20,7 +20,7 @@ configure_args="-DBUILD_CONFIG=mysql_release
 hostmakedepends="bison perl flex pkg-config"
 makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  pcre2-devel libatomic-devel"
-depends="mariadb-client"
+depends="perl"
 checkdepends="perl"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
 maintainer="Justin Jagieniak <justin@jagieniak.net>"
@@ -81,6 +81,7 @@ libmariadbclient_package() {
 		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
+
 libmariadbclient-devel_package() {
 	depends="libmariadbclient>=${version}_${revision} libatomic-devel"
 	provides="libmysqlclient-devel-${version}_${revision}"
@@ -94,31 +95,13 @@ libmariadbclient-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
 mariadb-client_package() {
-	depends="perl"
+	build_style=meta
+	depends="mariadb"
 	provides="mysql-client-${version}_${revision}"
 	replaces="mysql-client>=0"
-	short_desc+=" - client binaries"
-	pkg_install() {
-		for f in innochecksum innotop myisam_ftdump mysql mysql_client_test \
-			mysql_client_test_embedded mysqldumpslow mysqlbinlog \
-			mysql_find_rows mysql_fix_extensions mysql_waitpid mysqlaccess \
-			mysqladmin mysqlanalyze mysqlbug mysqlcheck mysqldump \
-			mysqlimport mysqloptimize mysqlrepair mysqlreport mysqlshow \
-			mysqlslap mysqltest_embedded mysqlmanager mysqltest \
-			mysqlhotcopy mysql_upgrade mysql_zap; do
-			if [ -f ${DESTDIR}/usr/bin/${f} ]; then
-				vmove usr/bin/${f}
-			elif [ -f ${DESTDIR}/usr/sbin/${f} ]; then
-				vmove usr/sbin/${f}
-			fi
-			if [ -f ${DESTDIR}/usr/share/man/man1/${f}.1 ]; then
-				vmove usr/share/man/man1/${f}.1
-			elif [ -f ${DESTDIR}/usr/share/man/man8/${f}.8 ]; then
-				vmove usr/share/man/man8/${f}.8
-			fi
-		done
-	}
+	short_desc+=" - client binaries (transitional dummy package)"
 }
 
 libmysqlclient_package() {

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: merge mariadb-client into mariadb
  2022-05-25  4:27 [PR PATCH] mariadb: merge mariadb-client into mariadb classabbyamp
@ 2022-05-25  4:29 ` classabbyamp
  2022-05-25  4:36 ` classabbyamp
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2022-05-25  4:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages fix/mariadb-client
https://github.com/void-linux/void-packages/pull/37284

mariadb: merge mariadb-client into mariadb
fixes #37282

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37284.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/mariadb-client-37284.patch --]
[-- Type: text/x-diff, Size: 2745 bytes --]

From 8c710ba54c22463a168a3a472c6fdbc8a16ee639 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 25 May 2022 00:25:46 -0400
Subject: [PATCH] mariadb: merge mariadb-client into mariadb

mariadb-client consisted almost entirely of symlinks to the main package
and manpages, and did not depend on the main package, so the symlinks
were broken if mariadb was not also installed.

fixes #37282
---
 srcpkgs/mariadb/template | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 92cc4f15772f..8d9b0c42edda 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.5.10
-revision=2
+revision=3
 build_style=cmake
 build_helper=qemu
 configure_args="-DBUILD_CONFIG=mysql_release
@@ -20,7 +20,7 @@ configure_args="-DBUILD_CONFIG=mysql_release
 hostmakedepends="bison perl flex pkg-config"
 makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  pcre2-devel libatomic-devel"
-depends="mariadb-client"
+depends="perl"
 checkdepends="perl"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
 maintainer="Justin Jagieniak <justin@jagieniak.net>"
@@ -81,6 +81,7 @@ libmariadbclient_package() {
 		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
+
 libmariadbclient-devel_package() {
 	depends="libmariadbclient>=${version}_${revision} libatomic-devel"
 	provides="libmysqlclient-devel-${version}_${revision}"
@@ -94,31 +95,13 @@ libmariadbclient-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
 mariadb-client_package() {
-	depends="perl"
+	build_style=meta
+	depends="mariadb"
 	provides="mysql-client-${version}_${revision}"
 	replaces="mysql-client>=0"
-	short_desc+=" - client binaries"
-	pkg_install() {
-		for f in innochecksum innotop myisam_ftdump mysql mysql_client_test \
-			mysql_client_test_embedded mysqldumpslow mysqlbinlog \
-			mysql_find_rows mysql_fix_extensions mysql_waitpid mysqlaccess \
-			mysqladmin mysqlanalyze mysqlbug mysqlcheck mysqldump \
-			mysqlimport mysqloptimize mysqlrepair mysqlreport mysqlshow \
-			mysqlslap mysqltest_embedded mysqlmanager mysqltest \
-			mysqlhotcopy mysql_upgrade mysql_zap; do
-			if [ -f ${DESTDIR}/usr/bin/${f} ]; then
-				vmove usr/bin/${f}
-			elif [ -f ${DESTDIR}/usr/sbin/${f} ]; then
-				vmove usr/sbin/${f}
-			fi
-			if [ -f ${DESTDIR}/usr/share/man/man1/${f}.1 ]; then
-				vmove usr/share/man/man1/${f}.1
-			elif [ -f ${DESTDIR}/usr/share/man/man8/${f}.8 ]; then
-				vmove usr/share/man/man8/${f}.8
-			fi
-		done
-	}
+	short_desc+=" - client binaries (transitional dummy package)"
 }
 
 libmysqlclient_package() {

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: mariadb: merge mariadb-client into mariadb
  2022-05-25  4:27 [PR PATCH] mariadb: merge mariadb-client into mariadb classabbyamp
  2022-05-25  4:29 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-05-25  4:36 ` classabbyamp
  2022-05-28  6:54 ` [PR PATCH] [Updated] " classabbyamp
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2022-05-25  4:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37284#issuecomment-1136716448

Comment:
cc: maintainer @Veganizer 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: merge mariadb-client into mariadb
  2022-05-25  4:27 [PR PATCH] mariadb: merge mariadb-client into mariadb classabbyamp
  2022-05-25  4:29 ` [PR PATCH] [Updated] " classabbyamp
  2022-05-25  4:36 ` classabbyamp
@ 2022-05-28  6:54 ` classabbyamp
  2022-05-31 16:52 ` sgn
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2022-05-28  6:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1489 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages fix/mariadb-client
https://github.com/void-linux/void-packages/pull/37284

mariadb: merge mariadb-client into mariadb
mariadb-client consisted almost entirely of symlinks to the main package
and manpages, and did not depend on the main package, so the symlinks
were broken if mariadb was not also installed.

fixes #37282

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37284.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/mariadb-client-37284.patch --]
[-- Type: text/x-diff, Size: 2745 bytes --]

From 3ceae18bcc8d21e5fe46e52fc9e2fcfe58418709 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 25 May 2022 00:25:46 -0400
Subject: [PATCH] mariadb: merge mariadb-client into mariadb

mariadb-client consisted almost entirely of symlinks to the main package
and manpages, and did not depend on the main package, so the symlinks
were broken if mariadb was not also installed.

fixes #37282
---
 srcpkgs/mariadb/template | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 92cc4f15772f..8d9b0c42edda 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.5.10
-revision=2
+revision=3
 build_style=cmake
 build_helper=qemu
 configure_args="-DBUILD_CONFIG=mysql_release
@@ -20,7 +20,7 @@ configure_args="-DBUILD_CONFIG=mysql_release
 hostmakedepends="bison perl flex pkg-config"
 makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  pcre2-devel libatomic-devel"
-depends="mariadb-client"
+depends="perl"
 checkdepends="perl"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
 maintainer="Justin Jagieniak <justin@jagieniak.net>"
@@ -81,6 +81,7 @@ libmariadbclient_package() {
 		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
+
 libmariadbclient-devel_package() {
 	depends="libmariadbclient>=${version}_${revision} libatomic-devel"
 	provides="libmysqlclient-devel-${version}_${revision}"
@@ -94,31 +95,13 @@ libmariadbclient-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
 mariadb-client_package() {
-	depends="perl"
+	build_style=meta
+	depends="mariadb"
 	provides="mysql-client-${version}_${revision}"
 	replaces="mysql-client>=0"
-	short_desc+=" - client binaries"
-	pkg_install() {
-		for f in innochecksum innotop myisam_ftdump mysql mysql_client_test \
-			mysql_client_test_embedded mysqldumpslow mysqlbinlog \
-			mysql_find_rows mysql_fix_extensions mysql_waitpid mysqlaccess \
-			mysqladmin mysqlanalyze mysqlbug mysqlcheck mysqldump \
-			mysqlimport mysqloptimize mysqlrepair mysqlreport mysqlshow \
-			mysqlslap mysqltest_embedded mysqlmanager mysqltest \
-			mysqlhotcopy mysql_upgrade mysql_zap; do
-			if [ -f ${DESTDIR}/usr/bin/${f} ]; then
-				vmove usr/bin/${f}
-			elif [ -f ${DESTDIR}/usr/sbin/${f} ]; then
-				vmove usr/sbin/${f}
-			fi
-			if [ -f ${DESTDIR}/usr/share/man/man1/${f}.1 ]; then
-				vmove usr/share/man/man1/${f}.1
-			elif [ -f ${DESTDIR}/usr/share/man/man8/${f}.8 ]; then
-				vmove usr/share/man/man8/${f}.8
-			fi
-		done
-	}
+	short_desc+=" - client binaries (transitional dummy package)"
 }
 
 libmysqlclient_package() {

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: mariadb: merge mariadb-client into mariadb
  2022-05-25  4:27 [PR PATCH] mariadb: merge mariadb-client into mariadb classabbyamp
                   ` (2 preceding siblings ...)
  2022-05-28  6:54 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-05-31 16:52 ` sgn
  2022-06-11 16:16 ` [PR PATCH] [Merged]: " classabbyamp
  2022-06-11 16:18 ` classabbyamp
  5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2022-05-31 16:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/37284#issuecomment-1142382050

Comment:
Looks good, I will merge when I have time babysit the builder

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Merged]: mariadb: merge mariadb-client into mariadb
  2022-05-25  4:27 [PR PATCH] mariadb: merge mariadb-client into mariadb classabbyamp
                   ` (3 preceding siblings ...)
  2022-05-31 16:52 ` sgn
@ 2022-06-11 16:16 ` classabbyamp
  2022-06-11 16:18 ` classabbyamp
  5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2022-06-11 16:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1312 bytes --]

There's a merged pull request on the void-packages repository

mariadb: merge mariadb-client into mariadb
https://github.com/void-linux/void-packages/pull/37284

Description:
mariadb-client consisted almost entirely of symlinks to the main package
and manpages, and did not depend on the main package, so the symlinks
were broken if mariadb was not also installed.

fixes #37282

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: mariadb: merge mariadb-client into mariadb
  2022-05-25  4:27 [PR PATCH] mariadb: merge mariadb-client into mariadb classabbyamp
                   ` (4 preceding siblings ...)
  2022-06-11 16:16 ` [PR PATCH] [Merged]: " classabbyamp
@ 2022-06-11 16:18 ` classabbyamp
  5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2022-06-11 16:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37284#issuecomment-1152958777

Comment:
> babysit the builder

I've got some time to watch it, so I merged it.

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-06-11 16:18 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-25  4:27 [PR PATCH] mariadb: merge mariadb-client into mariadb classabbyamp
2022-05-25  4:29 ` [PR PATCH] [Updated] " classabbyamp
2022-05-25  4:36 ` classabbyamp
2022-05-28  6:54 ` [PR PATCH] [Updated] " classabbyamp
2022-05-31 16:52 ` sgn
2022-06-11 16:16 ` [PR PATCH] [Merged]: " classabbyamp
2022-06-11 16:18 ` 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).