fix

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4902651789a..98db376e08bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,6 +13,7 @@ pkgbase = nginx-http3
 	makedepends = perl
 	makedepends = ninja
 	makedepends = rust
+	makedepends = patch
 	provides = nginx
 	conflicts = nginx
 	conflicts = nginx-unstable
@@ -21,6 +22,7 @@ pkgbase = nginx-http3
 	conflicts = nginx-custom-dev
 	conflicts = nginx-full
 	conflicts = nginx-libressl
+    conflicts = nginx-mainline-boringssl
 	source = https://nginx.org/download/nginx-1.16.1.tar.gz
 	source = git+https://github.com/cloudflare/quiche.git
 	source = service
diff --git a/PKGBUILD b/PKGBUILD
index c3f03ecc4765..a9244fcb11c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,10 @@ _min=1
 pkgver=$_rel.$_maj.$_min
 pkgrel=1
 provides=('nginx')
-conflicts=('nginx' 'nginx-unstable' 'nginx-svn' 'nginx-devel' 'nginx-custom-dev' 'nginx-full' 'nginx-libressl') 
+conflicts=('nginx' 'nginx-unstable' 'nginx-svn' 'nginx-devel' 'nginx-custom-dev' 'nginx-full' 'nginx-libressl' 'nginx-mainline-boringssl') 
 pkgdesc="Nginx with Cloudflare's http3 path on the top of quiche"
 arch=('any')
-makedepends=('git' 'cmake' 'make' 'gcc' 'go' 'perl' 'ninja' 'rust')
+makedepends=('git' 'cmake' 'make' 'gcc' 'go' 'perl' 'ninja' 'rust' 'patch')
 depends=()
 url="https://github.com/cloudflare/quiche/tree/master/extras/nginx"
 license=('GPL3')