git: 943cc2e9f047 - main - databases/rubygem-pg_query: Update to 2.1.0
Matthias Fechner
mfechner at FreeBSD.org
Tue Jul 6 09:52:40 UTC 2021
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=943cc2e9f0474989ac172ceeef8994265e3dddb6
commit 943cc2e9f0474989ac172ceeef8994265e3dddb6
Author: Matthias Fechner <mfechner at FreeBSD.org>
AuthorDate: 2021-07-06 09:48:06 +0000
Commit: Matthias Fechner <mfechner at FreeBSD.org>
CommitDate: 2021-07-06 09:52:35 +0000
databases/rubygem-pg_query: Update to 2.1.0
This upgrade included patches upstream.
Changelog:
https://github.com/pganalyze/pg_query/blob/main/CHANGELOG.md
---
databases/rubygem-pg_query/Makefile | 9 ++------
databases/rubygem-pg_query/distinfo | 6 ++---
.../files/patch-ext_pg__query_extconf.rb | 9 ++++----
.../rubygem-pg_query/files/patch-pg__query.gemspec | 26 ----------------------
www/gitlab-ce/Makefile | 4 ++--
www/gitlab-ce/files/patch-Gemfile | 2 +-
6 files changed, 13 insertions(+), 43 deletions(-)
diff --git a/databases/rubygem-pg_query/Makefile b/databases/rubygem-pg_query/Makefile
index 601be2a32351..251b49879ed0 100644
--- a/databases/rubygem-pg_query/Makefile
+++ b/databases/rubygem-pg_query/Makefile
@@ -1,8 +1,7 @@
# Created by: Matthias Fechner <mfechner at FreeBSD.org>
PORTNAME= pg_query
-PORTVERSION= 2.0.3
-PORTREVISION= 2
+PORTVERSION= 2.1.0
CATEGORIES= databases rubygems
MASTER_SITES= RG
@@ -13,11 +12,7 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= rubygem-pathname>0:devel/rubygem-pathname
-# rubygem-google-protobuf 3.17.1 is required to fix a segfault
-# see PR: https://github.com/pganalyze/pg_query/pull/212
-# and https://github.com/pganalyze/pg_query/pull/213
-RUN_DEPENDS= ${MY_DEPENDS} \
- rubygem-google-protobuf>=3.17.1:devel/rubygem-google-protobuf
+RUN_DEPENDS= rubygem-google-protobuf>=3.17.1:devel/rubygem-google-protobuf
USES= gem
USE_RUBY= yes
diff --git a/databases/rubygem-pg_query/distinfo b/databases/rubygem-pg_query/distinfo
index 4d8152fc561b..2ab02d4d281a 100644
--- a/databases/rubygem-pg_query/distinfo
+++ b/databases/rubygem-pg_query/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621458021
-SHA256 (rubygem/pg_query-2.0.3.gem) = 4f6566d174b477b25736f89d6e5455668df44962a4582c68fcc2dffbe63031d6
-SIZE (rubygem/pg_query-2.0.3.gem) = 2148352
+TIMESTAMP = 1625564038
+SHA256 (rubygem/pg_query-2.1.0.gem) = 1d4a1402ba5c9f8f2a94417409d03db7e763c846de674f049bccba66b15eb189
+SIZE (rubygem/pg_query-2.1.0.gem) = 2145280
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 888855f4e6bb..4eb77808db7b 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,18 +1,19 @@
---- ext/pg_query/extconf.rb.orig 2021-07-05 05:53:16 UTC
+--- ext/pg_query/extconf.rb.orig 2021-07-06 09:35:46 UTC
+++ ext/pg_query/extconf.rb
-@@ -7,13 +7,8 @@ require 'pathname'
+@@ -7,15 +7,8 @@ require 'pathname'
$objs = Dir.glob(File.join(__dir__, '*.c')).map { |f| Pathname.new(f).sub_ext('.o').to_s }
--$CFLAGS << " -I#{File.join(__dir__, 'include')} -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -g"
+-$CFLAGS << " -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -g"
+$CFLAGS << " -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -DHAVE_STRCHRNUL -g"
+ $INCFLAGS = "-I#{File.join(__dir__, 'include')} " + $INCFLAGS
+-
-SYMFILE = File.join(__dir__, 'pg_query_ruby.sym')
-if RUBY_PLATFORM =~ /darwin/
- $DLDFLAGS << " -Wl,-exported_symbols_list #{SYMFILE}" unless defined?(::Rubinius)
-else
- $DLDFLAGS << " -Wl,--retain-symbols-file=#{SYMFILE}"
-end
-+$INCFLAGS = "-I#{File.join(__dir__, 'include')} " + $INCFLAGS
create_makefile 'pg_query/pg_query'
diff --git a/databases/rubygem-pg_query/files/patch-pg__query.gemspec b/databases/rubygem-pg_query/files/patch-pg__query.gemspec
deleted file mode 100644
index ea6d6d4d74e5..000000000000
--- a/databases/rubygem-pg_query/files/patch-pg__query.gemspec
+++ /dev/null
@@ -1,26 +0,0 @@
---- pg_query.gemspec.orig 2021-06-20 06:58:25 UTC
-+++ pg_query.gemspec
-@@ -29,20 +29,20 @@ Gem::Specification.new do |s|
- s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0"])
- s.add_development_dependency(%q<rubocop>.freeze, ["= 0.49.1"])
- s.add_development_dependency(%q<rubocop-rspec>.freeze, ["= 1.15.1"])
-- s.add_runtime_dependency(%q<google-protobuf>.freeze, ["~> 3.15.5"])
-+ s.add_runtime_dependency(%q<google-protobuf>.freeze, [">= 3.17.1"])
- else
- s.add_dependency(%q<rake-compiler>.freeze, ["~> 0"])
- s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
- s.add_dependency(%q<rubocop>.freeze, ["= 0.49.1"])
- s.add_dependency(%q<rubocop-rspec>.freeze, ["= 1.15.1"])
-- s.add_dependency(%q<google-protobuf>.freeze, ["~> 3.15.5"])
-+ s.add_dependency(%q<google-protobuf>.freeze, [">= 3.17.1"])
- end
- else
- s.add_dependency(%q<rake-compiler>.freeze, ["~> 0"])
- s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
- s.add_dependency(%q<rubocop>.freeze, ["= 0.49.1"])
- s.add_dependency(%q<rubocop-rspec>.freeze, ["= 1.15.1"])
-- s.add_dependency(%q<google-protobuf>.freeze, ["~> 3.15.5"])
-+ s.add_dependency(%q<google-protobuf>.freeze, [">= 3.17.1"])
- end
- end
-
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 05bdad3578ea..c65305ed0902 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gitlab-ce
PORTVERSION= 14.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www devel
MAINTAINER= mfechner at FreeBSD.org
@@ -186,7 +186,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-gitlab-license>=1.5<2.0:devel/rubygem-gitlab-license \
rubygem-rack-attack>=6.3.0<6.4.0:www/rubygem-rack-attack \
rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \
- rubygem-pg_query>=2.0.3<2.1:databases/rubygem-pg_query \
+ rubygem-pg_query>=2.1<3:databases/rubygem-pg_query \
rubygem-premailer-rails-rails61>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails61 \
rubygem-gitlab-labkit>=0.18.0<0.19:devel/rubygem-gitlab-labkit \
rubygem-thrift>=0.14.0:devel/rubygem-thrift \
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 9ad5d8137744..391b432b243f 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -31,7 +31,7 @@
# released. gitlab-labkit will need to be updated to use the pg_query
# version.
-gem 'gitlab-pg_query', '~> 2.0.4', require: 'pg_query'
-+gem 'pg_query', '~> 2.0.3', require: 'pg_query'
++gem 'pg_query', '~> 2.1', require: 'pg_query'
gem 'premailer-rails', '~> 1.10.3'
More information about the dev-commits-ports-all
mailing list