Skip to content

Commit

Permalink
Rebase sqlite-jdbc patches against 3.43.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
05nelsonm committed Dec 1, 2023
1 parent 9415b18 commit 54f42cc
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 403bb8b932d1a1e0df9a35edc2c1475eecd3297d Mon Sep 17 00:00:00 2001
From 66063cc75664c217e27530c00ffd07bd9ae76c8a Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Fri, 13 Oct 2023 07:09:23 -0400
Subject: [PATCH 01/11] Add user/group ids to docker build
Expand Down
6 changes: 3 additions & 3 deletions external/patches/0002-Disable-double-quoted-strings.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9c68f6c65e0f55134b94d2a7067565d297084ef3 Mon Sep 17 00:00:00 2001
From b9d78f9fe8ffb467264a7f5da9ecc348f9967471 Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Fri, 13 Oct 2023 07:09:39 -0400
Subject: [PATCH 02/11] Disable double-quoted strings
Expand Down Expand Up @@ -61,10 +61,10 @@ index a79cd86..89dd54b 100644
assertThat(rs.getString(1)).isEqualTo("TGCA");
rs.close();
diff --git a/src/test/java/org/sqlite/PrepStmtTest.java b/src/test/java/org/sqlite/PrepStmtTest.java
index 393f237..88922c7 100644
index 403603c..405299c 100644
--- a/src/test/java/org/sqlite/PrepStmtTest.java
+++ b/src/test/java/org/sqlite/PrepStmtTest.java
@@ -599,7 +599,7 @@ public class PrepStmtTest {
@@ -600,7 +600,7 @@ public class PrepStmtTest {
public void clearParameters() throws SQLException {
stat.executeUpdate(
"create table tbl (colid integer primary key AUTOINCREMENT, col varchar)");
Expand Down
2 changes: 1 addition & 1 deletion external/patches/0003-Remove-JDBC-extensions.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c2ebdb604c65c9722402242c6527f565a84c942a Mon Sep 17 00:00:00 2001
From 070c2faefd3efc25062ddcceadeb6989920f18e0 Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Fri, 13 Oct 2023 07:09:56 -0400
Subject: [PATCH 03/11] Remove JDBC extensions
Expand Down
2 changes: 1 addition & 1 deletion external/patches/0004-Delete-native-libs.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8925e43f76b613ebdb3cc80f5b77b22fd8045be3 Mon Sep 17 00:00:00 2001
From 9ecdf5af00c3f52e7072cbdfab6fb56c782f660c Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Fri, 13 Oct 2023 07:10:10 -0400
Subject: [PATCH 04/11] Delete native libs
Expand Down
2 changes: 1 addition & 1 deletion external/patches/0005-Add-Linux-Musl-definitions.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 04bbfe2f3caeeb3b5ec8199c4d3715ff25e8957d Mon Sep 17 00:00:00 2001
From 4555908b0183fc5cbf708dfc6bfb5f3e2aebdad0 Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Fri, 13 Oct 2023 07:10:29 -0400
Subject: [PATCH 05/11] Add Linux-Musl definitions
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 534056672ea4ac1fb64c291145a4a41eab82fec2 Mon Sep 17 00:00:00 2001
From 21470529d605b22cdcdeb1ad9c1aa3fd9b3e8f9c Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Fri, 13 Oct 2023 07:10:57 -0400
Subject: [PATCH 06/11] Disable win-arm/freebsd targets
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 50d655b691fc16b9942664f0f181a7b5d8b82e94 Mon Sep 17 00:00:00 2001
From c9740e056fc4c2851d194632ef40399fcfad64c6 Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Fri, 13 Oct 2023 07:11:28 -0400
Subject: [PATCH 07/11] Disable mac shared lib adhoc signing
Expand Down
2 changes: 1 addition & 1 deletion external/patches/0008-Pin-dockcross-image-versions.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4347e94e4c4ebc4c7ff8013909762ad3a067788b Mon Sep 17 00:00:00 2001
From 28650f43ac66c784d02bb6e2500531c8c9038e03 Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Fri, 13 Oct 2023 07:11:47 -0400
Subject: [PATCH 08/11] Pin dockcross image versions
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 16defa1c61e5b5c9c4f4a48eb66fd20aabdaa865 Mon Sep 17 00:00:00 2001
From 045af150819851ec23727e08a7eec8ffd11c75d9 Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Fri, 13 Oct 2023 07:12:09 -0400
Subject: [PATCH 09/11] Use Ubuntu 16.04 to build linux 32/64
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f76d3e300f5914edc20b6d8512cce8f026281aa9 Mon Sep 17 00:00:00 2001
From 7aba89b5dfaa290fa5c9eee6e7925ff2adec0ce4 Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Fri, 13 Oct 2023 07:12:33 -0400
Subject: [PATCH 10/11] Configure build to use SQLite3MultipleCiphers
Expand Down
2 changes: 1 addition & 1 deletion external/patches/0011-Use-build-env-where-possible.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 705c291df710cc0b284f65218d547e55c9ed1012 Mon Sep 17 00:00:00 2001
From 853488f3e225c4af17b7814122e76f7f53ceeacd Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Fri, 1 Dec 2023 12:49:06 -0500
Subject: [PATCH 11/11] Use build-env where possible
Expand Down

0 comments on commit 54f42cc

Please sign in to comment.