aboutsummaryrefslogtreecommitdiff
path: root/databases/emacsql
diff options
context:
space:
mode:
Diffstat (limited to 'databases/emacsql')
-rw-r--r--databases/emacsql/Makefile20
-rw-r--r--databases/emacsql/distinfo8
-rw-r--r--databases/emacsql/files/patch-emacsql-sqlite.el44
-rw-r--r--databases/emacsql/files/patch-sqlite_Makefile24
-rw-r--r--databases/emacsql/files/patch-sqlite_emacsql.c11
-rw-r--r--databases/emacsql/pkg-plist5
6 files changed, 12 insertions, 100 deletions
diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile
index 1ea8caba745d..3094905893cd 100644
--- a/databases/emacsql/Makefile
+++ b/databases/emacsql/Makefile
@@ -1,12 +1,9 @@
PORTNAME= emacsql
-DISTVERSION= 3.1.1
-PORTREVISION= 4
+DISTVERSIONPREFIX= v
+DISTVERSION= 4.3.3
CATEGORIES= databases elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
-PATCH_SITES= https://github.com/magit/emacsql/commit/
-PATCHFILES= 3cec7dcb201568a09ee9cebf0ea1e43cba9d334a.patch:-p1
-
MAINTAINER= yasu@FreeBSD.org
COMMENT= High-level Emacs Lisp RDBMS front-end
WWW= https://github.com/magit/emacsql
@@ -14,11 +11,10 @@ WWW= https://github.com/magit/emacsql
LICENSE= UNLICENSE
LICENSE_FILE= ${WRKSRC}/UNLICENSE
-BUILD_DEPENDS= pg.el${EMACS_PKGNAMESUFFIX}>=0.13:databases/pg.el@${EMACS_FLAVOR}
-LIB_DEPENDS= libsqlite3.so:databases/sqlite3
-RUN_DEPENDS= pg.el${EMACS_PKGNAMESUFFIX}>=0.13:databases/pg.el@${EMACS_FLAVOR}
+BUILD_DEPENDS= pg.el${EMACS_PKGNAMESUFFIX}>=0.39:databases/pg.el@${EMACS_FLAVOR}
+RUN_DEPENDS= pg.el${EMACS_PKGNAMESUFFIX}>=0.39:databases/pg.el@${EMACS_FLAVOR}
-USES= emacs gmake localbase:ldflags
+USES= emacs gmake
USE_GITHUB= yes
GH_ACCOUNT= magit
@@ -33,15 +29,9 @@ PORTDOCS= README.md
OPTIONS_DEFINE= DOCS
-post-patch:
- ${RM} ${WRKSRC}/sqlite/sqlite3.[ch]
- ${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/emacsql-sqlite.el
-
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/bin \
${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
- ${INSTALL_PROGRAM} ${WRKSRC}/sqlite/emacsql-sqlite \
- ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \
${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
diff --git a/databases/emacsql/distinfo b/databases/emacsql/distinfo
index d8772162e169..a07eeda31f44 100644
--- a/databases/emacsql/distinfo
+++ b/databases/emacsql/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1674094021
-SHA256 (magit-emacsql-3.1.1_GH0.tar.gz) = 82620a6e3a4e9d56047e9b099e1c3070a5a6aa6828ccde4fb7c3f262a11803f1
-SIZE (magit-emacsql-3.1.1_GH0.tar.gz) = 2392710
-SHA256 (3cec7dcb201568a09ee9cebf0ea1e43cba9d334a.patch) = 488199703bcb8238742eb60583b815051c8d72d19513bf01093713d24bed34a5
-SIZE (3cec7dcb201568a09ee9cebf0ea1e43cba9d334a.patch) = 2164
+TIMESTAMP = 1762060042
+SHA256 (magit-emacsql-v4.3.3_GH0.tar.gz) = 464e1906492f7700ff289bf928c8060f0e1bde369a7d0caa1f93262458e31efc
+SIZE (magit-emacsql-v4.3.3_GH0.tar.gz) = 31922
diff --git a/databases/emacsql/files/patch-emacsql-sqlite.el b/databases/emacsql/files/patch-emacsql-sqlite.el
deleted file mode 100644
index 8ddae08ac1fe..000000000000
--- a/databases/emacsql/files/patch-emacsql-sqlite.el
+++ /dev/null
@@ -1,44 +0,0 @@
---- emacsql-sqlite.el.orig 2022-02-18 15:43:25 UTC
-+++ emacsql-sqlite.el
-@@ -33,16 +33,7 @@
- "sqlite/emacsql-sqlite")
- "Relative path to emacsql executable.")
-
--(defvar emacsql-sqlite-executable
-- (expand-file-name emacsql-sqlite-executable-path
-- (if (or (file-writable-p emacsql-sqlite-data-root)
-- (file-exists-p (expand-file-name
-- emacsql-sqlite-executable-path
-- emacsql-sqlite-data-root)))
-- emacsql-sqlite-data-root
-- (expand-file-name
-- (concat "emacsql/" emacsql-version)
-- user-emacs-directory)))
-+(defvar emacsql-sqlite-executable "%%PREFIX%%/bin/emacsql-sqlite"
- "Path to the EmacSQL backend (this is not the sqlite3 shell).")
-
- (defvar emacsql-sqlite-reserved
-@@ -100,6 +91,7 @@ used.")
- (emacsql-wait connection)
- (emacsql connection [:pragma (= busy-timeout $s1)]
- (/ (* emacsql-global-timeout 1000) 2))
-+ (emacsql connection [:pragma (= foreign_keys 1)])
- (emacsql-register connection)))
-
- (cl-defun emacsql-sqlite (file &key debug)
-@@ -163,12 +155,12 @@ If called with non-nil ASYNC the return value is meani
- if path return it))
- (src (expand-file-name "sqlite" emacsql-sqlite-data-root))
- (files (mapcar (lambda (f) (expand-file-name f src))
-- '("sqlite3.c" "emacsql.c")))
-+ '("emacsql.c")))
- (cflags (list (format "-I%s" src) (format "-O%d" (or o-level 2))))
- (ldlibs (cl-case system-type
- (windows-nt (list))
-- (berkeley-unix (list "-lm"))
-- (otherwise (list "-lm" "-ldl"))))
-+ (berkeley-unix (list "-lm" "-lsqlite3"))
-+ (otherwise (list "-lm" "-ldl" "-lsqlite3"))))
- (options (emacsql-sqlite-compile-switches))
- (output (list "-o" emacsql-sqlite-executable))
- (arguments (nconc cflags options files ldlibs output)))
diff --git a/databases/emacsql/files/patch-sqlite_Makefile b/databases/emacsql/files/patch-sqlite_Makefile
deleted file mode 100644
index 7408786dead2..000000000000
--- a/databases/emacsql/files/patch-sqlite_Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- sqlite/Makefile.orig 2022-10-11 15:22:51 UTC
-+++ sqlite/Makefile
-@@ -1,8 +1,8 @@
- -include ../.config.mk
-
- .POSIX:
--LDLIBS = -ldl -lm
--CFLAGS = -O2 -Wall -Wextra -Wno-implicit-fallthrough \
-+LDLIBS = -lsqlite3
-+CFLAGS += \
- -DSQLITE_THREADSAFE=0 \
- -DSQLITE_DEFAULT_FOREIGN_KEYS=1 \
- -DSQLITE_ENABLE_FTS5 \
-@@ -12,8 +12,8 @@ CFLAGS = -O2 -Wall -Wextra -Wno-implicit-fallthrough \
- -DSQLITE_ENABLE_JSON1 \
- -DSQLITE_SOUNDEX
-
--emacsql-sqlite: emacsql.c sqlite3.c
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ emacsql.c sqlite3.c $(LDLIBS)
-+emacsql-sqlite: emacsql.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ emacsql.c $(LDLIBS)
-
- clean:
- rm -f emacsql-sqlite
diff --git a/databases/emacsql/files/patch-sqlite_emacsql.c b/databases/emacsql/files/patch-sqlite_emacsql.c
deleted file mode 100644
index 24590656df22..000000000000
--- a/databases/emacsql/files/patch-sqlite_emacsql.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- sqlite/emacsql.c.orig 2020-07-14 00:28:59 UTC
-+++ sqlite/emacsql.c
-@@ -1,7 +1,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include "sqlite3.h"
-+#include <sqlite3.h>
-
- #define TRUE 1
- #define FALSE 0
diff --git a/databases/emacsql/pkg-plist b/databases/emacsql/pkg-plist
index afdd54299bac..db8d7d73c1a4 100644
--- a/databases/emacsql/pkg-plist
+++ b/databases/emacsql/pkg-plist
@@ -1,4 +1,3 @@
-bin/emacsql-sqlite
%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-autoloads.el
%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.el
%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.elc
@@ -8,6 +7,10 @@ bin/emacsql-sqlite
%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-pg.elc
%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-psql.el
%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-psql.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-builtin.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-builtin.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-module.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-module.elc
%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.el
%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.elc
%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.el
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-20 14:49:04 +0000