summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomislav Ivek2020-02-14 18:04:38 +0100
committerTomislav Ivek2020-02-14 18:04:38 +0100
commit4a14d10499dc6436ce6d36bd512fe7e4a66407f1 (patch)
tree7fd8805a552cc2bb35ed8fa61a8382e44ca1056f
parent299c4c4d79ba321b658a3f13f44b1197c97f810c (diff)
downloadaur-4a14d10499dc6436ce6d36bd512fe7e4a66407f1.tar.gz
update deps
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--arch-reqs.patch15
3 files changed, 12 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eee1876c150..574cda4d2d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = conan-git
pkgdesc = A distributed, open source, C/C++ package manager.
- pkgver = 1.21.0.r128.ge7ed0f58
+ pkgver = 1.22.0.r24.g4ea97afc
pkgrel = 1
url = https://conan.io
arch = any
@@ -29,7 +29,7 @@ pkgbase = conan-git
source = conan-git::git+https://github.com/conan-io/conan.git
source = arch-reqs.patch
md5sums = SKIP
- md5sums = 47aa1de692d5aa3be8767a42e5cff295
+ md5sums = 9ed61a4a87e1ace586c04860218ff341
pkgname = conan-git
diff --git a/PKGBUILD b/PKGBUILD
index 278da3c3506..4230fbbb2d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Tomislav Ivek <tomislav.ivek@gmail.com>
pkgname=conan-git
-pkgver=1.21.0.r128.ge7ed0f58
+pkgver=1.22.0.r24.g4ea97afc
pkgrel=1
pkgdesc="A distributed, open source, C/C++ package manager."
arch=('any')
@@ -30,7 +30,7 @@ provides=('conan')
conflicts=('conan')
source=("conan-git::git+https://github.com/conan-io/conan.git" "arch-reqs.patch")
md5sums=('SKIP'
- '47aa1de692d5aa3be8767a42e5cff295')
+ '9ed61a4a87e1ace586c04860218ff341')
pkgver() {
diff --git a/arch-reqs.patch b/arch-reqs.patch
index 29fb719b90b..cb1b9f07b28 100644
--- a/arch-reqs.patch
+++ b/arch-reqs.patch
@@ -1,6 +1,7 @@
-diff -aur conan-1.21.0-pristine/conans/requirements_server.txt conan-1.21.0-new/conans/requirements_server.txt
---- conan-1.21.0-pristine/conans/requirements_server.txt 2019-12-11 11:55:23.835787195 +0100
-+++ conan-1.21.0-new/conans/requirements_server.txt 2019-12-11 11:56:30.335915397 +0100
+Only in conan-1.22.1-new: arch-reqs.patch
+diff -aur conan-1.22.1-pristine/conans/requirements_server.txt conan-1.22.1-new/conans/requirements_server.txt
+--- conan-1.22.1-pristine/conans/requirements_server.txt 2020-02-12 10:47:53.046679121 +0100
++++ conan-1.22.1-new/conans/requirements_server.txt 2020-02-12 10:50:09.146941954 +0100
@@ -1,3 +1,3 @@
# Server
-bottle>=0.12.8, < 0.13
@@ -8,9 +9,9 @@ diff -aur conan-1.21.0-pristine/conans/requirements_server.txt conan-1.21.0-new/
\ No newline at end of file
+bottle>=0.12.8
+pluginbase>=0.5
-diff -aur conan-1.21.0-pristine/conans/requirements.txt conan-1.21.0-new/conans/requirements.txt
---- conan-1.21.0-pristine/conans/requirements.txt 2019-12-11 11:55:23.835787195 +0100
-+++ conan-1.21.0-new/conans/requirements.txt 2019-12-11 11:56:20.445896438 +0100
+diff -aur conan-1.22.1-pristine/conans/requirements.txt conan-1.22.1-new/conans/requirements.txt
+--- conan-1.22.1-pristine/conans/requirements.txt 2020-02-12 10:47:53.046679121 +0100
++++ conan-1.22.1-new/conans/requirements.txt 2020-02-12 10:49:58.676921820 +0100
@@ -1,16 +1,16 @@
-PyJWT>=1.4.0, <2.0.0
-requests>=2.8.1, <3.0.0
@@ -25,7 +26,7 @@ diff -aur conan-1.21.0-pristine/conans/requirements.txt conan-1.21.0-new/conans/
+PyYAML>=3.11
+patch-ng>=1.17.2
fasteners>=0.14.1
--six>=1.10.0,<1.13.0
+-six>=1.10.0,<=1.14.0
-node-semver==0.6.1
-distro>=1.0.2, <1.2.0
-future>=0.16.0, <0.19.0