From f4809ecc2b3ee1ee6c25952c1ae3c6356ae93395 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Fri, 22 Sep 2023 15:40:33 +0200
Subject: [PATCH] choosenim: update to 0.8.4

---
 .../choosenim/patches/system-libarchive.patch | 103 ------------------
 srcpkgs/choosenim/template                    |   6 +-
 2 files changed, 3 insertions(+), 106 deletions(-)
 delete mode 100644 srcpkgs/choosenim/patches/system-libarchive.patch

diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
deleted file mode 100644
index a4cab336e99d4..0000000000000
--- a/srcpkgs/choosenim/patches/system-libarchive.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git choosenim.nimble choosenim.nimble
-index 7ba9b36..dc47faa 100644
---- a/choosenim.nimble
-+++ b/choosenim.nimble
-@@ -14,7 +14,7 @@ skipExt = @["nim"]
- # Dependencies
- 
- requires "nim >= 1.2.6", "nimble#8f7af86"
--requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
-+requires "nimterop >= 0.6.12"
- #requires "libcurl >= 1.0.0" - OSX now uses httpclient
- requires "analytics >= 0.2.0"
- requires "osinfo >= 0.3.0"
-diff --git nimarchive/nimarchive/archive.nim nimarchive/nimarchive/archive.nim
-index 1d45140..d5361e0 100644
---- a/nimarchive/nimarchive/archive.nim
-+++ b/nimarchive/nimarchive/archive.nim
-@@ -2,28 +2,6 @@ import os, strutils
- 
- import nimterop/[build, cimport]
- 
--const
--  baseDir = getProjectCacheDir("nimarchive" / "libarchive")
--
--  defs = """
--    archiveStatic
--    archiveJBB
--    archiveSetVer=3.4.3
--
--    iconvStatic
--    iconvStd
--    iconvJBB
--    iconvSetVer=1.16.0
--  """
--
--setDefines(defs.splitLines())
--
--getHeader(
--  header = "archive.h",
--  outdir = baseDir,
--  jbburi = "LibArchive",
--  jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=LibArchive-v$1/ skip=libiconv"
--)
- 
- import iconv
- 
-@@ -52,9 +30,7 @@ static:
-   cSkipSymbol(@["archive_read_open_file", "archive_write_open_file"])
- 
- let
--  archiveEntryPath {.compileTime.} = archivePath[0 .. ^3] & "_entry.h"
-+  archivePath {.compileTime.} = "archive.h"
-+  archiveEntryPath {.compileTime.} = "archive_entry.h"
- 
--when archiveStatic:
--  cImport(@[archivePath, archiveEntryPath], recurse = true)
--else:
--  cImport(@[archivePath, archiveEntryPath], recurse = true, dynlib = archiveLPath)
-+cImport(@[archivePath, archiveEntryPath], recurse = false)
-diff --git nimarchive/nimarchive/iconv.nim nimarchive/nimarchive/iconv.nim
-index d983398..4f61a5b 100644
---- a/nimarchive/nimarchive/iconv.nim
-+++ b/nimarchive/nimarchive/iconv.nim
-@@ -2,15 +2,3 @@ import os, strutils
- 
- import nimterop/build
- 
--const
--  baseDir = getProjectCacheDir("nimarchive" / "iconv")
--
--getHeader(
--  header = "iconv.h",
--  dlurl = "https://ftp.gnu.org/gnu/libiconv/libiconv-$1.tar.gz",
--  conanuri = "libiconv",
--  jbburi = "Libiconv",
--  jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=Libiconv-v$1/",
--  outdir = baseDir,
--  conFlags = "--enable-static=yes --with-pic=yes"
--)
-diff --git src/choosenimpkg/ssl.nim src/choosenimpkg/ssl.nim
-index f20b246..7576066 100644
---- a/src/choosenimpkg/ssl.nim
-+++ b/src/choosenimpkg/ssl.nim
-@@ -2,19 +2,3 @@ import strutils
- 
- import nimterop/[build, cimport]
- 
--# Download openssl from JuliaBinaryWrappers
--setDefines(@[
--  "cryptoJBB", "cryptoStatic"
--])
--
--getHeader(
--  "crypto.h",
--  jbburi = "openssl",
--  outdir = getProjectCacheDir("nimopenssl")
--)
--
--const
--  sslLPath = cryptoLPath.replace("crypto", "ssl")
--
--# Link static binaries
--{.passL: sslLPath & " " & cryptoLPath.}
diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index 064dbbbdf4d52..47225018d1c4a 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,7 +1,7 @@
 # Template file for 'choosenim'
 pkgname=choosenim
-version=0.7.4
-revision=3
+version=0.8.4
+revision=1
 create_wrksrc=yes
 hostmakedepends="git nim openssl-devel pkg-config"
 makedepends="openssl-devel zlib-devel libarchive-devel"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/dom96/choosenim"
 distfiles="${homepage}/archive/v${version}.tar.gz>choosenim-${version}.tar.gz
  https://github.com/genotrance/nimarchive/archive/v0.5.4.tar.gz>nimarchive-0.5.4.tar.gz"
-checksum="0e78a59cfb3cf7926f8dff3a4215949ccfaecd6c6dddc3b2e062098b5da03edb
+checksum="c849fb531a3b19d362288a59cc78044221b01cb752e0f5f40810707e6377b09c
  c38e8c66c2eac2bc021d450f2b60d0e45c5355df963d0133930448639c0bd8d4"
 
 case "$XBPS_TARGET_MACHINE" in