[lilac] updated to 1.6.2-3

3 files changed, 39 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4da94e2b913e..77a25d1b2315 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = r-fs
 	pkgdesc = Cross-Platform File System Operations Based on 'libuv'
 	pkgver = 1.6.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://cran.r-project.org/package=fs
 	arch = x86_64
 	license = MIT
@@ -18,7 +18,10 @@ pkgbase = r-fs
 	optdepends = r-vctrs
 	optdepends = r-withr
 	source = https://cran.r-project.org/src/contrib/fs_1.6.2.tar.gz
+	source = system-libuv.patch
 	md5sums = 3827672b1f4747ce6bd3a224a74a9f61
+	md5sums = e9cd06be1a987fd1cdab9b577736bfe0
 	sha256sums = 548b7c0ed5ab26dc4fbd88707ae12987bcaef834dbc6de4e17d453846dc436b2
+	sha256sums = d03eb4684d9e62ceb77292a10cb6b3e638140f9431b0625a8f8196e0dce14752
 
 pkgname = r-fs
diff --git a/PKGBUILD b/PKGBUILD
index f109748aa7c9..d5dbe0a52da9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 _pkgname=fs
 _pkgver=1.6.2
 pkgname=r-${_pkgname,,}
-pkgver=${_pkgver//[:-]/.}
-pkgrel=2
+pkgver=${_pkgver//-/.}
+pkgrel=3
 pkgdesc="Cross-Platform File System Operations Based on 'libuv'"
 arch=(x86_64)
 url="https://cran.r-project.org/package=${_pkgname}"
@@ -28,16 +28,16 @@ optdepends=(
   r-vctrs
   r-withr
 )
-source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-md5sums=('3827672b1f4747ce6bd3a224a74a9f61')
-sha256sums=('548b7c0ed5ab26dc4fbd88707ae12987bcaef834dbc6de4e17d453846dc436b2')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
+        "system-libuv.patch")
+md5sums=('3827672b1f4747ce6bd3a224a74a9f61'
+         'e9cd06be1a987fd1cdab9b577736bfe0')
+sha256sums=('548b7c0ed5ab26dc4fbd88707ae12987bcaef834dbc6de4e17d453846dc436b2'
+            'd03eb4684d9e62ceb77292a10cb6b3e638140f9431b0625a8f8196e0dce14752')
 
 prepare() {
   # build against system libuv
-  sed -e 's#PKG_LIBS = ./$(LIBUV)/.libs/libuv.a#PKG_LIBS = -luv#' \
-      -e 's#-I./$(LIBUV)/include ##' \
-      -e '/$(SHLIB):/d' \
-      -i "$_pkgname/src/Makevars"
+  patch -Np1 -i system-libuv.patch
 }
 
 build() {
diff --git a/system-libuv.patch b/system-libuv.patch
new file mode 100644
index 000000000000..43744ac25b16
--- /dev/null
+++ b/system-libuv.patch
@@ -0,0 +1,26 @@
+diff --git a/fs/src/Makevars b/fs/src/Makevars
+index dd892c7..edd4374 100644
+--- a/fs/src/Makevars
++++ b/fs/src/Makevars
+@@ -2,7 +2,7 @@ UNAME := $(shell uname)
+ 
+ LIBUV := libuv-1.44.2
+ 
+-PKG_LIBS = ./$(LIBUV)/.libs/libuv.a -pthread
++PKG_LIBS = -luv -pthread
+ 
+ SOURCES = $(wildcard *.cc unix/*.cc)
+ OBJECTS = $(SOURCES:.cc=.o)
+@@ -21,11 +21,10 @@ ifneq ($(filter $(UNAME), Linux AIX OS400),)
+ OBJECTS +=  bsd/setmode.o bsd/strmode.o bsd/reallocarray.o
+ endif
+ 
+-PKG_CPPFLAGS = -I./$(LIBUV)/include -I. -pthread
++PKG_CPPFLAGS = -I. -pthread
+ 
+ all: $(SHLIB)
+ 
+-$(SHLIB): $(LIBUV)/.libs/libuv.a
+ 
+ $(LIBUV)/Makefile:
+ 	(cd $(LIBUV) \