From nobody Thu Jul 6 11:33:01 2023 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 4QxZCK53kRz4lnVl; Thu, 6 Jul 2023 11:33:01 +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 4QxZCK3BM7z3xpP; Thu, 6 Jul 2023 11:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688643181; 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=ezz2Y8idgTuSHQgkuznTSHHtPzNMqQ9aJemGKSqZwTM=; b=icMekpviGSklqTros8P3+xVfiU6QNF+lLbA8MI4U5e+dGPRzXWyW3IW70c5zSsFxEkg0C5 ejI2InbR4IS5nKRy/rBTdqWvo+1uuPwYempxG4gcpvv+NNXMLdnSHSK+zS1fmOP8Lyf2O8 xMrzny6O26SfdOW+sbm7YOL2nXDM4ncf7NrrSCEtB2XibzAJVo9rZZyRy+EgeYr0wAX5yB go785MOfpAKvC+TfcFDlUiXwlBAYU2LxhcbjDZbuVq/QTT6W0bTLqn8z+15sAUVjvFcf7w xUBveuL6UcN9DWh4QzPcw8MATutarou9W3K+OnHVyL0ZwqAepYVodJtzbkpfbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688643181; 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=ezz2Y8idgTuSHQgkuznTSHHtPzNMqQ9aJemGKSqZwTM=; b=llP0/B3KB5fVuTyf0Sg0ZatfJZTzSeHCqgPLbiqostg55fUo877a8P2J4EOQ+Za0+OpOYj HDkB2icA5uYWXNBlTBbWqO0bNfJjxcz8jUWlSvqubpZ3iJeMhni+kJeQE0mPdjszJZbpIA ElZX09FnH2HE/Dgy4WYOgJK+8ycT/n2I/kQBjC43DHG2GjmTAngM7x+fZsrJyJezdA67RC 72kNnI0sdfJGPIphn7Um9sx3BrnV+cqBnprPWwY7sHW9xEjPEHmdtbN+AfMqftdWYQdhlT eBZkTKwJmKO0y9z1KgzVylDa6w5CCgALmWae+WiopWFo3NCIG0d5QR+QfJd2qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688643181; a=rsa-sha256; cv=none; b=vlGBOqiJIjYrgTcO4LbW4GOWMHzDnxuLD17wNcHaRfFfyPIXKFS4xoqIKrmONsRbS1mE62 wWJR47nnjfBtiZbl6Iz4Xh/LqvB9WX9Jo8+FEZIaZAsp5jMNxtwSerA1PApLfM7gAodkpP Ew6SvqdCHf2K0BHS87Bqoqm7ema8Rx+c7581iJsEGpoZBmPTq3M7r2DyddQxHmXTlThBsL 9ecxlCCELhZLJdREa8PKbiU7khspbWt+t+dkQW6gQuDhkd42bKZOaMBQqKT++n8yY/F/4N w+1lkkjJ19UXywRccN1OiFOR+57BqKnMS8KSrHZMxwNI4H/HrLaJzJJZGcsmUg== 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 4QxZCK21VWzvgH; Thu, 6 Jul 2023 11:33:01 +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 366BX1tc003000; Thu, 6 Jul 2023 11:33:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 366BX1vK002999; Thu, 6 Jul 2023 11:33:01 GMT (envelope-from git) Date: Thu, 6 Jul 2023 11:33:01 GMT Message-Id: <202307061133.366BX1vK002999@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 03804b40854e - main - databases/rubygem-pg_query: update to 4.2.1 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03804b40854e11e4749ec488783d7ebfeb5119e6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=03804b40854e11e4749ec488783d7ebfeb5119e6 commit 03804b40854e11e4749ec488783d7ebfeb5119e6 Author: Matthias Fechner AuthorDate: 2023-06-25 07:47:19 +0000 Commit: Matthias Fechner CommitDate: 2023-07-06 11:32:19 +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 --- 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