Attachment #241220 for bug #270557

View | Details | Raw Unified | Return to bug 270557
Collapse All | Expand All

Lines 161-168 RUBY_PORTREVISION= 1 Link Here

(-)b/Mk/Uses/ruby.mk (-2 / +2 lines)
161	#	161	#
162	# Ruby 3.1	162	# Ruby 3.1
163	#	163	#
164	RUBY_DISTVERSION= 3.1.3	164	RUBY_DISTVERSION= 3.1.4
165	RUBY_PORTREVISION= 2	165	RUBY_PORTREVISION= 0
166		166
167	. elif ${RUBY_VER} == 3.2	167	. elif ${RUBY_VER} == 3.2
168	#	168	#

Lines 1-3 Link Here

(-)b/lang/ruby31/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1669322575	1	TIMESTAMP = 1680203228
2	SHA256 (ruby/ruby-3.1.3.tar.xz) = 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a	2	SHA256 (ruby/ruby-3.1.4.tar.xz) = 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f
3	SIZE (ruby/ruby-3.1.3.tar.xz) = 15300224	3	SIZE (ruby/ruby-3.1.4.tar.xz) = 15316604




From 613fca01486e47dee9364a2fd86b5f5e77fe23c8 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 7 Dec 2022 22:14:44 +0900
Subject: [PATCH] [Bug #19189] Fallback to the default "pkg-config"

---
 lib/mkmf.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git lib/mkmf.rb lib/mkmf.rb
index e94733c635..0fbc1cc2e5 100644
--- lib/mkmf.rb
+++ lib/mkmf.rb
@@ -1866,7 +1866,7 @@ def pkg_config(pkg, *options)
     if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig)
       # if and only if package specific config command is given
     elsif ($PKGCONFIG ||=
-           (pkgconfig = with_config("pkg-config", RbConfig::CONFIG["PKG_CONFIG"])) &&
+           (pkgconfig = with_config("pkg-config") {config_string("PKG_CONFIG") || "pkg-config"}) &&
            find_executable0(pkgconfig) && pkgconfig) and
         xsystem([*envs, $PKGCONFIG, "--exists", pkg])
       # default to pkg-config command
-- 
2.39.1


Lines 1-6 Link Here

(-)b/lang/ruby31/files/patch-tool_rbinstall.rb (-4 / +7 lines)
1	--- tool/rbinstall.rb.orig 2022-11-24 10:20:31 UTC	1	--- tool/rbinstall.rb.orig 2023-03-30 10:53:51 UTC
2	+++ tool/rbinstall.rb	2	+++ tool/rbinstall.rb
3	@@ -930,170 +930,6 @@ end	3	@@ -930,173 +930,6 @@ end
4		4
5	# :startdoc:	5	# :startdoc:
6		6
Lines 119-127 Link Here
119	- next if /^\s*(?:#\|$)/ =~ name	119	- next if /^\s*(?:#\|$)/ =~ name
120	- next unless /^(\S+)\s+(\S+).*/ =~ name	120	- next unless /^(\S+)\s+(\S+).*/ =~ name
121	- gem_name = "#$1-#$2"	121	- gem_name = "#$1-#$2"
122	- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"	122	- # Try to find the gemspec file for C ext gems
		123	- # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec
		124	- # This gemspec keep the original dependencies
		125	- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec"
123	- unless File.exist?(path)	126	- unless File.exist?(path)
124	- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec"	127	- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
125	- next unless File.exist?(path)	128	- next unless File.exist?(path)
126	- end	129	- end
127	- spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}")	130	- spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}")

Return to bug 270557

Removed Link Here

(-)a/lang/ruby31/files/patch-mkmf-pkg-config (-25 lines)
1	From 613fca01486e47dee9364a2fd86b5f5e77fe23c8 Mon Sep 17 00:00:00 2001
2	From: Nobuyoshi Nakada <nobu@ruby-lang.org>
3	Date: Wed, 7 Dec 2022 22:14:44 +0900
4	Subject: [PATCH] [Bug #19189] Fallback to the default "pkg-config"
5
6	---
7	lib/mkmf.rb \| 2 +-
8	1 file changed, 1 insertion(+), 1 deletion(-)
9
10	diff --git lib/mkmf.rb lib/mkmf.rb
11	index e94733c635..0fbc1cc2e5 100644
12	--- lib/mkmf.rb
13	+++ lib/mkmf.rb
14	@@ -1866,7 +1866,7 @@ def pkg_config(pkg, *options)
15	if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig)
16	# if and only if package specific config command is given
17	elsif ($PKGCONFIG \|\|=
18	- (pkgconfig = with_config("pkg-config", RbConfig::CONFIG["PKG_CONFIG"])) &&
19	+ (pkgconfig = with_config("pkg-config") {config_string("PKG_CONFIG") \|\| "pkg-config"}) &&
20	find_executable0(pkgconfig) && pkgconfig) and
21	xsystem([*envs, $PKGCONFIG, "--exists", pkg])
22	# default to pkg-config command
23	--
24	2.39.1
25

Lines 12453-12458 man/man1/ruby%%RUBY_SUFFIX%%.1.gz Link Here

(-)b/lang/ruby31/pkg-plist (-1 / +6 lines)
12453	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/component-c.ri	12453	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/component-c.ri
12454	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/component-i.ri	12454	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/component-i.ri
12455	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/component_ary-i.ri	12455	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/component_ary-i.ri
		12456	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/decoded_password-i.ri
		12457	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/decoded_user-i.ri
12456	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/default_port-c.ri	12458	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/default_port-c.ri
12457	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/default_port-i.ri	12459	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/default_port-i.ri
12458	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/eql%3f-i.ri	12460	%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/eql%3f-i.ri
Lines 12590-12598 man/man1/ruby%%RUBY_SUFFIX%%.1.gz Link Here
12590	%%RDOC%%%%RUBY_RIDIR%%/URI/WS/cdesc-WS.ri	12592	%%RDOC%%%%RUBY_RIDIR%%/URI/WS/cdesc-WS.ri
12591	%%RDOC%%%%RUBY_RIDIR%%/URI/WS/request_uri-i.ri	12593	%%RDOC%%%%RUBY_RIDIR%%/URI/WS/request_uri-i.ri
12592	%%RDOC%%%%RUBY_RIDIR%%/URI/WSS/cdesc-WSS.ri	12594	%%RDOC%%%%RUBY_RIDIR%%/URI/WSS/cdesc-WSS.ri
		12595	%%RDOC%%%%RUBY_RIDIR%%/URI/_decode_uri_component-c.ri
		12596	%%RDOC%%%%RUBY_RIDIR%%/URI/_encode_uri_component-c.ri
12593	%%RDOC%%%%RUBY_RIDIR%%/URI/cdesc-URI.ri	12597	%%RDOC%%%%RUBY_RIDIR%%/URI/cdesc-URI.ri
		12598	%%RDOC%%%%RUBY_RIDIR%%/URI/decode_uri_component-c.ri
12594	%%RDOC%%%%RUBY_RIDIR%%/URI/decode_www_form-c.ri	12599	%%RDOC%%%%RUBY_RIDIR%%/URI/decode_www_form-c.ri
12595	%%RDOC%%%%RUBY_RIDIR%%/URI/decode_www_form_component-c.ri	12600	%%RDOC%%%%RUBY_RIDIR%%/URI/decode_www_form_component-c.ri
		12601	%%RDOC%%%%RUBY_RIDIR%%/URI/encode_uri_component-c.ri
12596	%%RDOC%%%%RUBY_RIDIR%%/URI/encode_www_form-c.ri	12602	%%RDOC%%%%RUBY_RIDIR%%/URI/encode_www_form-c.ri
12597	%%RDOC%%%%RUBY_RIDIR%%/URI/encode_www_form_component-c.ri	12603	%%RDOC%%%%RUBY_RIDIR%%/URI/encode_www_form_component-c.ri
12598	%%RDOC%%%%RUBY_RIDIR%%/URI/extract-c.ri	12604	%%RDOC%%%%RUBY_RIDIR%%/URI/extract-c.ri
12599	-