Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 May 2021 16:25:10 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: 287ad8044ed4 - main - databases/rubygem-pg_query: Update to 2.0.3.
Message-ID:  <202105291625.14TGPAJo076209@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=287ad8044ed427d6217d8850f35ff954a9f5e188

commit 287ad8044ed427d6217d8850f35ff954a9f5e188
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2021-05-29 11:43:04 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2021-05-29 16:23:55 +0000

    databases/rubygem-pg_query: Update to 2.0.3.
    
    Required for gitlab-ce 13.12.
    Changelog:
    https://github.com/pganalyze/pg_query/blob/main/CHANGELOG.md
---
 databases/rubygem-pg_query/Makefile                |  8 ++--
 databases/rubygem-pg_query/distinfo                |  6 +--
 .../files/patch-ext_pg__query_extconf.rb           | 48 +++-------------------
 3 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/databases/rubygem-pg_query/Makefile b/databases/rubygem-pg_query/Makefile
index e6a73185bcff..a4d792f4f391 100644
--- a/databases/rubygem-pg_query/Makefile
+++ b/databases/rubygem-pg_query/Makefile
@@ -1,7 +1,7 @@
 # Created by: Matthias Fechner <mfechner@FreeBSD.org>
 
 PORTNAME=	pg_query
-PORTVERSION=	1.3.0
+PORTVERSION=	2.0.3
 PORTREVISION=	0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
@@ -13,8 +13,10 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 MY_DEPENDS=	${LOCALBASE}/lib/libpg_query.a:databases/libpg_query
-BUILD_DEPENDS=	${MY_DEPENDS}
-RUN_DEPENDS=	${MY_DEPENDS}
+BUILD_DEPENDS=	${MY_DEPENDS} \
+		rubygem-pathname>0:devel/rubygem-pathname
+RUN_DEPENDS=	${MY_DEPENDS} \
+		rubygem-google-protobuf315>=3.15.5<3.16:devel/rubygem-google-protobuf315
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/databases/rubygem-pg_query/distinfo b/databases/rubygem-pg_query/distinfo
index 77f92a8eb30e..4d8152fc561b 100644
--- a/databases/rubygem-pg_query/distinfo
+++ b/databases/rubygem-pg_query/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611263359
-SHA256 (rubygem/pg_query-1.3.0.gem) = 0e1be8d88a8c0521b81f84d43efb8349ef1330861d4a353015b535018a1f34c5
-SIZE (rubygem/pg_query-1.3.0.gem) = 36864
+TIMESTAMP = 1621458021
+SHA256 (rubygem/pg_query-2.0.3.gem) = 4f6566d174b477b25736f89d6e5455668df44962a4582c68fcc2dffbe63031d6
+SIZE (rubygem/pg_query-2.0.3.gem) = 2148352
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
index 401629e85688..f9ed045ae1ac 100644
--- a/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb
+++ b/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb
@@ -1,49 +1,10 @@
---- ext/pg_query/extconf.rb.orig	2021-01-21 21:10:31 UTC
+--- ext/pg_query/extconf.rb.orig	2021-05-19 21:51:31 UTC
 +++ ext/pg_query/extconf.rb
-@@ -4,52 +4,9 @@ require 'digest'
- require 'mkmf'
- require 'open-uri'
+@@ -7,13 +7,6 @@ require 'pathname'
  
--LIB_PG_QUERY_TAG = '10-1.0.4'.freeze
--LIB_PG_QUERY_SHA256SUM = '88cc90296e5fcaaebd0b360c46698b7c5badddf86f120e249ef682a820d41338'.freeze
--
- workdir = Dir.pwd
--libdir = File.join(workdir, 'libpg_query-' + LIB_PG_QUERY_TAG)
- gemdir = File.join(__dir__, '../..')
--libfile = libdir + '/libpg_query.a'
--filename = File.join(workdir, 'libpg_query-' + LIB_PG_QUERY_TAG + '.tar.gz')
+ $objs = Dir.glob(File.join(__dir__, '*.c')).map { |f| Pathname.new(f).sub_ext('.o').to_s }
  
--unless File.exist?(filename)
--  File.open(filename, 'wb') do |target_file|
--    URI.open('https://codeload.github.com/lfittl/libpg_query/tar.gz/' + LIB_PG_QUERY_TAG, 'rb') do |read_file|
--      target_file.write(read_file.read)
--    end
--  end
--
--  checksum = Digest::SHA256.hexdigest(File.read(filename))
--
--  if checksum != LIB_PG_QUERY_SHA256SUM
--    raise "SHA256 of #{filename} does not match: got #{checksum}, expected #{expected_sha256}"
--  end
--end
--
--unless Dir.exist?(libdir)
--  system("tar -xzf #{filename}") || raise('ERROR')
--end
--
--unless Dir.exist?(libfile)
--  # Build libpg_query (and parts of PostgreSQL)
--  system(format("cd %s; %s build", libdir, ENV['MAKE'] || (RUBY_PLATFORM =~ /bsd/ ? 'gmake' : 'make')))
--end
--
--# Copy test files (this intentionally overwrites existing files!)
--system("cp #{libdir}/testdata/* #{gemdir}/spec/files/")
--
- $objs = ['pg_query_ruby.o']
--
--$LOCAL_LIBS << '-lpg_query'
--$LIBPATH << libdir
--$CFLAGS << " -I #{libdir} -O3 -Wall -fno-strict-aliasing -fwrapv -g"
+-$CFLAGS << " -I#{File.join(__dir__, 'include')} -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -g"
 -
 -SYMFILE = File.join(__dir__, 'pg_query_ruby.sym')
 -if RUBY_PLATFORM =~ /darwin/
@@ -51,5 +12,6 @@
 -else
 -  $DLDFLAGS << " -Wl,--retain-symbols-file=#{SYMFILE}"
 -end
++$CFLAGS << " -I#{File.join(__dir__, 'include')} -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -DHAVE_STRCHRNUL -g"
  
  create_makefile 'pg_query/pg_query'



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105291625.14TGPAJo076209>