From d29b2a3ac097472017e0fcd1b5600cef4199542a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= Date: Fri, 14 Apr 2023 13:22:42 +0200 Subject: [PATCH] fixup! msys2-runtime: add a msys2-runtime-3.3 package for continued x86 compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adjust the PKGBUILD to the new package name and mark it as conflicting with the main `msys2-runtime` package. This commit should be squashed before merging, but is provided separately from the previous commit copying all the files to help with reviewing. Signed-off-by: Matthias Aßhauer --- msys2-runtime-3.3/PKGBUILD | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/msys2-runtime-3.3/PKGBUILD b/msys2-runtime-3.3/PKGBUILD index abf1696cbbcd..2ea19029d095 100644 --- a/msys2-runtime-3.3/PKGBUILD +++ b/msys2-runtime-3.3/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Alexey Pavlov # Contributor: Ray Donnelly -pkgbase=msys2-runtime -pkgname=('msys2-runtime' 'msys2-runtime-devel') +pkgbase=msys2-runtime-3.3 +pkgname=('msys2-runtime-3.3' 'msys2-runtime-3.3-devel') pkgver=3.3.6 -pkgrel=4 +pkgrel=1 pkgdesc="Cygwin POSIX emulation engine" arch=('i686' 'x86_64') url="https://www.cygwin.com/" @@ -289,11 +289,12 @@ build() { rm -rf "${srcdir}"/dest/etc } -package_msys2-runtime() { +package_msys2-runtime-3.3() { pkgdesc="Posix emulation engine for Windows" groups=('base') options=('!strip') - conflicts=('catgets' 'libcatgets') + provides=("msys2-runtime=${pkgver}") + conflicts=('catgets' 'libcatgets' 'msys2-runtime') replaces=('catgets' 'libcatgets') #install=msys2-runtime.install @@ -308,12 +309,13 @@ package_msys2-runtime() { cp -rf "${srcdir}"/dest/usr/share "${pkgdir}"/usr/ } -package_msys2-runtime-devel() { +package_msys2-runtime-3.3-devel() { pkgdesc="MSYS2 headers and libraries" groups=('msys2-devel') depends=("msys2-runtime=${pkgver}") + provides=("msys2-runtime-devel=${pkgver}") options=('staticlibs' '!strip') - conflicts=('libcatgets-devel') + conflicts=('libcatgets-devel' 'msys2-runtime-devel') replaces=('libcatgets-devel') mkdir -p "${pkgdir}"/usr/bin