From ddb985a4f7966d320f48ea4678e7bff17712300f Mon Sep 17 00:00:00 2001
From: Boris Shor <bshor@users.noreply.github.com>
Date: Tue, 23 Jun 2026 13:28:20 -0500
Subject: [PATCH] r-zip: update to 3.0.0, drop obsolete libr-zip.patch

---
 BioArchLinux/r-zip/PKGBUILD       | 40 ++++++++++++-------------------
 BioArchLinux/r-zip/libr-zip.patch | 33 -------------------------
 BioArchLinux/r-zip/lilac.yaml     |  2 ++
 3 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 BioArchLinux/r-zip/libr-zip.patch

diff --git a/BioArchLinux/r-zip/PKGBUILD b/BioArchLinux/r-zip/PKGBUILD
index bdde9abb76..d57ff82e31 100644
--- a/BioArchLinux/r-zip/PKGBUILD
+++ b/BioArchLinux/r-zip/PKGBUILD
@@ -4,10 +4,10 @@
 # Contributor: Alex Branham <branham@utexas.edu>
 
 _pkgname=zip
-_pkgver=2.3.3
+_pkgver=3.0.0
 pkgname=r-${_pkgname,,}
 pkgver=${_pkgver//-/.}
-pkgrel=2
+pkgrel=1
 pkgdesc="Cross-Platform 'zip' Compression"
 arch=(x86_64)
 url="https://cran.r-project.org/package=$_pkgname"
@@ -19,40 +19,33 @@ makedepends=(
   r-cli
 )
 checkdepends=(
+  r-curl
   r-testthat
+  r-webfakes
 )
 optdepends=(
-  r-covr
+  r-callr
+  r-cli
+  r-curl
+  r-pillar
   r-processx
   r-r6
   r-testthat
+  r-webfakes
   r-withr
-  r-pillar
 )
-source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
-        "libr-zip.patch")
-md5sums=('81352ca51860d1dbd0ce801d0d697bb0'
-         '54567d238fb1409ea2a6fcd82034b15b')
-b2sums=('69ba4e57c21e6bff29b2b33f46af3cc31fc7f9aecec4f985c3b9feca0853e976dcd03deafb3a4eddf220bbfb51f5aa002b4dd1a42308d340b0d49ee81f1ef2b6'
-        '9f00d0cae1521ffc8831e0c2261e8a88f9a255d01fedb5d0f0f2f6e82c6c30834d0c21130e51d131c9414c058f35d640ac50affdb312a7c3255e40c85b85b181')
-
-prepare() {
-  # fix LDFLAGS, put common functionality into libr-zip.so
-  patch -Np1 -i libr-zip.patch
-  # rename miniz symbols with r_ prefix, see https://github.com/r-lib/zip/issues/98
-  cd "$_pkgname/src"
-  sed -i 's/mz_/r_mz_/g' *.c *.h
-}
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('8a975bcb98d7efc62f6d5b5510873d18')
+b2sums=('094b746dcba04d73493888d3771ed5f30a2aeedd63dd7b35e9f0a7fc146d4218d687d18a25ecd0e9963bce1e9305850aeed37fb921dd88a1260ed3980e478657')
 
 build() {
-  mkdir build
-  # set LD_LIBRARY_PATH for libr-zip.so
-  LD_LIBRARY_PATH="$srcdir/$_pkgname/src" R CMD INSTALL -l build "$_pkgname"
+  mkdir -p build
+  R CMD INSTALL -l build "$_pkgname"
 }
 
 check() {
   cd "$_pkgname/tests"
-  LD_LIBRARY_PATH="$srcdir/$_pkgname/src" R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 package() {
@@ -61,7 +54,4 @@ package() {
 
   install -d "$pkgdir/usr/share/licenses/$pkgname"
   ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
-
-  # move libr-zip.so to /usr/lib
-  mv "$pkgdir/usr/lib/R/library/$_pkgname/libs/libr-zip.so" "$pkgdir/usr/lib"
 }
diff --git a/BioArchLinux/r-zip/libr-zip.patch b/BioArchLinux/r-zip/libr-zip.patch
deleted file mode 100644
index a8348a71dd..0000000000
--- a/BioArchLinux/r-zip/libr-zip.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/zip/src/Makevars b/zip/src/Makevars
-index 9bf6e3b..f622216 100644
---- a/zip/src/Makevars
-+++ b/zip/src/Makevars
-@@ -1,17 +1,20 @@
--
--PKG_CFLAGS = $(C_VISIBILITY)
--
--OBJECTS = init.o miniz.o rzip.o zip.o unixutils.o
-+OBJECTS = init.o rzip.o
-+PKG_LIBS = -L. -lr-zip
- 
- .PHONY: all clean
- 
- all: tools/cmdzip tools/cmdunzip $(SHLIB)
- 
--tools/cmdzip: miniz.c zip.c unixutils.c tools/cmdzip.c
--	$(CC) $(CFLAGS) miniz.c zip.c unixutils.c tools/cmdzip.c -o tools/cmdzip
-+tools/cmdzip: tools/cmdzip.o libr-zip.so
-+	$(CC) $(LDFLAGS) -o $@ $^
- 
--tools/cmdunzip: miniz.c zip.c unixutils.c tools/cmdunzip.c
--	$(CC) $(CFLAGS) miniz.c zip.c unixutils.c tools/cmdunzip.c -o tools/cmdunzip
-+tools/cmdunzip: tools/cmdunzip.o libr-zip.so
-+	$(CC) $(LDFLAGS) -o $@ $^
-+
-+$(SHLIB): libr-zip.so
-+
-+libr-zip.so: miniz.o zip.o unixutils.o
-+	$(CC) -shared $(LDFLAGS) -o $@ $^
- 
- clean:
- 	rm -rf $(SHLIB) $(OBJECTS) \
diff --git a/BioArchLinux/r-zip/lilac.yaml b/BioArchLinux/r-zip/lilac.yaml
index 5e3baf2814..ecc9acf3c4 100644
--- a/BioArchLinux/r-zip/lilac.yaml
+++ b/BioArchLinux/r-zip/lilac.yaml
@@ -4,7 +4,9 @@ maintainers:
   email: pekkarr@protonmail.com
 repo_makedepends:
 - r-cli
+- r-curl
 - r-testthat
+- r-webfakes
 update_on:
 - source: rpkgs
   pkgname: zip