Use Package.load_package instead of require_relative in package files to avoid global scope conflicts (See #7283, #3150, 3b09159) (#10202)

This commit is contained in:
Maximilian Downey Twiss
2024-07-26 15:01:20 +10:00
committed by GitHub
parent 0f1a3025ae
commit 99ac930743
80 changed files with 99 additions and 99 deletions

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'liba52'
Package.load_package("#{__dir__}/liba52.rb")
class A52 < Package
description Liba52.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'acquia_cli'
Package.load_package("#{__dir__}/acquia_cli.rb")
class Acli < Package
description Acquia_cli.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'ruby_asciidoctor'
Package.load_package("#{__dir__}/ruby_asciidoctor.rb")
class Asciidoctor < Package
description Ruby_asciidoctor.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'at_spi2_core'
Package.load_package("#{__dir__}/at_spi2_core.rb")
class At_spi2_atk < Package
description At_spi2_core.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'at_spi2_core'
Package.load_package("#{__dir__}/at_spi2_core.rb")
class Atk < Package
description At_spi2_core.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'avocado_framework'
Package.load_package("#{__dir__}/avocado_framework.rb")
class Avocado < Package
description Avocado_framework.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'py3_azure_cli'
Package.load_package("#{__dir__}/py3_azure_cli.rb")
class Az < Package
description Py3_azure_cli.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'py3_azure_cli'
Package.load_package("#{__dir__}/py3_azure_cli.rb")
class Azure_cli < Package
description Py3_azure_cli.description

View File

@@ -1,6 +1,6 @@
require 'package'
require_relative 'cairomm_1_0'
require_relative 'cairomm_1_16'
Package.load_package("#{__dir__}/cairomm_1_0.rb")
Package.load_package("#{__dir__}/cairomm_1_16.rb")
class Cairomm < Package
description Cairomm_1_0.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'desktop_file_utils'
Package.load_package("#{__dir__}/desktop_file_utils.rb")
class Desktop_file_utilities < Package
description Desktop_file_utils.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'difftastic'
Package.load_package("#{__dir__}/difftastic.rb")
class Difft < Package
description Difftastic.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'gcc_build'
Package.load_package("#{__dir__}/gcc_build.rb")
class Gcc < Package
description 'The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Ada, and Go.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'gcc_build'
Package.load_package("#{__dir__}/gcc_build.rb")
class Gcc_dev < Package
description 'The GNU Compiler Collection: Everything (excepting libraries aside from libgccjit)'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'gcc_build'
Package.load_package("#{__dir__}/gcc_build.rb")
class Gcc_lib < Package
description 'GCC shared libs except libgccjit'

View File

@@ -1,6 +1,6 @@
require 'package'
require_relative 'gcr_3'
require_relative 'gcr_4'
Package.load_package("#{__dir__}/gcr_3.rb")
Package.load_package("#{__dir__}/gcr_4.rb")
class Gcr < Package
description Gcr_3.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'github_cli'
Package.load_package("#{__dir__}/github_cli.rb")
class Gh < Package
description Github_cli.description

View File

@@ -1,10 +1,10 @@
require 'package'
require_relative 'glibc_build223'
require_relative 'glibc_build227'
require_relative 'glibc_build232'
require_relative 'glibc_build233'
require_relative 'glibc_build235'
require_relative 'glibc_build237'
Package.load_package("#{__dir__}/glibc_build223.rb")
Package.load_package("#{__dir__}/glibc_build227.rb")
Package.load_package("#{__dir__}/glibc_build232.rb")
Package.load_package("#{__dir__}/glibc_build233.rb")
Package.load_package("#{__dir__}/glibc_build235.rb")
Package.load_package("#{__dir__}/glibc_build237.rb")
class Glibc < Package
description 'The GNU C Library project provides the core libraries for GNU/Linux systems.'

View File

@@ -1,7 +1,7 @@
require 'package'
require_relative 'glibc'
require_relative 'glibc_build235'
require_relative 'glibc_build237'
Package.load_package("#{__dir__}/glibc.rb")
Package.load_package("#{__dir__}/glibc_build235.rb")
Package.load_package("#{__dir__}/glibc_build237.rb")
class Glibc_dev < Package
description 'glibc: everything except what is in glibc_lib'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'glibc_build235'
Package.load_package("#{__dir__}/glibc_build235.rb")
class Glibc_dev235 < Package
description 'glibc: everything except what is in glibc_lib'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'glibc_build237'
Package.load_package("#{__dir__}/glibc_build237.rb")
class Glibc_dev237 < Package
description 'glibc: everything except what is in glibc_lib'

View File

@@ -1,7 +1,7 @@
require 'package'
require_relative 'glibc'
require_relative 'glibc_build235'
require_relative 'glibc_build237'
Package.load_package("#{__dir__}/glibc.rb")
Package.load_package("#{__dir__}/glibc_build235.rb")
Package.load_package("#{__dir__}/glibc_build237.rb")
class Glibc_lib < Package
description 'glibc libraries'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'glibc_build235'
Package.load_package("#{__dir__}/glibc_build235.rb")
class Glibc_lib235 < Package
description 'glibc libraries'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'glibc_build237'
Package.load_package("#{__dir__}/glibc_build237.rb")
class Glibc_lib237 < Package
description 'glibc libraries'

View File

@@ -1,6 +1,6 @@
require 'package'
require_relative 'glibmm_2_4'
require_relative 'glibmm_2_68'
Package.load_package("#{__dir__}/glibmm_2_4.rb")
Package.load_package("#{__dir__}/glibmm_2_68.rb")
class Glibmm < Package
description Glibmm_2_4.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'gcloud'
Package.load_package("#{__dir__}/gcloud.rb")
class Google_cloud_sdk < Package
description Gcloud.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'gstreamer'
Package.load_package("#{__dir__}/gstreamer.rb")
class Gst_plugins_bad < Package
description 'Multimedia graph framework - bad plugins'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'gstreamer'
Package.load_package("#{__dir__}/gstreamer.rb")
class Gst_plugins_base < Package
description 'An essential, exemplary set of elements for GStreamer'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'gstreamer'
Package.load_package("#{__dir__}/gstreamer.rb")
class Gst_plugins_good < Package
description 'Multimedia graph framework - good plugins'

View File

@@ -1,7 +1,7 @@
require 'package'
require_relative 'gtksourceview_3'
require_relative 'gtksourceview_4'
require_relative 'gtksourceview_5'
Package.load_package("#{__dir__}/gtksourceview_3.rb")
Package.load_package("#{__dir__}/gtksourceview_4.rb")
Package.load_package("#{__dir__}/gtksourceview_5.rb")
class Gtksourceview < Package
description Gtksourceview_3.description

View File

@@ -1,5 +1,5 @@
require 'buildsystems/meson'
require_relative 'unicode_character_database'
Package.load_package("#{__dir__}/unicode_character_database.rb")
class Gucharmap < Meson
description 'GNOME Character Map, based on the Unicode Character Database.'

View File

@@ -1,7 +1,7 @@
require 'buildsystems/meson'
require_relative 'cairo'
require_relative 'fontconfig'
require_relative 'freetype'
Package.load_package("#{__dir__}/cairo.rb")
Package.load_package("#{__dir__}/fontconfig.rb")
Package.load_package("#{__dir__}/freetype.rb")
# build order: harfbuzz => freetype => fontconfig => cairo => pango
class Harfbuzz < Meson

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'py3_mercurial'
Package.load_package("#{__dir__}/py3_mercurial.rb")
class Hg < Package
description Py3_mercurial.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'hunspell_en_us'
Package.load_package("#{__dir__}/hunspell_en_us.rb")
class Hunspell < Package
description 'Hunspell is a spell checker and morphological analyzer library'

View File

@@ -1,6 +1,6 @@
require 'package'
require_relative 'imagemagick6'
require_relative 'imagemagick7'
Package.load_package("#{__dir__}/imagemagick6.rb")
Package.load_package("#{__dir__}/imagemagick7.rb")
class Imagemagick < Package
description Imagemagick7.description

View File

@@ -2,7 +2,7 @@
# https://github.com/archlinux/svntogit-packages/raw/packages/libclc/trunk/PKGBUILD
require 'package'
require_relative 'llvm18_build'
Package.load_package("#{__dir__}/llvm18_build.rb")
class Libclc < Package
description 'Library requirements of the OpenCL C programming language'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'curl'
Package.load_package("#{__dir__}/curl.rb")
class Libcurl < Package
description Curl.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'openssl'
Package.load_package("#{__dir__}/openssl.rb")
class Libressl < Package
description 'LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'gcc_build'
Package.load_package("#{__dir__}/gcc_build.rb")
class Libssp < Package
description 'Libssp is a part of the GCC toolkit.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'util_linux'
Package.load_package("#{__dir__}/util_linux.rb")
class Libuuid < Package
description 'Portable UUID C library. Bundled with util_linux.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'py3_libxml2'
Package.load_package("#{__dir__}/py3_libxml2.rb")
class Libxml2_python < Package
description Py3_libxml2.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'libxss'
Package.load_package("#{__dir__}/libxss.rb")
class Libxscrnsaver < Package
description Libxss.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'llvm18_build'
Package.load_package("#{__dir__}/llvm18_build.rb")
class Llvm < Package
description 'The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. The optional packages clang, lld, lldb, polly, compiler-rt, libcxx, and libcxxabi are included.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'llvm16_build'
Package.load_package("#{__dir__}/llvm16_build.rb")
class Llvm16_dev < Package
description 'LLVM: Everything except libLLVM & llvm-strip'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'llvm16_build'
Package.load_package("#{__dir__}/llvm16_build.rb")
class Llvm16_lib < Package
description 'LibLLVM and llvm-strip'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'llvm17_build'
Package.load_package("#{__dir__}/llvm17_build.rb")
class Llvm17_dev < Package
description 'LLVM: Everything except libLLVM & llvm-strip'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'llvm17_build'
Package.load_package("#{__dir__}/llvm17_build.rb")
class Llvm17_lib < Package
description 'LibLLVM and llvm-strip'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'llvm18_build'
Package.load_package("#{__dir__}/llvm18_build.rb")
class Llvm18_dev < Package
description 'LLVM: Everything except libLLVM & llvm-strip'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'llvm18_build'
Package.load_package("#{__dir__}/llvm18_build.rb")
class Llvm18_lib < Package
description 'LibLLVM and llvm-strip'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'llvm16_build'
Package.load_package("#{__dir__}/llvm16_build.rb")
class Llvm_build16 < Package
description 'The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. The optional packages clang, lld, lldb, polly, compiler-rt, libcxx, and libcxxabi are included.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'llvm16_build'
Package.load_package("#{__dir__}/llvm16_build.rb")
class Llvm_dev16 < Package
description 'The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. The optional packages clang, lld, lldb, polly, compiler-rt, libcxx, and libcxxabi are included.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'llvm16_build'
Package.load_package("#{__dir__}/llvm16_build.rb")
class Llvm_lib16 < Package
description 'The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. The optional packages clang, lld, lldb, polly, compiler-rt, libcxx, and libcxxabi are included.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'xzutils'
Package.load_package("#{__dir__}/xzutils.rb")
class Lzma < Package
description 'LZMA Utils are legacy data compression software with high compression ratio. Bundled with xzutils.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'zlibpkg'
Package.load_package("#{__dir__}/zlibpkg.rb")
class Minizip < Package
description 'Minizip is a simple package to zip/unzip files, from zlib.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'musl_cc_toolchain'
Package.load_package("#{__dir__}/musl_cc_toolchain.rb")
class Musl_toolchain < Package
description Musl_cc_toolchain.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'nodebrew'
Package.load_package("#{__dir__}/nodebrew.rb")
class Node < Package
description 'As an asynchronous event driven JavaScript runtime, Node is designed to build scalable network applications.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'nss'
Package.load_package("#{__dir__}/nss.rb")
class Nspr < Package
description 'Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc-like functions.'

View File

@@ -2,7 +2,7 @@
# https://github.com/archlinux/svntogit-packages/raw/packages/openmp/trunk/PKGBUILD
require 'package'
require_relative 'llvm18_build'
Package.load_package("#{__dir__}/llvm18_build.rb")
class Openmp < Package
description 'LLVM OpenMP Runtime Library'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'gstreamer'
Package.load_package("#{__dir__}/gstreamer.rb")
class Orc < Package
description 'Optimized Inner Loop Runtime Compiler. Bundled with gstreamer.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'pkg_7_zip'
Package.load_package("#{__dir__}/pkg_7_zip.rb")
class P7zip < Package
description Pkg_7_zip.description

View File

@@ -1,6 +1,6 @@
require 'package'
require_relative 'pangomm_1_4'
require_relative 'pangomm_2_48'
Package.load_package("#{__dir__}/pangomm_1_4.rb")
Package.load_package("#{__dir__}/pangomm_2_48.rb")
class Pangomm < Package
description Pangomm_1_4.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'moreutils'
Package.load_package("#{__dir__}/moreutils.rb")
class Parallel < Package
description 'Run multiple programs simultaneously. Bundled with moreutils.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'perl_unicode_linebreak'
Package.load_package("#{__dir__}/perl_unicode_linebreak.rb")
class Perl_gcstring_linebreak < Package
description 'UAX 14 Unicode Line Breaking Algorithm - Perl binding Unicode::LineBreak Unicode::GCString'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'perl_term_readkey'
Package.load_package("#{__dir__}/perl_term_readkey.rb")
class Perl_read_key < Package
description 'Term::ReadKey - A perl module for simple terminal control'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'perl'
Package.load_package("#{__dir__}/perl.rb")
class Perl_term_ansicolor < Package
description 'Character mode terminal access for Perl Term::ANSIColor'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'perl'
Package.load_package("#{__dir__}/perl.rb")
class Perl_time_hires < Package
description 'High resolution alarm, sleep, gettimeofday, interval timers Time::HiRes'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'perl_xml_sax'
Package.load_package("#{__dir__}/perl_xml_sax.rb")
class Perl_xml_sax_parserfactory < Package
description 'XML::SAX::ParserFactory is a factory class for providing an application with a Perl SAX2 XML parser.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'libxml2'
Package.load_package("#{__dir__}/libxml2.rb")
class Py3_libxml2 < Package
description 'Libxml2-python provides access to libxml2 and libxslt in Python.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'py3_pycairo'
Package.load_package("#{__dir__}/py3_pycairo.rb")
class Pycairo < Package
description Py3_pycairo.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'python2'
Package.load_package("#{__dir__}/python2.rb")
class Python27 < Package
description 'A compatibility package for python2.'

View File

@@ -3,7 +3,7 @@
# & LFS build documentation at https://www.linuxfromscratch.org/blfs/view/svn/x/qtwebengine.html
require 'package'
require_relative 'qt5_base'
Package.load_package("#{__dir__}/qt5_base.rb")
class Qt5_webengine < Package
description 'Provides support for web applications using the Chromium browser project'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'harfbuzz'
Package.load_package("#{__dir__}/harfbuzz.rb")
class Ragel < Package
description 'Ragel compiles executable finite state machines from regular languages. Now bundled with harfbuzz.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'py3_six'
Package.load_package("#{__dir__}/py3_six.rb")
class Six < Package
description Py3_six.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'perl_stow'
Package.load_package("#{__dir__}/perl_stow.rb")
class Stow < Package
description Perl_stow.description

View File

@@ -1,6 +1,6 @@
require 'package'
require_relative 'tepl_5'
require_relative 'tepl_6'
Package.load_package("#{__dir__}/tepl_5.rb")
Package.load_package("#{__dir__}/tepl_6.rb")
class Tepl < Package
description Tepl_5.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'tilp2'
Package.load_package("#{__dir__}/tilp2.rb")
class Tilp < Package
description Tilp2.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'wayland_info'
Package.load_package("#{__dir__}/wayland_info.rb")
class Wayland_utils < Package
description Wayland_info.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'webkit2gtk_4'
Package.load_package("#{__dir__}/webkit2gtk_4.rb")
class Webkit2gtk < Package
description Webkit2gtk_4.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'webkitgtk_6'
Package.load_package("#{__dir__}/webkitgtk_6.rb")
class Webkit2gtk_5 < Package
description Webkitgtk_6.description

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'libx11'
Package.load_package("#{__dir__}/libx11.rb")
class Xorg_lib < Package
description 'A collection of xorg libraries.'

View File

@@ -1,5 +1,5 @@
require 'package'
require_relative 'youtube_dl'
Package.load_package("#{__dir__}/youtube_dl.rb")
class Youtubedl < Package
description Youtube_dl.description