commit:     f70e26b79564d4522ba1923bb6f1f7a68d9b98e4
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 23:38:49 2025 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 23:57:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f70e26b7

dev-db/sqlite: Update autosetup patch; add upstream reference

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-db/sqlite/files/sqlite-3.49.1-jimsh.patch | 37 ++++++++++++++++++++++-----
 dev-db/sqlite/sqlite-3.49.1.ebuild            |  2 +-
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/dev-db/sqlite/files/sqlite-3.49.1-jimsh.patch 
b/dev-db/sqlite/files/sqlite-3.49.1-jimsh.patch
index 68203390c793..8f7f082a6d88 100644
--- a/dev-db/sqlite/files/sqlite-3.49.1-jimsh.patch
+++ b/dev-db/sqlite/files/sqlite-3.49.1-jimsh.patch
@@ -1,14 +1,27 @@
 # https://bugs.gentoo.org/949981
-# 
https://github.com/msteveb/jimtcl/commit/9b754b8033b9f2a1dc8ba1227df2e5d75185dda7
+# https://www2.sqlite.org/src/info/ffd05de8a3b7cab1
+From 09591b78ae28c6bb385ae96fef44edfb52454830 Mon Sep 17 00:00:00 2001
+From: stephan <[email protected]>
+Date: Mon, 24 Feb 2025 04:47:34 +0000
+Subject: [PATCH] Update jimsh0.c from upstream autosetup to address
+ [https://github.com/msteveb/autosetup/issues/75|autosetup ticket #75],
+ triggered by this build in the Gentoo project.
+
+FossilOrigin-Name: 
ffd05de8a3b7cab1b8e91b99da74b43ec5a7b91c78dcfd7cf338b66126e30a56
+---
+ autosetup/jimsh0.c | 20 ++++++++------------
+ manifest           | 12 ++++++------
+ manifest.uuid      |  2 +-
+ 3 files changed, 15 insertions(+), 19 deletions(-)
+
+diff --git a/autosetup/jimsh0.c b/autosetup/jimsh0.c
+index 0526b9a446..1a6453d0c8 100644
 --- a/autosetup/jimsh0.c
 +++ b/autosetup/jimsh0.c
-@@ -2088,9 +2088,13 @@ enum wbuftype {
- #define UNIX_SOCKETS 0
+@@ -1252,6 +1252,14 @@ int Jim_OpenForRead(const char *filename);
+ 
  #endif
  
--#ifndef MAXPATHLEN
--#define MAXPATHLEN JIM_PATH_LEN
--#endif
 +# ifndef MAXPATHLEN
 +# ifdef PATH_MAX
 +# define MAXPATHLEN PATH_MAX
@@ -16,6 +29,18 @@
 +# define MAXPATHLEN JIM_PATH_LEN
 +# endif
 +# endif
++
+ 
+ int Jim_FileStoreStatData(Jim_Interp *interp, Jim_Obj *varName, const 
jim_stat_t *sb);
+ 
+@@ -2088,10 +2096,6 @@ enum wbuftype {
+ #define UNIX_SOCKETS 0
+ #endif
+ 
+-#ifndef MAXPATHLEN
+-#define MAXPATHLEN JIM_PATH_LEN
+-#endif
+-
  
  
  

diff --git a/dev-db/sqlite/sqlite-3.49.1.ebuild 
b/dev-db/sqlite/sqlite-3.49.1.ebuild
index ce81dc0b2788..6562b7aaf6c3 100644
--- a/dev-db/sqlite/sqlite-3.49.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.49.1.ebuild
@@ -53,7 +53,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-3.47.2-hwtime.h-Don-t-use-rdtsc-on-i486.patch
        # https://sqlite.org/forum/forumpost/f93323a743
        "${FILESDIR}"/${PN}-3.49.0-icu-tests.patch
-       # https://bugs.gentoo.org/949981
+       # https://bugs.gentoo.org/949981, 
https://www2.sqlite.org/src/info/ffd05de8a3b7cab1
        "${FILESDIR}"/${PN}-3.49.1-jimsh.patch
 )
 

Reply via email to