Update ocaml-visitors to 20210316

3 files changed, 11 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad2d2e219807..b8ec5f47186e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ocaml-visitors
 	pkgdesc = An OCaml syntax extension for generating visitor classes
-	pkgver = 20210127
-	pkgrel = 2
+	pkgver = 20210316
+	pkgrel = 1
 	url = https://gitlab.inria.fr/fpottier/visitors
 	arch = x86_64
 	arch = i686
@@ -11,14 +11,12 @@ pkgbase = ocaml-visitors
 	arch = aarch64
 	license = LGPL2.1
 	makedepends = dune>=2.0.0
-	depends = ocaml>=4.07.0
+	depends = ocaml>=4.05.0
 	depends = ocaml-ppx_deriving>=5.0
-	depends = ocaml-ppxlib>=0.9.0
+	depends = ocaml-ppxlib>=0.22.0
 	depends = ocaml-result
 	options = !strip
-	source = ocaml-visitors-20210127-2.tar.gz::https://gitlab.inria.fr/fpottier/visitors/-/archive/20210127/visitors-20210127.tar.gz
-	source = ppxlib.diff
-	sha256sums = b3057bf30fe4c7767643a8511a4e15f956114bde4001e58a720540ebc467f39f
-	sha256sums = b3b55482a1840a37367fb201469992eba226984c02a1b2df7da99b1d969e25ef
+	source = ocaml-visitors-20210316-1.tar.gz::https://gitlab.inria.fr/fpottier/visitors/-/archive/20210316/visitors-20210316.tar.gz
+	sha256sums = da33232dadd9601bfdbdf7b640f7a06bd2b03abcb24383e8cedb32897788a4a6
 
 pkgname = ocaml-visitors
diff --git a/PKGBUILD b/PKGBUILD
index 8a803278db44..269ccb0df277 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,20 @@
 # Contributor: malet <malet@invalid>
 _projectname='visitors'
 pkgname="ocaml-$_projectname"
-pkgver='20210127'
-pkgrel='2'
+pkgver='20210316'
+pkgrel='1'
 pkgdesc='An OCaml syntax extension for generating visitor classes'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://gitlab.inria.fr/fpottier/$_projectname"
 license=('LGPL2.1')
-depends=('ocaml>=4.07.0' 'ocaml-ppx_deriving>=5.0' 'ocaml-ppxlib>=0.9.0' 'ocaml-result')
+depends=('ocaml>=4.05.0' 'ocaml-ppx_deriving>=5.0' 'ocaml-ppxlib>=0.22.0' 'ocaml-result')
 makedepends=('dune>=2.0.0')
 options=('!strip')
-source=(
-	"$pkgname-$pkgver-$pkgrel.tar.gz::$url/-/archive/$pkgver/$_projectname-$pkgver.tar.gz"
-	"ppxlib.diff"
-)
-sha256sums=('b3057bf30fe4c7767643a8511a4e15f956114bde4001e58a720540ebc467f39f'
-            'b3b55482a1840a37367fb201469992eba226984c02a1b2df7da99b1d969e25ef')
+source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/-/archive/$pkgver/$_projectname-$pkgver.tar.gz")
+sha256sums=('da33232dadd9601bfdbdf7b640f7a06bd2b03abcb24383e8cedb32897788a4a6')
 
 _sourcedirectory="$_projectname-$pkgver"
 
-prepare() {
-	cd "$srcdir/$_sourcedirectory/"
-	patch --forward -p1 < '../ppxlib.diff'
-}
-
 build() {
 	cd "$srcdir/$_sourcedirectory/"
 	dune build --release --verbose
diff --git a/ppxlib.diff b/ppxlib.diff
deleted file mode 100644
index a36e18487485..000000000000
--- a/ppxlib.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/Visitors.ml b/src/Visitors.ml
-index 7139ed7..f28925f 100644
---- a/src/Visitors.ml
-+++ b/src/Visitors.ml
-@@ -1258,7 +1258,7 @@ let type_decls (decls : type_declaration list) : structure =
-          also parameterized over the type variable ['self], with a constraint
-          that this is the type of [self]. This trick allows us to omit the types
-          of the virtual methods, even if these types include type variables. *)
--    dump X.concrete X.ancestors [ ty_self, Invariant ] pself X.name ::
-+    dump X.concrete X.ancestors [ ty_self, (NoVariance, NoInjectivity) ] pself X.name ::
-     floating "VISITORS.END" [] ::
-     []
-   )]
-diff --git a/src/VisitorsAnalysis.ml b/src/VisitorsAnalysis.ml
-index 65b47e4..fa910f0 100644
---- a/src/VisitorsAnalysis.ml
-+++ b/src/VisitorsAnalysis.ml
-@@ -191,7 +191,7 @@ let fix =
-    [ptype_params] of a type definition, and returns the underlying type
-    variable. *)
- 
--let type_param_to_tyvar ((ty, _) : core_type * variance) : tyvar =
-+let type_param_to_tyvar ((ty, _) : core_type * (variance * injectivity)) : tyvar =
-   match ty.ptyp_desc with
-   | Ptyp_var tv ->
-       tv
-diff --git a/src/VisitorsGeneration.ml b/src/VisitorsGeneration.ml
-index 53a6b1b..a7f28ec 100644
---- a/src/VisitorsGeneration.ml
-+++ b/src/VisitorsGeneration.ml
-@@ -363,7 +363,7 @@ let with_warnings (w : string) (items : structure_item list) : structure_item =
- 
- let class1
-   (concrete : bool)
--  (params : (core_type * variance) list)
-+  (params : (core_type * (variance * injectivity)) list)
-   (name : classe)
-   (self : pattern)
-   (fields : class_field list)
-@@ -497,7 +497,7 @@ module ClassFieldStore () : sig
-   val dump:
-     bool ->
-     Longident.t list ->
--    (core_type * variance) list ->
-+    (core_type * (variance * injectivity)) list ->
-     pattern ->
-     classe ->
-     structure_item