From nobody Sat Feb 19 03:49:30 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 70A1A19D2743; Sat, 19 Feb 2022 03:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K0vhB2KzCz4fpR; Sat, 19 Feb 2022 03:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645242570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aqrAoTInfnRok8XHuZ2PTp7P2KaGpdW5gZD4lGKsWT4=; b=SBZT9vjhu3GI2b2MH5II4pMjdAlX0se91cnHM7ujDEWDkCNhQEtG18SeNTzp5m2l/IsJ1D uNLmHyld2TGMXNTNFQTUeFNm9L8Nm8QTTsqhLVU3FWtTdpy7Pu/ddp4mje8KQh1obWr7Av B6+I6OWowI4FpMfWLlNvj5yNS1WBbnH3aDyaNaIsztFfEcjCcTDf+Y7KRON5mZmgvASEiw 5JqXRSjLeNrRBp7q/Te8AlB9S4DBkzwwumD52bZYQ+lhdOt9Ow/adlVs/4KY1GA9KdBETf +45oKYAmqzMkLuPU17WkkbfVhDEM+7P//Md8tCj0nEkvSIdoMMCjoMaw1TnQXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 304F529DAA; Sat, 19 Feb 2022 03:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21J3nU4Q014600; Sat, 19 Feb 2022 03:49:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21J3nUJ6014599; Sat, 19 Feb 2022 03:49:30 GMT (envelope-from git) Date: Sat, 19 Feb 2022 03:49:30 GMT Message-Id: <202202190349.21J3nUJ6014599@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 246082e07383 - 2022Q1 - databases/emacsql: Update to latest snapshot List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 246082e073834b16b0721adc1234a2c340cd129d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645242570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aqrAoTInfnRok8XHuZ2PTp7P2KaGpdW5gZD4lGKsWT4=; b=DYqmvOwn3KyVsLbAUcUSVErc3GE/fnT0A3Uan3q3r4sEq3Gi1b2lh2NcNZepjgS2seIjHF nMvD2VTBSyJ/HRX5+9v2IpCUZlRyiKIqPe7M+7OSvZE3+TElNLK8QO58wByENzwgL3MefN ehYvJ2ksKaO6FbsK0WV4FW+I4abhNT7av7h5yKMbPotqWExJR4GuibmDWuCRbYMRJmBeVR N088z7nfP4rVZvJKPEiYh5tv08gOKpsHuHUWlHupWSYNlUvpR6LSMh04DL/SFLHXuyFHxZ BPtpfrt4f2cfeqy2InBHbdEqa99Nzo1XmWmKfy1/kM+AKm1tvUj1/p1QwhOh5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645242570; a=rsa-sha256; cv=none; b=mpgqiyAsWqrTguOW+WjZND9o5M3AZBUR9hqkj8poDEaGLtw8Uk4f/51h5+Fpt7xn6f4plH XOvuw0i6S0y3mVgwmrxHTZrp1HTN+XPJJ9x426+d5B4LdmV72FX+BvL+j+BbLO7+cuWZYj hkSMufEwp/hPeKfu3Kh4Jcp+geFu4P+nnm6G3e8kpvNwQkd6/2bnwaTgdPNDXJJmTHUXV4 GEGB+Y7tQwF5HmOcMJMSvYaKMmWhLsM+CKS3Whofc2Z54zDXjNsIUaZBpHNPyLR/5HGqHQ 0AOGxZCEzCG+BeLvSyTe9xUkjnv3wHfgoD+tBUhB8MLqLGILHVJssMQSvRyzqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=246082e073834b16b0721adc1234a2c340cd129d commit 246082e073834b16b0721adc1234a2c340cd129d Author: Yasuhiro Kimura AuthorDate: 2022-02-19 02:24:06 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-02-19 03:48:56 +0000 databases/emacsql: Update to latest snapshot This fixes runtime error of devel/{forge,forge-devel} While here, pet portlint and portclippy Changes: https://github.com/skeeto/emacsql/compare/3.0.0...3747260 MFH: 2022Q1 (cherry picked from commit 4aa107cc4566b0da08cfc6deac8fb50c0d59d106) --- databases/emacsql/Makefile | 6 ++-- databases/emacsql/distinfo | 6 ++-- databases/emacsql/files/patch-emacsql-sqlite.el | 38 ++++++++++++++----------- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile index 53399e81cb54..8a440ccdca5e 100644 --- a/databases/emacsql/Makefile +++ b/databases/emacsql/Makefile @@ -1,6 +1,6 @@ PORTNAME= emacsql -DISTVERSION= 3.0.0 -PORTREVISION= 2 +DISTVERSION= 3.0.0-17 +DISTVERSIONSUFFIX= -g3747260 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} @@ -23,6 +23,8 @@ MAKE_ENV+= LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VE ALL_TARGET= binary compile TEST_TARGET= check +CONFLICTS_INSTALL= emacsql emacsql-emacs_* + PORTDOCS= README.md OPTIONS_DEFINE= DOCS diff --git a/databases/emacsql/distinfo b/databases/emacsql/distinfo index 6322881961df..f69b0633f9df 100644 --- a/databases/emacsql/distinfo +++ b/databases/emacsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621390677 -SHA256 (skeeto-emacsql-3.0.0_GH0.tar.gz) = 9d94be00518591c68cb0ed1de9dab885e35079f581fb0ae52af5af139a0f1088 -SIZE (skeeto-emacsql-3.0.0_GH0.tar.gz) = 2055251 +TIMESTAMP = 1645236638 +SHA256 (skeeto-emacsql-3.0.0-17-g3747260_GH0.tar.gz) = bf84d2e2d12191e8ee8695bb517a00ab74190d350df9eec6689516801b77a7a1 +SIZE (skeeto-emacsql-3.0.0-17-g3747260_GH0.tar.gz) = 2057124 diff --git a/databases/emacsql/files/patch-emacsql-sqlite.el b/databases/emacsql/files/patch-emacsql-sqlite.el index 9c5d57f9e324..8ddae08ac1fe 100644 --- a/databases/emacsql/files/patch-emacsql-sqlite.el +++ b/databases/emacsql/files/patch-emacsql-sqlite.el @@ -1,19 +1,24 @@ ---- emacsql-sqlite.el.orig 2018-10-31 17:50:07 UTC +--- emacsql-sqlite.el.orig 2022-02-18 15:43:25 UTC +++ emacsql-sqlite.el -@@ -27,11 +27,7 @@ - (file-name-directory (or load-file-name buffer-file-name)) - "Directory where EmacSQL is installed.") +@@ -33,16 +33,7 @@ + "sqlite/emacsql-sqlite") + "Relative path to emacsql executable.") -(defvar emacsql-sqlite-executable -- (expand-file-name (if (memq system-type '(windows-nt cygwin ms-dos)) -- "sqlite/emacsql-sqlite.exe" -- "sqlite/emacsql-sqlite") -- emacsql-sqlite-data-root) +- (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 -@@ -82,6 +78,7 @@ http://www.sqlite.org/lang_keywords.html") +@@ -100,6 +91,7 @@ used.") (emacsql-wait connection) (emacsql connection [:pragma (= busy-timeout $s1)] (/ (* emacsql-global-timeout 1000) 2)) @@ -21,18 +26,19 @@ (emacsql-register connection))) (cl-defun emacsql-sqlite (file &key debug) -@@ -143,11 +140,11 @@ If called with non-nil ASYNC the return value is meani - (let* ((cc (executable-find "cc")) +@@ -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 (if (memq system-type '(windows-nt berkeley-unix)) -- (list "-lm") -- (list "-lm" "-ldl"))) -+ (list "-lm" "-lsqlite3") -+ (list "-lm" "-ldl" "-lsqlite3"))) + (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)))