summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD14
-rw-r--r--fix-ocaml-4.08.patch12
3 files changed, 5 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a429088fa236..14f6d859ab0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Oct 20 13:16:44 UTC 2019
+# Mon Oct 21 12:49:09 UTC 2019
pkgbase = ocaml-batteries-git
pkgdesc = Batteries Included for OCaml
- pkgver = 20191001
+ pkgver = 20191021
pkgrel = 1
url = http://github.com/ocaml-batteries-team/batteries-included
install = ocaml-batteries-git.install
@@ -16,9 +16,7 @@ pkgbase = ocaml-batteries-git
provides = ocaml-batteries
conflicts = ocaml-batteries
source = ocaml-batteries-git::git://github.com/ocaml-batteries-team/batteries-included.git
- source = fix-ocaml-4.08.patch
md5sums = SKIP
- md5sums = 04ed53e7e68034f975fc21c00d5b6572
pkgname = ocaml-batteries-git
diff --git a/PKGBUILD b/PKGBUILD
index b7a4d769f734..b37b2f8ffed7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Serge Zirukin <ftrvxmtrx@gmail.com>
pkgname=ocaml-batteries-git
-pkgver=20191001
+pkgver=20191021
pkgrel=1
pkgdesc="Batteries Included for OCaml"
arch=('i686' 'x86_64')
@@ -13,10 +13,8 @@ makedepends=('ocamlbuild')
optdepends=('ocaml-bisect')
provides=('ocaml-batteries')
conflicts=('ocaml-batteries')
-source=("${pkgname}::git://github.com/ocaml-batteries-team/batteries-included.git"
- fix-ocaml-4.08.patch)
-md5sums=('SKIP'
- '04ed53e7e68034f975fc21c00d5b6572')
+source=("${pkgname}::git://github.com/ocaml-batteries-team/batteries-included.git")
+md5sums=('SKIP')
install=$pkgname.install
pkgver () {
@@ -24,12 +22,6 @@ pkgver () {
git log -1 --pretty=format:%cd --date=short | sed 's/-//g'
}
-prepare() {
- cd "$pkgname"
-
- patch -Np1 -i ../fix-ocaml-4.08.patch
-}
-
build () {
cd "$pkgname"
diff --git a/fix-ocaml-4.08.patch b/fix-ocaml-4.08.patch
deleted file mode 100644
index d740af4aa116..000000000000
--- a/fix-ocaml-4.08.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-
---- ocaml-batteries-git/src/batteries.mlv 2019-10-20 14:54:12.758195004 +0200
-+++ ocaml-batteries-git/src/batteries.mlv 2019-10-20 14:54:28.091527675 +0200
-@@ -34,7 +34,7 @@
- module Random = Random
- module Scanf = Scanf
- module Set = Set
-- module Sort = Sort
-+##V<4.8## module Sort = Sort
- module Stack = Stack
- module StdLabels = StdLabels
- module Stream = Stream