From a8b3c70dbfa7c65821772aaa8c7e1e38843976bc Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Sun, 13 Jun 2021 05:48:03 +0200
Subject: [PATCH] update nim to 1.4.8, update nimble to 0.13.1

---
 .../0002-Always-look-in-unix-paths.patch          |  2 +-
 .../0003-Check-lib-nim-subdirectory.patch         |  2 +-
 mingw-w64-nim/0004-Use-mingw64-dlls.patch         | 15 ++-------------
 mingw-w64-nim/PKGBUILD                            | 14 +++++++-------
 4 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/mingw-w64-nim/0002-Always-look-in-unix-paths.patch b/mingw-w64-nim/0002-Always-look-in-unix-paths.patch
index dc58526..f75e86a 100644
--- a/mingw-w64-nim/0002-Always-look-in-unix-paths.patch
+++ b/mingw-w64-nim/0002-Always-look-in-unix-paths.patch
@@ -1,6 +1,6 @@
 --- a/compiler/nimconf.nim
 +++ b/compiler/nimconf.nim
-@@ -227,7 +227,7 @@
+@@ -234,7 +234,7 @@
    # the UNIX way)
    let p = getPrefixDir(conf)
    result = p / RelativeDir"config" / filename
diff --git a/mingw-w64-nim/0003-Check-lib-nim-subdirectory.patch b/mingw-w64-nim/0003-Check-lib-nim-subdirectory.patch
index b992132..8ebff59 100644
--- a/mingw-w64-nim/0003-Check-lib-nim-subdirectory.patch
+++ b/mingw-w64-nim/0003-Check-lib-nim-subdirectory.patch
@@ -1,6 +1,6 @@
 --- a/compiler/options.nim
 +++ b/compiler/options.nim
-@@ -619,6 +619,10 @@
+@@ -620,6 +620,10 @@
      else:
        conf.libpath = prefix / RelativeDir"lib"
  
diff --git a/mingw-w64-nim/0004-Use-mingw64-dlls.patch b/mingw-w64-nim/0004-Use-mingw64-dlls.patch
index c58987b..a8516f1 100644
--- a/mingw-w64-nim/0004-Use-mingw64-dlls.patch
+++ b/mingw-w64-nim/0004-Use-mingw64-dlls.patch
@@ -1,17 +1,6 @@
---- a/lib/wrappers/openssl.nim
-+++ b/lib/wrappers/openssl.nim
-@@ -53,7 +53,7 @@
-     from posix import SocketHandle
- 
- elif useWinVersion:
--  when not defined(nimOldDlls) and defined(cpu64):
-+  when defined(cpu64):
-     const
-       DLLSSLName* = "(libssl-1_1-x64|ssleay64|libssl64).dll"
-       DLLUtilName* = "(libcrypto-1_1-x64|libeay64).dll"
 --- a/lib/wrappers/pcre.nim
 +++ b/lib/wrappers/pcre.nim
-@@ -314,12 +314,7 @@
+@@ -312,12 +312,7 @@
  
  when not defined(usePcreHeader):
    when hostOS == "windows":
@@ -27,7 +16,7 @@
    else:
 --- a/lib/wrappers/sqlite3.nim
 +++ b/lib/wrappers/sqlite3.nim
-@@ -13,12 +13,7 @@
+@@ -11,12 +11,7 @@
    {.push styleChecks: off.}
  
  when defined(windows):
diff --git a/mingw-w64-nim/PKGBUILD b/mingw-w64-nim/PKGBUILD
index aafa7ab..4509874 100644
--- a/mingw-w64-nim/PKGBUILD
+++ b/mingw-w64-nim/PKGBUILD
@@ -6,9 +6,9 @@ license=('MIT')
 options=('!emptydirs')
 provides=('nim' 'nimble')
 conflicts=('nim' 'nimble')
-pkgver=1.4.0
+pkgver=1.4.8
 _csources=0.20.0
-_nimble=0.12.0
+_nimble=0.13.1
 pkgrel=1
 arch=('i686' 'x86_64')
 depends=("${MINGW_PACKAGE_PREFIX}-openssl")
@@ -19,13 +19,13 @@ source=(nim-${pkgver}.tar.gz::https://github.com/nim-lang/Nim/archive/v${pkgver}
         '0002-Always-look-in-unix-paths.patch'
         '0003-Check-lib-nim-subdirectory.patch'
         '0004-Use-mingw64-dlls.patch')
-sha256sums=('3918ff1834888cd3feec5002931d4052a354994a0355bf1ae950f2f17ba81417'
+sha256sums=('8a687beb30670dc4eadcfefd1198d4238af283dc716438ac2342a7d65e07d9e9'
             '5e6fd15d90df1a8cb7614c4ffc70aa8c4198cd854d7742016202b96dd0228d3c'
-            '0b88d91a450f31641f85379f2d76afb0a013cf783e62144a6534525b9cb1cbac'
+            'e6aa8d9ee4b3ed0321dca329b4a38fa546771b9729984482fb50fe73d3777f5d'
             '3010acbe7769ea214dd51f5889e3a26b44925001905deb04b060beaede2578f4'
-            '1861121215c183de721cfed2ebbbcc9323a40a7cacb2389d89cc21339b5bf026'
-            '166b9c18dd22cf34112df70cd37ebc388b73715e80e1a1e2acff8f0da72f171b'
-            'b15c1ed3e8cb31d3b8eda925684abbc8a0e6883ea3e911f57cc8dd6003d12ce2')
+            '047036575b23b607f992981da7d53f027ed05d533b7b02fecc42782466e410e4'
+            '1b3c72c6cae8af9e297bbd345ab655e51eec7012f0d0dcf873904cc6f28e77d4'
+            '169ff8e04af1fb10ab06604b517ba8f4e98f4341d29fbbb10af3d3e360085dfc')
 
 prepare() {
   cd "${srcdir}/nim-${pkgver}"