public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [flatpaks/flatpak-runtime] f45: Version-proof ruby detection
Date: Fri, 11 Sep 2026 14:42:26 GMT [thread overview]
Message-ID: <178913774651.1.14233716847368718815.flatpaks-flatpak-runtime-e53151db4d4f@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : flatpaks/flatpak-runtime
Branch : f45
Commit : e53151db4d4f03d9bbf10ced8b399f9ff0d2116b
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-03-02T20:29:45-05:00
Stats : +4/-4 in 1 file(s)
URL : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/e53151db4d4f03d9bbf10ced8b399f9ff0d2116b?branch=f45
Log:
Version-proof ruby detection
The upstream runtimes are currently on ruby-3.1.0. This doesn't change
the runtime but does eliminate a bunch of unmatched entries.
---
diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index f7799c8..15c0bfa 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -323,7 +323,6 @@ pc_rename = {
'libvala-0.52.pc': 'libvala-0.56.pc',
'python-3.10.pc': 'python-3.11.pc',
'python-3.10-embed.pc': 'python-3.11-embed.pc',
- 'ruby-3.0.pc': 'ruby.pc',
'vapigen-0.52.pc': 'vapigen-0.56.pc',
}
rename.update({ '/usr/lib64/pkgconfig/' + k: '/usr/lib64/pkgconfig/' + v for k, v in pc_rename.items() })
@@ -376,11 +375,12 @@ rename_patterns = [
(r'^/usr/include/c\+\+/11/x86_64-unknown-linux-gnu/(.*)', r'/usr/include/c++/11/x86_64-redhat-linux/\1'),
(r'^/usr/include/nss/(.*)', r'/usr/include/nss3/\1'),
(r'^/usr/include/python3.10/(.*)', r'/usr/include/python3.11/\1'),
- (r'^/usr/include/ruby-3.0.0/ruby/(.*)', r'/usr/include/ruby/\1'),
- (r'^/usr/include/ruby-3.0.0/x86_64-linux/ruby/(.*)', r'/usr/include/ruby/\1'),
- (r'^/usr/include/ruby-3.0.0/(.*)', r'/usr/include/ruby/\1'),
+ (r'^/usr/include/ruby-[0-9\.]*/ruby/(.*)', r'/usr/include/ruby/\1'),
+ (r'^/usr/include/ruby-[0-9\.]*/x86_64-linux/ruby/(.*)', r'/usr/include/ruby/\1'),
+ (r'^/usr/include/ruby-[0-9\.]*/(.*)', r'/usr/include/ruby/\1'),
(r'^/usr/lib64/GL/default/lib/dri/(.*)', r'/usr/lib64/dri/\1'),
(r'^/usr/lib64/pkgconfig/(.*proto.pc)', r'/usr/share/pkgconfig/\1'),
+ (r'^/usr/lib64/pkgconfig/ruby-[0-9\.]*.pc', r'/usr/lib64/pkgconfig/ruby.pc'),
(r'^/usr/lib64/python3.10/(.*)', r'/usr/lib64/python3.11/\1'),
(r'^/usr/share/fonts/adobe-source-code-pro-fonts/(.*)', r'/usr/share/fonts/adobe-source-code-pro/\1'),
(r'^/usr/share/fonts/cantarell/Cantarell-VF.otf', r'/usr/share/fonts/abattis-cantarell-fonts/Cantarell-Regular.otf'),
reply other threads:[~2026-09-11 14:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178913774651.1.14233716847368718815.flatpaks-flatpak-runtime-e53151db4d4f@fedoraproject.org \
--to=yselkowi@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox