Skip to content

Commit 0698840

Browse files
committed
curl: replace wcurl
I hope the multiple replaces work as expected
1 parent fd0d384 commit 0698840

2 files changed

Lines changed: 15 additions & 33 deletions

File tree

mingw-w64-curl/PKGBUILD

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
77
"${MINGW_PACKAGE_PREFIX}-${_realname}-gnutls" \
88
"${MINGW_PACKAGE_PREFIX}-${_realname}-winssl"))
99
pkgver=8.14.0
10-
pkgrel=1
10+
pkgrel=2
1111
pkgdesc="Command line tool and library for transferring data with URLs (mingw-w64)"
1212
arch=('any')
1313
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -198,26 +198,35 @@ package_curl() {
198198
"${_cert_depends[@]}"
199199
"${_openssl_depends[@]}")
200200
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-winssl"
201-
"${MINGW_PACKAGE_PREFIX}-${_realname}-gnutls")
201+
"${MINGW_PACKAGE_PREFIX}-${_realname}-gnutls"
202+
"${MINGW_PACKAGE_PREFIX}-wcurl")
203+
provides=("${MINGW_PACKAGE_PREFIX}-wcurl")
204+
replaces=("${MINGW_PACKAGE_PREFIX}-wcurl")
202205
do_package
203206
}
204207

205208
package_curl-winssl() {
206209
depends=("${depends[@]}"
207210
"${MINGW_PACKAGE_PREFIX}-libssh2-wincng")
208-
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
211+
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}"
212+
"${MINGW_PACKAGE_PREFIX}-wcurl")
209213
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}"
210-
"${MINGW_PACKAGE_PREFIX}-${_realname}-gnutls")
214+
"${MINGW_PACKAGE_PREFIX}-${_realname}-gnutls"
215+
"${MINGW_PACKAGE_PREFIX}-wcurl")
216+
replaces=("${MINGW_PACKAGE_PREFIX}-wcurl")
211217
do_package -winssl
212218
}
213219

214220
package_curl-gnutls() {
215-
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
221+
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}"
222+
"${MINGW_PACKAGE_PREFIX}-wcurl")
216223
depends=("${depends[@]}"
217224
"${_cert_depends[@]}"
218225
"${_gnutls_depends[@]}")
219226
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}"
220-
"${MINGW_PACKAGE_PREFIX}-${_realname}-winssl")
227+
"${MINGW_PACKAGE_PREFIX}-${_realname}-winssl"
228+
"${MINGW_PACKAGE_PREFIX}-wcurl")
229+
replaces=("${MINGW_PACKAGE_PREFIX}-wcurl")
221230
do_package -gnutls
222231
}
223232

mingw-w64-wcurl/PKGBUILD

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)