Date: Thu, 6 Jul 2023 11:33:01 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 03804b40854e - main - databases/rubygem-pg_query: update to 4.2.1 Message-ID: <202307061133.366BX1vK002999@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=03804b40854e11e4749ec488783d7ebfeb5119e6 commit 03804b40854e11e4749ec488783d7ebfeb5119e6 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2023-06-25 07:47:19 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307061133.366BX1vK002999>