From nobody Sat Jul 08 10:58:31 2023 X-Original-To: dev-commits-ports-all@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 4QynLf2VQxz4ly6H; Sat, 8 Jul 2023 10:58:34 +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 4QynLb3SWzz4TMJ; Sat, 8 Jul 2023 10:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688813911; 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=NGHuMmFWJfQRv2KDHkLsH7weLthTFJtTNDnh4SzqNdo=; b=ZashiH4jSdy82EtxFbjFcPU9fkgCfHALN7XQcmmOZqBq/egVQ5aWAcNxxO4EgHmg5Kp/ie 5ECsjbm3/B9tKxIFehJoenKq8sK8m/yXCnMzPrTw46ybfvWcVBUzxJsUWKAwFMXPH0FtG2 9iFxvChYN8PEp0nyzAh2kw/5ec/VjVMQNI8pDoj9NXfWxYmcvbmPeMgSj4byp/ZiBva54j geeUKEdMzKC3jbAoiem/jP/hDKA5i0xrF1ynMFbT/f44YMsmwQV3ShEdS8A7P3SkwcF0Kj nuqgELm2sTUrMNpb/Kka1Hx9+W8tX1D4idof340zGVp9i1vUQgP7UnuaTErS0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688813911; 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=NGHuMmFWJfQRv2KDHkLsH7weLthTFJtTNDnh4SzqNdo=; b=s86brJnxgGXMCkHpSoeRncezBC+oEvZ0RCmn1ueYHRKGowKEC+K386YQS5uptSVXH5blZO Jb2R0RZeqA4uelRGovdH4KzRmnlz7kU/BL0dopYMQ7kPzyngVFw9FPcWe8mXBtfZktPuin qu/VUAZJNEbgPkkKvu3I7acakH66iDw2lHY3BuKUARvHxu76AYGFFzGcIzievLIqh1hv30 j/mgEt1Wl8oy+mFNb7uSajHtStJ3yTlGydcc9BWnA34FfuVSxVomV/CxNnZfnKGksyNeoq Ahd8q37kT4QCBJWT8lI/lr1bCFU89fDx0eoFSicM3WQso6XjaI6Mtn8ejUlfLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688813911; a=rsa-sha256; cv=none; b=qdC7prbG/2JN3Fn4XERErox51TDMOwe8jGt3IGIXClj1DKgwf4poBaRngkmFhu5GQNr2b8 0d+6botTvPE4irKMfTSS6wL6xX53GVi0oDQxe+kIUpuL6qnqetOXF7hE+p9K9fYGvIjzj1 ESUfVBdUJqBAZvkd8FCfHTP5WYfiyK68CK/LurBcX8eWN2f1rWcK5LjGx9LqPbI5uNEVDg btpBiDNq0K+jAwjTvr0MTqw4C2DvkToi/FncTqGpiNU0DUo0gStte90+7y6ieDwHehMv0W gkeEuxwa/8ecTetWqKrz4rqPfP6pBiUZwVbt17+b8jDXDz1N1MvJlyDfTwLloQ== 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 4QynLb2X7QzJm6; Sat, 8 Jul 2023 10:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 368AwViP002513; Sat, 8 Jul 2023 10:58:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 368AwVir002512; Sat, 8 Jul 2023 10:58:31 GMT (envelope-from git) Date: Sat, 8 Jul 2023 10:58:31 GMT Message-Id: <202307081058.368AwVir002512@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: b2666416ecf2 - 2023Q3 - databases/rubygem-pg_query: update to 4.2.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: b2666416ecf29fccd8098142e58b2e93bbed7f40 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2666416ecf29fccd8098142e58b2e93bbed7f40 commit b2666416ecf29fccd8098142e58b2e93bbed7f40 Author: Matthias Fechner AuthorDate: 2023-06-25 07:47:19 +0000 Commit: Matthias Fechner CommitDate: 2023-07-08 09:07:46 +0000 databases/rubygem-pg_query: update to 4.2.1 Required for gitlab-ce 16.1 Changelog: https://github.com/pganalyze/pg_query/blob/main/CHANGELOG.md Upstream was a fix committed which breaks the compilation: https://github.com/pganalyze/pg_query/commit/684aa77a21eb46188de0ab9bfdabcef71f591614 this is undone with a patch included here. I reported this upstream: https://github.com/pganalyze/pg_query/issues/291 Till this is fixed, we can keep the patch that undo 684aa77a21 (cherry picked from commit 03804b40854e11e4749ec488783d7ebfeb5119e6) --- databases/rubygem-pg_query/Makefile | 4 ++-- databases/rubygem-pg_query/distinfo | 6 +++--- .../rubygem-pg_query/files/patch-ext_pg__query_extconf.rb | 14 ++++++++++++++ .../files/patch-ext_pg__query_pg__query__ruby.sym | 5 +++++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/databases/rubygem-pg_query/Makefile b/databases/rubygem-pg_query/Makefile index 122fcfa0d18b..de678f8249e6 100644 --- a/databases/rubygem-pg_query/Makefile +++ b/databases/rubygem-pg_query/Makefile @@ -1,5 +1,5 @@ PORTNAME= pg_query -PORTVERSION= 2.2.1 +PORTVERSION= 4.2.1 CATEGORIES= databases rubygems MASTER_SITES= RG @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= rubygem-pathname>0:devel/rubygem-pathname -RUN_DEPENDS= rubygem-google-protobuf>=3.19.2:devel/rubygem-google-protobuf +RUN_DEPENDS= rubygem-google-protobuf>=3.22.3:devel/rubygem-google-protobuf USES= gem diff --git a/databases/rubygem-pg_query/distinfo b/databases/rubygem-pg_query/distinfo index 1eaf56556c90..2eda39dc429d 100644 --- a/databases/rubygem-pg_query/distinfo +++ b/databases/rubygem-pg_query/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676991927 -SHA256 (rubygem/pg_query-2.2.1.gem) = 6086972bbf4eab86d8425b35f14ca8b6fe41e4341423582801c1ec86ff5f8cea -SIZE (rubygem/pg_query-2.2.1.gem) = 2157056 +TIMESTAMP = 1687446390 +SHA256 (rubygem/pg_query-4.2.1.gem) = b04820a9d1c0c1608e3240b7d84baabbee1b95a7302f29fdd0f00e901c604833 +SIZE (rubygem/pg_query-4.2.1.gem) = 2274816 diff --git a/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb b/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb new file mode 100644 index 000000000000..a59d508ab6d1 --- /dev/null +++ b/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb @@ -0,0 +1,14 @@ +--- ext/pg_query/extconf.rb.orig 2023-06-25 07:15:18 UTC ++++ ext/pg_query/extconf.rb +@@ -12,11 +12,7 @@ $CFLAGS << " -fvisibility=hidden -O3 -Wall -fno-strict + $INCFLAGS = "-I#{File.join(__dir__, 'include')} " + $INCFLAGS + + SYMFILE = +- if RUBY_PLATFORM =~ /freebsd/ +- File.join(__dir__, 'pg_query_ruby_freebsd.sym') +- else + File.join(__dir__, 'pg_query_ruby.sym') +- end + + if RUBY_PLATFORM =~ /darwin/ + $DLDFLAGS << " -Wl,-exported_symbols_list #{SYMFILE}" unless defined?(::Rubinius) diff --git a/databases/rubygem-pg_query/files/patch-ext_pg__query_pg__query__ruby.sym b/databases/rubygem-pg_query/files/patch-ext_pg__query_pg__query__ruby.sym new file mode 100644 index 000000000000..eea0cec5dc23 --- /dev/null +++ b/databases/rubygem-pg_query/files/patch-ext_pg__query_pg__query__ruby.sym @@ -0,0 +1,5 @@ +--- ext/pg_query/pg_query_ruby.sym.orig 2023-06-25 07:13:00 UTC ++++ ext/pg_query/pg_query_ruby.sym +@@ -1 +1,2 @@ + _Init_pg_query ++Init_pg_query