Ports: Update sqlite's patches to use git patches

5 files changed, 78 insertions, 41 deletions

diff --git a/Ports/sqlite/patches/0001-Teach-configure-about-serenity.patch b/Ports/sqlite/patches/0001-Teach-configure-about-serenity.patch
new file mode 100644
index 0000000000..c66232c172
--- /dev/null
+++ b/Ports/sqlite/patches/0001-Teach-configure-about-serenity.patch
@@ -0,0 +1,34 @@
+From 98597b7f104c73a1955eef077097b5dbb372183f Mon Sep 17 00:00:00 2001
+From: Andrew Kaster <akaster@serenityos.org>
+Date: Sat, 8 Jan 2022 05:33:27 -0700
+Subject: [PATCH 1/2] Teach configure about serenity
+
+---
+ configure | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure b/configure
+index 367f505..df6217c 100755
+--- a/configure
++++ b/configure
+@@ -11067,6 +11067,8 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
+       hardcode_shlibpath_var=no
+       ;;
+ 
++    serenity*)
++      ;;
+     *)
+       ld_shlibs=no
+       ;;
+@@ -12147,6 +12149,8 @@ uts4*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
++serenity*)
++  ;;
+ *)
+   dynamic_linker=no
+   ;;
+-- 
+2.36.1
+
diff --git a/Ports/sqlite/patches/0002-Disable-vfs-locking.patch b/Ports/sqlite/patches/0002-Disable-vfs-locking.patch
new file mode 100644
index 0000000000..16ec2097f8
--- /dev/null
+++ b/Ports/sqlite/patches/0002-Disable-vfs-locking.patch
@@ -0,0 +1,32 @@
+From 574528250f8113f17a1524266114e297417fd3ff Mon Sep 17 00:00:00 2001
+From: Jelle Raaijmakers <jelle@gmta.nl>
+Date: Sat, 27 Mar 2021 12:38:07 +0100
+Subject: [PATCH 2/2] Disable vfs locking
+
+---
+ sqlite3.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sqlite3.c b/sqlite3.c
+index 0b227f0..90c38bd 100644
+--- a/sqlite3.c
++++ b/sqlite3.c
+@@ -42840,6 +42840,7 @@ SQLITE_API int sqlite3_os_init(void){
+   ** array cannot be const.
+   */
+   static sqlite3_vfs aVfs[] = {
++    UNIXVFS("unix-none",     nolockIoFinder ),
+ #if SQLITE_ENABLE_LOCKING_STYLE && defined(__APPLE__)
+     UNIXVFS("unix",          autolockIoFinder ),
+ #elif OS_VXWORKS
+@@ -42847,7 +42848,6 @@ SQLITE_API int sqlite3_os_init(void){
+ #else
+     UNIXVFS("unix",          posixIoFinder ),
+ #endif
+-    UNIXVFS("unix-none",     nolockIoFinder ),
+     UNIXVFS("unix-dotfile",  dotlockIoFinder ),
+     UNIXVFS("unix-excl",     posixIoFinder ),
+ #if OS_VXWORKS
+-- 
+2.36.1
+
diff --git a/Ports/sqlite/patches/ReadMe.md b/Ports/sqlite/patches/ReadMe.md
new file mode 100644
index 0000000000..db636f5080
--- /dev/null
+++ b/Ports/sqlite/patches/ReadMe.md
@@ -0,0 +1,12 @@
+# Patches for sqlite on SerenityOS
+
+## `0001-Teach-configure-about-serenity.patch`
+
+Teach configure about serenity
+
+
+## `0002-Disable-vfs-locking.patch`
+
+Disable vfs locking
+
+
diff --git a/Ports/sqlite/patches/configure.patch b/Ports/sqlite/patches/configure.patch
deleted file mode 100644
index ea8793e108..0000000000
--- a/Ports/sqlite/patches/configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- sqlite-autoconf-3350500/configure	2021-04-19 20:56:40.000000000 +0200
-+++ sqlite-autoconf-port/configure	2022-01-08 10:07:29.108097826 +0100
-@@ -11069,6 +11069,8 @@
-       hardcode_shlibpath_var=no
-       ;;
-
-+    serenity*)
-+      ;;
-     *)
-       ld_shlibs=no
-       ;;
---- sqlite-autoconf-3350500/configure	2022-01-08 10:08:22.185276101 +0100
-+++ sqlite-autoconf-port/configure	2022-01-08 10:09:52.836148833 +0100
-@@ -12151,6 +12151,8 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
-
-+serenity*)
-+  ;;
- *)
-   dynamic_linker=no
-   ;;
-
diff --git a/Ports/sqlite/patches/sqlite3.c.patch b/Ports/sqlite/patches/sqlite3.c.patch
deleted file mode 100644
index d938013bb3..0000000000
--- a/Ports/sqlite/patches/sqlite3.c.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- sqlite-autoconf-3350300/sqlite3.c	2021-03-26 15:24:58.000000000 +0100
-+++ sqlite-autoconf-port/sqlite3.c	2021-03-27 12:30:47.197494792 +0100
-@@ -41852,6 +41852,7 @@
-   ** array cannot be const.
-   */
-   static sqlite3_vfs aVfs[] = {
-+    UNIXVFS("unix-none",     nolockIoFinder ),
- #if SQLITE_ENABLE_LOCKING_STYLE && defined(__APPLE__)
-     UNIXVFS("unix",          autolockIoFinder ),
- #elif OS_VXWORKS
-@@ -41859,7 +41860,6 @@
- #else
-     UNIXVFS("unix",          posixIoFinder ),
- #endif
--    UNIXVFS("unix-none",     nolockIoFinder ),
-     UNIXVFS("unix-dotfile",  dotlockIoFinder ),
-     UNIXVFS("unix-excl",     posixIoFinder ),
- #if OS_VXWORKS