Move msys2-runtime-3.6 to msys2-runtime

and make it replace msys2-runtime-3.6
This commit is contained in:
Christoph Reiter 2025-04-10 09:20:30 +02:00
parent e7673212e1
commit a3fde923fc
43 changed files with 10 additions and 12 deletions

View File

@ -1,10 +1,10 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com> # Maintainer: Alexey Pavlov <alexpux@gmail.com>
# Contributor: Ray Donnelly <mingw.android@gmail.com> # Contributor: Ray Donnelly <mingw.android@gmail.com>
pkgbase=msys2-runtime-3.6 pkgbase=msys2-runtime
pkgname=('msys2-runtime-3.6' 'msys2-runtime-3.6-devel') pkgname=('msys2-runtime' 'msys2-runtime-devel')
pkgver=3.6.1 pkgver=3.6.1
pkgrel=1 pkgrel=2
pkgdesc="Cygwin POSIX emulation engine" pkgdesc="Cygwin POSIX emulation engine"
arch=('x86_64') arch=('x86_64')
url="https://www.cygwin.com/" url="https://www.cygwin.com/"
@ -229,11 +229,10 @@ build() {
mv -f usr/bin/msys-2.0.dll.new usr/bin/msys-2.0.dll mv -f usr/bin/msys-2.0.dll.new usr/bin/msys-2.0.dll
} }
package_msys2-runtime-3.6() { package_msys2-runtime() {
pkgdesc="Posix emulation engine for Windows" pkgdesc="Posix emulation engine for Windows"
provides=("msys2-runtime=${pkgver}") conflicts=('catgets' 'libcatgets' 'msys2-runtime-3.6')
conflicts=('catgets' 'libcatgets' 'msys2-runtime') replaces=('catgets' 'libcatgets' 'msys2-runtime-3.6')
replaces=('catgets' 'libcatgets')
mkdir -p "${pkgdir}"/usr mkdir -p "${pkgdir}"/usr
cp -rf "${srcdir}"/dest/usr/bin "${pkgdir}"/usr/ cp -rf "${srcdir}"/dest/usr/bin "${pkgdir}"/usr/
@ -246,12 +245,11 @@ package_msys2-runtime-3.6() {
cp -rf "${srcdir}"/dest/usr/share "${pkgdir}"/usr/ cp -rf "${srcdir}"/dest/usr/share "${pkgdir}"/usr/
} }
package_msys2-runtime-3.6-devel() { package_msys2-runtime-devel() {
pkgdesc="MSYS2 headers and libraries" pkgdesc="MSYS2 headers and libraries"
depends=("msys2-runtime-3.6=${pkgver}") depends=("msys2-runtime=${pkgver}")
provides=("msys2-runtime-devel=${pkgver}") conflicts=('libcatgets-devel' 'msys2-runtime-3.6-devel')
conflicts=('libcatgets-devel' 'msys2-runtime-devel') replaces=('libcatgets-devel' 'msys2-runtime-3.6-devel')
replaces=('libcatgets-devel')
# strip breaks the split debug info. msys2/msys2-pacman#52 # strip breaks the split debug info. msys2/msys2-pacman#52
options=('!strip') options=('!strip')