From nobody Sat Sep 10 16:09:29 2022 X-Original-To: dev-commits-ports-main@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 4MPyVL1hbmz4cLv5; Sat, 10 Sep 2022 16:09: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 4MPyVK6PKCz3H2x; Sat, 10 Sep 2022 16:09:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662826169; 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=bsQNjZRNdzHiR3HT/p8oxlJDiWZ/gWmp1h8LAzDzZo8=; b=Sp/885QRq+wHzxCkxkjhdRawwdbkCFHRJgUcOaYHl8ip3oko3zXYCkfj+KX9Ws6zchCGwA 9MazjrDnYV2P6CfLUJX2reBK7o/iqkxs6MSKmTpJDmSlkmxyWQMYW6kJHThyUVCSgYvPvH +FwDHLp6YJmnF7MYaq27h+sK7hKClK9kA4P9hGSdovWAtRPeOMO/ju2d8EaQ2ZirXaFkam veg2g3tJHMqez7jH9bwHFxSRS4QciHftRO+gcwcjN96kwcZOmAG+yZJ7VtR2Wz6iO2l315 jni71Y66hXBO5ZpCQHy7O2nLwwZTpPwk8EPBPJAnG1+3pquBhXNdi+uCR2lJSw== 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 4MPyVK5TNtzM2g; Sat, 10 Sep 2022 16:09:29 +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 28AG9TvX056186; Sat, 10 Sep 2022 16:09:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28AG9THL056185; Sat, 10 Sep 2022 16:09:29 GMT (envelope-from git) Date: Sat, 10 Sep 2022 16:09:29 GMT Message-Id: <202209101609.28AG9THL056185@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 6fcffccedf64 - main - databases/rubygem-sqlite3: Update to 1.5.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fcffccedf640cdedb47c5714b1efaf71bb2b550 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662826169; 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=bsQNjZRNdzHiR3HT/p8oxlJDiWZ/gWmp1h8LAzDzZo8=; b=dITzv/fS4fl6sPaiAyHRSMySRElsnCKH2xh75mwNgwXyzkc/qCt1JwqxzugA6aIeDPT2Yp 3F4MKLi72+nG32KBUhbV/0ftk119lWtO6eXK2mn9ku7OZnbp4hejvk6SDfw8a/gQhh1Acy 5tKpdzETBLkgcgZ2Nn9KmEtdXbOYJC3n/ZA7jyOJ5Ryr+v75DiexAkhMgAER6O9ibAP+s4 aDPZOjyLoho489UJ0UEXZ84kVLys04bKXvcWUhdguWUfj5/VwTpQLwKFM/lXF60Mge/xI1 H6inQM73QFew+591DbiQifCYKo1PbfCO0vgUPd7M5+6/HXHSooZvHs74stFpFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662826169; a=rsa-sha256; cv=none; b=K010oa3EltEqj5z/fnT5NRLuwKtxqgaUB1wM6H9ghE3t3D0mj0ynbxy6i1Hu98IkmT2l+G vD9ol2W78NB+M7TCNWR9aGcan7rdUY8Z7tgjQLK9zJlOnTKyq94BbI5zx+ZBhTOSNXviBE oS8jqc858alIAVqztOD2T/RJJ8cyKjaz5a65Lie6creI1Cn8gqPU+tK2qxAxJ2Jhs6q8dt 71W2R+ilOwJg+M9JKEexfNPnzMQJRiSCnwss308TKQx+VSgWQ5bgdajFy5sjiMez+POxUm fa/wL38iCvWgRb8T4spXu0Sv48A0D6mFDhL5MaLkcKJva6awCwiX2cMdtPBN4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6fcffccedf640cdedb47c5714b1efaf71bb2b550 commit 6fcffccedf640cdedb47c5714b1efaf71bb2b550 Author: Po-Chuan Hsieh AuthorDate: 2022-09-10 16:06:31 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-09-10 16:06:31 +0000 databases/rubygem-sqlite3: Update to 1.5.0 Changes: https://github.com/sparklemotion/sqlite3-ruby/releases --- databases/rubygem-sqlite3/Makefile | 3 +- databases/rubygem-sqlite3/distinfo | 6 +- .../files/patch-ext-sqlite3-extconf.rb | 93 ++++++++++++++++++++++ databases/rubygem-sqlite3/files/patch-gemspec | 10 +++ 4 files changed, 107 insertions(+), 5 deletions(-) diff --git a/databases/rubygem-sqlite3/Makefile b/databases/rubygem-sqlite3/Makefile index 5ea564c98827..634bd7fb916a 100644 --- a/databases/rubygem-sqlite3/Makefile +++ b/databases/rubygem-sqlite3/Makefile @@ -1,5 +1,5 @@ PORTNAME= sqlite3 -PORTVERSION= 1.4.4 +PORTVERSION= 1.5.0 CATEGORIES= databases rubygems MASTER_SITES= RG @@ -10,7 +10,6 @@ WWW= https://github.com/sparklemotion/sqlite3-ruby LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= swig:devel/swig LIB_DEPENDS= libsqlite3.so:databases/sqlite3 USES= gem diff --git a/databases/rubygem-sqlite3/distinfo b/databases/rubygem-sqlite3/distinfo index b4c46b67af64..443b12350ef6 100644 --- a/databases/rubygem-sqlite3/distinfo +++ b/databases/rubygem-sqlite3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655398692 -SHA256 (rubygem/sqlite3-1.4.4.gem) = 5d81cac1341d43260ce9673e146f41d28db0d09ec67e76a35ee8089686513cfc -SIZE (rubygem/sqlite3-1.4.4.gem) = 71168 +TIMESTAMP = 1662820076 +SHA256 (rubygem/sqlite3-1.5.0.gem) = 8eeb6dab3c7ff6b1aa88f8a4a3879b33048c74b309077dba67fa71b72352048a +SIZE (rubygem/sqlite3-1.5.0.gem) = 3102720 diff --git a/databases/rubygem-sqlite3/files/patch-ext-sqlite3-extconf.rb b/databases/rubygem-sqlite3/files/patch-ext-sqlite3-extconf.rb new file mode 100644 index 000000000000..e29e3a4a9fec --- /dev/null +++ b/databases/rubygem-sqlite3/files/patch-ext-sqlite3-extconf.rb @@ -0,0 +1,93 @@ +--- ext/sqlite3/extconf.rb.orig 2022-09-10 15:17:36 UTC ++++ ext/sqlite3/extconf.rb +@@ -1,5 +1,4 @@ + require "mkmf" +-require "mini_portile2" + + module Sqlite3 + module ExtConf +@@ -48,33 +47,6 @@ module Sqlite3 + end + + def configure_packaged_libraries +- minimal_recipe.tap do |recipe| +- recipe.configure_options += ["--enable-shared=no", "--enable-static=yes"] +- ENV.to_h.tap do |env| +- additional_cflags = [ +- "-fPIC", # needed for linking the static library into a shared library +- "-O2", # see https://github.com/sparklemotion/sqlite3-ruby/issues/335 for some benchmarks +- ] +- env["CFLAGS"] = [env["CFLAGS"], additional_cflags].flatten.join(" ") +- recipe.configure_options += env.select { |k,v| ENV_ALLOWLIST.include?(k) } +- .map { |key, value| "#{key}=#{value.strip}" } +- end +- +- unless File.exist?(File.join(recipe.target, recipe.host, recipe.name, recipe.version)) +- recipe.cook +- end +- recipe.activate +- +- ENV["PKG_CONFIG_ALLOW_SYSTEM_CFLAGS"] = "t" # on macos, pkg-config will not return --cflags without this +- pcfile = File.join(recipe.path, "lib", "pkgconfig", "sqlite3.pc") +- if pkg_config(pcfile) +- # see https://bugs.ruby-lang.org/issues/18490 +- libs = xpopen(["pkg-config", "--libs", "--static", pcfile], err: [:child, :out], &:read) +- libs.split.each { |lib| append_ldflags(lib) } if $?.success? +- else +- abort("\nCould not configure the build properly. Please install either the `pkg-config` utility or the `pkg-config` rubygem.\n\n") +- end +- end + end + + def configure_extension +@@ -115,11 +87,6 @@ module Sqlite3 + end + + def minimal_recipe +- MiniPortile.new(libname, sqlite3_config[:version]).tap do |recipe| +- recipe.files = sqlite3_config[:files] +- recipe.target = File.join(package_root_dir, "ports") +- recipe.patch_files = Dir[File.join(package_root_dir, "patches", "*.patch")].sort +- end + end + + def package_root_dir +@@ -127,27 +94,9 @@ module Sqlite3 + end + + def sqlite3_config +- mini_portile_config[:sqlite3] + end + + def mini_portile_config +- { +- sqlite3: { +- # checksum verified by first checking the published sha3(256) checksum against https://sqlite.org/download.html: +- # +- # $ sha3sum -a 256 ports/archives/sqlite-autoconf-3390300.tar.gz +- # dfa055c70724cd63f0b7da6e9f53530d8da51fe021e3f864d58c7c847d590e1d ports/archives/sqlite-autoconf-3390300.tar.gz +- # +- # $ sha256sum ports/archives/sqlite-autoconf-3390300.tar.gz +- # 7868fb3082be3f2cf4491c6fba6de2bddcbc293a35fefb0624ee3c13f01422b9 ports/archives/sqlite-autoconf-3390300.tar.gz +- # +- version: "3.39.3", +- files: [{ +- url: "https://www.sqlite.org/2022/sqlite-autoconf-3390300.tar.gz", +- sha256: "7868fb3082be3f2cf4491c6fba6de2bddcbc293a35fefb0624ee3c13f01422b9", +- }], +- } +- } + end + + def abort_could_not_find(missing) +@@ -156,10 +105,6 @@ module Sqlite3 + + def cross_build? + enable_config("cross-build") +- end +- +- def download +- minimal_recipe.download + end + + def print_help diff --git a/databases/rubygem-sqlite3/files/patch-gemspec b/databases/rubygem-sqlite3/files/patch-gemspec new file mode 100644 index 000000000000..11ead14dd74a --- /dev/null +++ b/databases/rubygem-sqlite3/files/patch-gemspec @@ -0,0 +1,10 @@ +--- sqlite3.gemspec.orig 2022-09-10 14:48:02 UTC ++++ sqlite3.gemspec +@@ -27,7 +27,6 @@ Gem::Specification.new do |s| + end + + if s.respond_to? :add_runtime_dependency then +- s.add_runtime_dependency(%q.freeze, ["~> 2.8.0"]) + s.add_development_dependency(%q.freeze, ["~> 5.15"]) + s.add_development_dependency(%q.freeze, ["~> 1.2.0"]) + s.add_development_dependency(%q.freeze, ["~> 1.2.1"])