From 9a136cac4f4ab0d0487499b6685878d53acca7fc Mon Sep 17 00:00:00 2001 From: Maximilian Downey Twiss Date: Tue, 28 May 2024 09:09:35 +1000 Subject: [PATCH] Various package renames and fixes for version checking (#9856) * Rename aws to aws_cli * Rename ffcall to libffcall * Update filecmd homepage * Update go_bootstrap homepage * Update go homepage * Update bacon homepage * Rename jsonc to json_c * Update libffi homepage * Update libgd homepage * Rename libjpeg to libjpeg_turbo * Update libpng homepage * Rename mandb to man_db * Update mongodb homepage * Rename moonbuggy to moon_buggy * Update mpc homepage * Update netcat homepage * Update nethack4 homepage * Rename pkgconfig to pkg_config * Rename postgres to postgresql * Rename proj4 to proj * Update qemacs homepage * Update readline homepage * Update scrollz homepage * Update xzutils homepage * Update weather homepage --- lib/fixup.rb | 9 +++++++++ manifest/armv7l/a/{aws.filelist => aws_cli.filelist} | 0 manifest/armv7l/j/{jsonc.filelist => json_c.filelist} | 0 .../armv7l/{f/ffcall.filelist => l/libffcall.filelist} | 0 .../l/{libjpeg.filelist => libjpeg_turbo.filelist} | 0 manifest/armv7l/m/{mandb.filelist => man_db.filelist} | 0 .../armv7l/m/{moonbuggy.filelist => moon_buggy.filelist} | 0 .../armv7l/p/{pkgconfig.filelist => pkg_config.filelist} | 0 .../armv7l/p/{postgres.filelist => postgresql.filelist} | 0 manifest/armv7l/p/{proj4.filelist => proj.filelist} | 0 manifest/i686/a/{aws.filelist => aws_cli.filelist} | 0 manifest/i686/j/{jsonc.filelist => json_c.filelist} | 0 .../i686/{f/ffcall.filelist => l/libffcall.filelist} | 0 .../i686/l/{libjpeg.filelist => libjpeg_turbo.filelist} | 0 manifest/i686/m/{mandb.filelist => man_db.filelist} | 0 .../i686/m/{moonbuggy.filelist => moon_buggy.filelist} | 0 .../i686/p/{pkgconfig.filelist => pkg_config.filelist} | 0 manifest/i686/p/{proj4.filelist => proj.filelist} | 0 manifest/x86_64/a/{aws.filelist => aws_cli.filelist} | 0 manifest/x86_64/j/{jsonc.filelist => json_c.filelist} | 0 .../x86_64/{f/ffcall.filelist => l/libffcall.filelist} | 0 .../l/{libjpeg.filelist => libjpeg_turbo.filelist} | 0 manifest/x86_64/m/{mandb.filelist => man_db.filelist} | 0 .../x86_64/m/{moonbuggy.filelist => moon_buggy.filelist} | 0 .../x86_64/p/{pkgconfig.filelist => pkg_config.filelist} | 0 .../x86_64/p/{postgres.filelist => postgresql.filelist} | 0 manifest/x86_64/p/{proj4.filelist => proj.filelist} | 0 packages/ag.rb | 2 +- packages/appstream_glib.rb | 2 +- packages/{aws.rb => aws_cli.rb} | 2 +- packages/bacon.rb | 2 +- packages/bind.rb | 2 +- packages/buildessential.rb | 2 +- packages/clamav.rb | 2 +- packages/clisp.rb | 2 +- packages/core.rb | 2 +- packages/cryptsetup.rb | 2 +- packages/darktable.rb | 2 +- packages/devil.rb | 2 +- packages/djvulibre.rb | 2 +- packages/emacs.rb | 2 +- packages/ffmpeg.rb | 2 +- packages/ffmpegthumbnailer.rb | 2 +- packages/filecmd.rb | 2 +- packages/fontconfig.rb | 2 +- packages/freedos.rb | 2 +- packages/freerdp.rb | 2 +- packages/funny_manpages.rb | 2 +- packages/gcr_3.rb | 2 +- packages/gcr_4.rb | 2 +- packages/gdal.rb | 6 +++--- packages/gdk_pixbuf.rb | 2 +- packages/gegl.rb | 2 +- packages/gemacs.rb | 2 +- packages/ghostscript.rb | 2 +- packages/gimp.rb | 4 ++-- packages/girara.rb | 2 +- packages/glmark2.rb | 2 +- packages/gnome_autoar.rb | 2 +- packages/gnome_desktop.rb | 2 +- packages/gnuastro.rb | 2 +- packages/go.rb | 2 +- packages/go_bootstrap.rb | 2 +- packages/graphicsmagick.rb | 2 +- packages/gstreamer.rb | 4 ++-- packages/gtk2.rb | 2 +- packages/gtk3.rb | 2 +- packages/gtk4.rb | 2 +- packages/handbrake.rb | 2 +- packages/harfbuzz.rb | 2 +- packages/health_check.rb | 2 +- packages/hplip.rb | 2 +- packages/imagemagick7.rb | 2 +- packages/imlib2.rb | 2 +- packages/inkscape.rb | 2 +- packages/irrlicht.rb | 2 +- packages/jasper.rb | 2 +- packages/jp2a.rb | 2 +- packages/jpegoptim.rb | 2 +- packages/{jsonc.rb => json_c.rb} | 2 +- packages/leptonica.rb | 2 +- packages/libadwaita.rb | 2 +- packages/libavif.rb | 2 +- packages/libefl.rb | 2 +- packages/{ffcall.rb => libffcall.rb} | 2 +- packages/libffi.rb | 2 +- packages/libgd.rb | 2 +- packages/libgdiplus.rb | 2 +- packages/libgeotiff.rb | 2 +- packages/libgxps.rb | 2 +- packages/libhandy.rb | 2 +- packages/libheif.rb | 2 +- packages/libhubbub.rb | 2 +- packages/{libjpeg.rb => libjpeg_turbo.rb} | 2 +- packages/libjxl.rb | 2 +- packages/libmng.rb | 2 +- packages/libmypaint.rb | 2 +- packages/libnvme.rb | 2 +- packages/libpng.rb | 2 +- packages/libraw.rb | 2 +- packages/librsvg.rb | 2 +- packages/libsixel.rb | 2 +- packages/libspectre.rb | 2 +- packages/libtiff.rb | 2 +- packages/libvncserver.rb | 2 +- packages/libwebp.rb | 2 +- packages/libwmf.rb | 2 +- packages/libyuv.rb | 2 +- packages/links.rb | 2 +- packages/{mandb.rb => man_db.rb} | 2 +- packages/manpages.rb | 2 +- packages/mapserver.rb | 4 ++-- packages/metasploit.rb | 2 +- packages/mjpegtools.rb | 2 +- packages/mongodb.rb | 2 +- packages/{moonbuggy.rb => moon_buggy.rb} | 4 ++-- packages/motif.rb | 2 +- packages/mpc.rb | 2 +- packages/mpv.rb | 2 +- packages/mupdf.rb | 2 +- packages/nautilus.rb | 2 +- packages/ndctl.rb | 2 +- packages/netcat.rb | 2 +- packages/nethack4.rb | 2 +- packages/newsboat.rb | 2 +- packages/openjpeg.rb | 2 +- packages/php72.rb | 2 +- packages/php73.rb | 2 +- packages/php74.rb | 2 +- packages/php80.rb | 2 +- packages/php81.rb | 2 +- packages/php82.rb | 2 +- packages/php83.rb | 2 +- packages/{pkgconfig.rb => pkg_config.rb} | 4 ++-- packages/podofo.rb | 2 +- packages/poppler.rb | 2 +- packages/{postgres.rb => postgresql.rb} | 4 ++-- packages/progress.rb | 2 +- packages/{proj4.rb => proj.rb} | 6 +++--- packages/pulseaudio.rb | 2 +- packages/py3_pillow.rb | 2 +- packages/qemacs.rb | 2 +- packages/qemu.rb | 2 +- packages/qpdf.rb | 2 +- packages/qt5_base.rb | 2 +- packages/qt5_webengine.rb | 2 +- packages/r.rb | 2 +- packages/readline.rb | 2 +- packages/scrollz.rb | 2 +- packages/sdl2_image.rb | 2 +- packages/spice_gtk.rb | 2 +- packages/tesseract.rb | 2 +- packages/testdisk.rb | 2 +- packages/tracker3_miners.rb | 2 +- packages/v4l_utils.rb | 2 +- packages/weather.rb | 2 +- packages/webkit2gtk_4.rb | 2 +- packages/webkit2gtk_4_1.rb | 2 +- packages/webkitgtk_6.rb | 2 +- packages/weston.rb | 2 +- packages/wine.rb | 2 +- packages/wxwidgets.rb | 2 +- packages/wxwidgets30.rb | 2 +- packages/wxwidgets31.rb | 2 +- packages/xzutils.rb | 2 +- 165 files changed, 157 insertions(+), 148 deletions(-) rename manifest/armv7l/a/{aws.filelist => aws_cli.filelist} (100%) rename manifest/armv7l/j/{jsonc.filelist => json_c.filelist} (100%) rename manifest/armv7l/{f/ffcall.filelist => l/libffcall.filelist} (100%) rename manifest/armv7l/l/{libjpeg.filelist => libjpeg_turbo.filelist} (100%) rename manifest/armv7l/m/{mandb.filelist => man_db.filelist} (100%) rename manifest/armv7l/m/{moonbuggy.filelist => moon_buggy.filelist} (100%) rename manifest/armv7l/p/{pkgconfig.filelist => pkg_config.filelist} (100%) rename manifest/armv7l/p/{postgres.filelist => postgresql.filelist} (100%) rename manifest/armv7l/p/{proj4.filelist => proj.filelist} (100%) rename manifest/i686/a/{aws.filelist => aws_cli.filelist} (100%) rename manifest/i686/j/{jsonc.filelist => json_c.filelist} (100%) rename manifest/i686/{f/ffcall.filelist => l/libffcall.filelist} (100%) rename manifest/i686/l/{libjpeg.filelist => libjpeg_turbo.filelist} (100%) rename manifest/i686/m/{mandb.filelist => man_db.filelist} (100%) rename manifest/i686/m/{moonbuggy.filelist => moon_buggy.filelist} (100%) rename manifest/i686/p/{pkgconfig.filelist => pkg_config.filelist} (100%) rename manifest/i686/p/{proj4.filelist => proj.filelist} (100%) rename manifest/x86_64/a/{aws.filelist => aws_cli.filelist} (100%) rename manifest/x86_64/j/{jsonc.filelist => json_c.filelist} (100%) rename manifest/x86_64/{f/ffcall.filelist => l/libffcall.filelist} (100%) rename manifest/x86_64/l/{libjpeg.filelist => libjpeg_turbo.filelist} (100%) rename manifest/x86_64/m/{mandb.filelist => man_db.filelist} (100%) rename manifest/x86_64/m/{moonbuggy.filelist => moon_buggy.filelist} (100%) rename manifest/x86_64/p/{pkgconfig.filelist => pkg_config.filelist} (100%) rename manifest/x86_64/p/{postgres.filelist => postgresql.filelist} (100%) rename manifest/x86_64/p/{proj4.filelist => proj.filelist} (100%) rename packages/{aws.rb => aws_cli.rb} (98%) rename packages/{jsonc.rb => json_c.rb} (98%) rename packages/{ffcall.rb => libffcall.rb} (97%) rename packages/{libjpeg.rb => libjpeg_turbo.rb} (97%) rename packages/{mandb.rb => man_db.rb} (99%) rename packages/{moonbuggy.rb => moon_buggy.rb} (91%) rename packages/{pkgconfig.rb => pkg_config.rb} (96%) rename packages/{postgres.rb => postgresql.rb} (98%) rename packages/{proj4.rb => proj.rb} (70%) diff --git a/lib/fixup.rb b/lib/fixup.rb index ec4466e16..aea456c2e 100644 --- a/lib/fixup.rb +++ b/lib/fixup.rb @@ -28,9 +28,11 @@ pkg_update_arr = [ { pkg_name: 'agrind', pkg_rename: 'angle_grinder', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'apriconv', pkg_rename: 'apr_iconv', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'aprutil', pkg_rename: 'apr_util', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, + { pkg_name: 'aws', pkg_rename: 'aws_cli', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'bz2', pkg_rename: 'bzip2', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'bz3', pkg_rename: 'bzip3', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'codium', pkg_rename: 'vscodium', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, + { pkg_name: 'ffcall', pkg_rename: 'libffcall', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'git_prompt', pkg_rename: nil, pkg_deprecated: true, comments: 'Integrated into git package.' }, { pkg_name: 'gnome_session', pkg_rename: nil, pkg_deprecated: true, comments: 'No longer compatible with any architecture, requires systemd.' }, { pkg_name: 'gnome_settings_daemon', pkg_rename: nil, pkg_deprecated: true, comments: 'No longer compatible with any architecture, requires systemd.' }, @@ -38,11 +40,18 @@ pkg_update_arr = [ { pkg_name: 'gnome_tweaks', pkg_rename: nil, pkg_deprecated: true, comments: 'No longer compatible with any architecture, requires systemd in dep package gnome_settings_daemon.' }, { pkg_name: 'ilmbase', pkg_rename: nil, pkg_deprecated: true, comments: 'Included in openexr.' }, { pkg_name: 'js91', pkg_rename: nil, pkg_deprecated: true, comments: 'Replaced by newer versions of js.' }, + { pkg_name: 'jsonc', pkg_rename: 'json_c', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'libcurl', pkg_rename: 'curl', pkg_deprecated: nil, comments: nil }, + { pkg_name: 'libjpeg', pkg_rename: 'libjpeg_turbo', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'libmfx', pkg_rename: nil, pkg_deprecated: true, comments: 'No longer compatible with any architecture' }, + { pkg_name: 'mandb', pkg_rename: 'man_db', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'mercurial', pkg_rename: 'py3_mercurial', pkg_deprecated: nil, comments: 'Renamed to match other pip packages.' }, { pkg_name: 'meson', pkg_rename: 'mesonbuild', pkg_deprecated: nil, comments: 'Renamed to avoid conflict with buildsystems/meson.' }, + { pkg_name: 'moonbuggy', pkg_rename: 'moon_buggy', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'nping', pkg_rename: nil, pkg_deprecated: true, comments: 'Removed to avoid conflict with nmap.' }, + { pkg_name: 'pkgconfig', pkg_rename: 'pkg_config', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, + { pkg_name: 'postgres', pkg_rename: 'postgresql', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, + { pkg_name: 'proj4', pkg_rename: 'proj', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'qtbase', pkg_rename: 'qt5_base', pkg_deprecated: nil, comments: 'Qt packages renamed to qt5_*' }, { pkg_name: 'qtcharts', pkg_rename: 'qt5_charts', pkg_deprecated: nil, comments: nil }, { pkg_name: 'qtchooser', pkg_rename: nil, pkg_deprecated: true, comments: "Doesn't work for newer Qt versions." }, diff --git a/manifest/armv7l/a/aws.filelist b/manifest/armv7l/a/aws_cli.filelist similarity index 100% rename from manifest/armv7l/a/aws.filelist rename to manifest/armv7l/a/aws_cli.filelist diff --git a/manifest/armv7l/j/jsonc.filelist b/manifest/armv7l/j/json_c.filelist similarity index 100% rename from manifest/armv7l/j/jsonc.filelist rename to manifest/armv7l/j/json_c.filelist diff --git a/manifest/armv7l/f/ffcall.filelist b/manifest/armv7l/l/libffcall.filelist similarity index 100% rename from manifest/armv7l/f/ffcall.filelist rename to manifest/armv7l/l/libffcall.filelist diff --git a/manifest/armv7l/l/libjpeg.filelist b/manifest/armv7l/l/libjpeg_turbo.filelist similarity index 100% rename from manifest/armv7l/l/libjpeg.filelist rename to manifest/armv7l/l/libjpeg_turbo.filelist diff --git a/manifest/armv7l/m/mandb.filelist b/manifest/armv7l/m/man_db.filelist similarity index 100% rename from manifest/armv7l/m/mandb.filelist rename to manifest/armv7l/m/man_db.filelist diff --git a/manifest/armv7l/m/moonbuggy.filelist b/manifest/armv7l/m/moon_buggy.filelist similarity index 100% rename from manifest/armv7l/m/moonbuggy.filelist rename to manifest/armv7l/m/moon_buggy.filelist diff --git a/manifest/armv7l/p/pkgconfig.filelist b/manifest/armv7l/p/pkg_config.filelist similarity index 100% rename from manifest/armv7l/p/pkgconfig.filelist rename to manifest/armv7l/p/pkg_config.filelist diff --git a/manifest/armv7l/p/postgres.filelist b/manifest/armv7l/p/postgresql.filelist similarity index 100% rename from manifest/armv7l/p/postgres.filelist rename to manifest/armv7l/p/postgresql.filelist diff --git a/manifest/armv7l/p/proj4.filelist b/manifest/armv7l/p/proj.filelist similarity index 100% rename from manifest/armv7l/p/proj4.filelist rename to manifest/armv7l/p/proj.filelist diff --git a/manifest/i686/a/aws.filelist b/manifest/i686/a/aws_cli.filelist similarity index 100% rename from manifest/i686/a/aws.filelist rename to manifest/i686/a/aws_cli.filelist diff --git a/manifest/i686/j/jsonc.filelist b/manifest/i686/j/json_c.filelist similarity index 100% rename from manifest/i686/j/jsonc.filelist rename to manifest/i686/j/json_c.filelist diff --git a/manifest/i686/f/ffcall.filelist b/manifest/i686/l/libffcall.filelist similarity index 100% rename from manifest/i686/f/ffcall.filelist rename to manifest/i686/l/libffcall.filelist diff --git a/manifest/i686/l/libjpeg.filelist b/manifest/i686/l/libjpeg_turbo.filelist similarity index 100% rename from manifest/i686/l/libjpeg.filelist rename to manifest/i686/l/libjpeg_turbo.filelist diff --git a/manifest/i686/m/mandb.filelist b/manifest/i686/m/man_db.filelist similarity index 100% rename from manifest/i686/m/mandb.filelist rename to manifest/i686/m/man_db.filelist diff --git a/manifest/i686/m/moonbuggy.filelist b/manifest/i686/m/moon_buggy.filelist similarity index 100% rename from manifest/i686/m/moonbuggy.filelist rename to manifest/i686/m/moon_buggy.filelist diff --git a/manifest/i686/p/pkgconfig.filelist b/manifest/i686/p/pkg_config.filelist similarity index 100% rename from manifest/i686/p/pkgconfig.filelist rename to manifest/i686/p/pkg_config.filelist diff --git a/manifest/i686/p/proj4.filelist b/manifest/i686/p/proj.filelist similarity index 100% rename from manifest/i686/p/proj4.filelist rename to manifest/i686/p/proj.filelist diff --git a/manifest/x86_64/a/aws.filelist b/manifest/x86_64/a/aws_cli.filelist similarity index 100% rename from manifest/x86_64/a/aws.filelist rename to manifest/x86_64/a/aws_cli.filelist diff --git a/manifest/x86_64/j/jsonc.filelist b/manifest/x86_64/j/json_c.filelist similarity index 100% rename from manifest/x86_64/j/jsonc.filelist rename to manifest/x86_64/j/json_c.filelist diff --git a/manifest/x86_64/f/ffcall.filelist b/manifest/x86_64/l/libffcall.filelist similarity index 100% rename from manifest/x86_64/f/ffcall.filelist rename to manifest/x86_64/l/libffcall.filelist diff --git a/manifest/x86_64/l/libjpeg.filelist b/manifest/x86_64/l/libjpeg_turbo.filelist similarity index 100% rename from manifest/x86_64/l/libjpeg.filelist rename to manifest/x86_64/l/libjpeg_turbo.filelist diff --git a/manifest/x86_64/m/mandb.filelist b/manifest/x86_64/m/man_db.filelist similarity index 100% rename from manifest/x86_64/m/mandb.filelist rename to manifest/x86_64/m/man_db.filelist diff --git a/manifest/x86_64/m/moonbuggy.filelist b/manifest/x86_64/m/moon_buggy.filelist similarity index 100% rename from manifest/x86_64/m/moonbuggy.filelist rename to manifest/x86_64/m/moon_buggy.filelist diff --git a/manifest/x86_64/p/pkgconfig.filelist b/manifest/x86_64/p/pkg_config.filelist similarity index 100% rename from manifest/x86_64/p/pkgconfig.filelist rename to manifest/x86_64/p/pkg_config.filelist diff --git a/manifest/x86_64/p/postgres.filelist b/manifest/x86_64/p/postgresql.filelist similarity index 100% rename from manifest/x86_64/p/postgres.filelist rename to manifest/x86_64/p/postgresql.filelist diff --git a/manifest/x86_64/p/proj4.filelist b/manifest/x86_64/p/proj.filelist similarity index 100% rename from manifest/x86_64/p/proj4.filelist rename to manifest/x86_64/p/proj.filelist diff --git a/packages/ag.rb b/packages/ag.rb index 435e24bfc..f4bbf8bbe 100644 --- a/packages/ag.rb +++ b/packages/ag.rb @@ -19,7 +19,7 @@ class Ag < Package depends_on 'autoconf' => :build depends_on 'automake' => :build - depends_on 'pkgconfig' => :build + depends_on 'pkg_config' => :build depends_on 'pcre' depends_on 'xzutils' depends_on 'zlibpkg' diff --git a/packages/appstream_glib.rb b/packages/appstream_glib.rb index e176a6f26..3872b07f1 100644 --- a/packages/appstream_glib.rb +++ b/packages/appstream_glib.rb @@ -29,7 +29,7 @@ class Appstream_glib < Meson depends_on 'gtk_doc' => :build depends_on 'json_glib' depends_on 'libarchive' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libsoup' depends_on 'libsoup2' depends_on 'libstemmer' diff --git a/packages/aws.rb b/packages/aws_cli.rb similarity index 98% rename from packages/aws.rb rename to packages/aws_cli.rb index 971a60973..9dd17fd05 100644 --- a/packages/aws.rb +++ b/packages/aws_cli.rb @@ -1,6 +1,6 @@ require 'package' -class Aws < Package +class Aws_cli < Package description 'Universal Command Line Interface for Amazon Web Services' homepage 'https://github.com/aws/aws-cli' version '1.19.53' diff --git a/packages/bacon.rb b/packages/bacon.rb index f9a1282b7..c28c63f5e 100644 --- a/packages/bacon.rb +++ b/packages/bacon.rb @@ -2,7 +2,7 @@ require 'package' class Bacon < Package description 'BaCon is a free BASIC to C translator for Unix-based systems.' - homepage 'http://www.basic-converter.org/' + homepage 'https://chiselapp.com/user/bacon/repository/bacon/home' version '3.9.3' license 'MIT' compatibility 'all' diff --git a/packages/bind.rb b/packages/bind.rb index 89a7cacb1..db7663f53 100644 --- a/packages/bind.rb +++ b/packages/bind.rb @@ -21,7 +21,7 @@ class Bind < Autotools depends_on 'glibc' # R depends_on 'icu4c' => :build depends_on 'jemalloc' # R - depends_on 'jsonc' # R + depends_on 'json_c' # R depends_on 'krb5' # R depends_on 'libcap' # R depends_on 'libedit' # R diff --git a/packages/buildessential.rb b/packages/buildessential.rb index 7c9ae0403..39121f2c6 100644 --- a/packages/buildessential.rb +++ b/packages/buildessential.rb @@ -23,7 +23,7 @@ class Buildessential < Package depends_on 'libyaml' depends_on 'linuxheaders' depends_on 'make' - depends_on 'pkgconfig' + depends_on 'pkg_config' depends_on 'binutils' # Linkers diff --git a/packages/clamav.rb b/packages/clamav.rb index e4fa674a3..5f1a2bfd7 100644 --- a/packages/clamav.rb +++ b/packages/clamav.rb @@ -20,7 +20,7 @@ class Clamav < Package depends_on 'rust' => :build depends_on 'libcheck' => :build depends_on 'libiconv' => :build - depends_on 'jsonc' => :build + depends_on 'json_c' => :build depends_on 'py3_pytest' => :build def self.build diff --git a/packages/clisp.rb b/packages/clisp.rb index 28214f068..7dd474cda 100644 --- a/packages/clisp.rb +++ b/packages/clisp.rb @@ -15,7 +15,7 @@ class Clisp < Package x86_64: '7d64a5724ef656764f35ce48dca877a9f9e75842a1a420fde21d12c8bf2f5489' }) - depends_on 'ffcall' + depends_on 'libffcall' def self.build system './configure', diff --git a/packages/core.rb b/packages/core.rb index f81d2a6b6..8e87e34dc 100644 --- a/packages/core.rb +++ b/packages/core.rb @@ -57,7 +57,7 @@ class Core < Package depends_on 'lz4' depends_on 'lzip' depends_on 'm4' - depends_on 'mandb' + depends_on 'man_db' depends_on 'manpages' depends_on 'mawk' depends_on 'most' diff --git a/packages/cryptsetup.rb b/packages/cryptsetup.rb index f50d210d2..108489ba0 100644 --- a/packages/cryptsetup.rb +++ b/packages/cryptsetup.rb @@ -19,7 +19,7 @@ class Cryptsetup < Autotools depends_on 'util_linux' depends_on 'lvm2' - depends_on 'jsonc' + depends_on 'json_c' depends_on 'libgcrypt' depends_on 'popt' diff --git a/packages/darktable.rb b/packages/darktable.rb index b7a7348f3..5e66e6524 100644 --- a/packages/darktable.rb +++ b/packages/darktable.rb @@ -25,7 +25,7 @@ class Darktable < Package depends_on 'gtk3' depends_on 'imagemagick7' depends_on 'lcms' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libpng' depends_on 'librsvg' depends_on 'libsecret' diff --git a/packages/devil.rb b/packages/devil.rb index 02e7a144a..38a126f1e 100644 --- a/packages/devil.rb +++ b/packages/devil.rb @@ -21,7 +21,7 @@ class Devil < Package depends_on 'jasper' depends_on 'lcms' depends_on 'libglu' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libpng' depends_on 'libtiff' depends_on 'libxi' diff --git a/packages/djvulibre.rb b/packages/djvulibre.rb index 6c08df10e..d9d54c2e8 100644 --- a/packages/djvulibre.rb +++ b/packages/djvulibre.rb @@ -21,7 +21,7 @@ class Djvulibre < Package x86_64: '2d7e552fb69f2f0065b149be8046aaed7e6db3094b1f827fdd24454c2d5ddc9a' }) - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libtiff' depends_on 'librsvg' => :build depends_on 'gcc_lib' # R diff --git a/packages/emacs.rb b/packages/emacs.rb index 555686276..e3d058e72 100644 --- a/packages/emacs.rb +++ b/packages/emacs.rb @@ -17,7 +17,7 @@ class Emacs < Package }) depends_on 'lcms' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'acl' # R depends_on 'alsa_lib' # R depends_on 'dbus' # R diff --git a/packages/ffmpeg.rb b/packages/ffmpeg.rb index d779582a7..7e7ffac54 100644 --- a/packages/ffmpeg.rb +++ b/packages/ffmpeg.rb @@ -44,7 +44,7 @@ class Ffmpeg < Package depends_on 'libfrei0r' => :build depends_on 'libglvnd' # R depends_on 'libiec61883' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libjxl' # R depends_on 'libmodplug' # R depends_on 'libmp3lame' # R diff --git a/packages/ffmpegthumbnailer.rb b/packages/ffmpegthumbnailer.rb index 8de30f9cf..a306a6fef 100644 --- a/packages/ffmpegthumbnailer.rb +++ b/packages/ffmpegthumbnailer.rb @@ -19,7 +19,7 @@ class Ffmpegthumbnailer < Package depends_on 'ffmpeg' # R depends_on 'gcc_lib' # R depends_on 'glibc' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'zlibpkg' # R diff --git a/packages/filecmd.rb b/packages/filecmd.rb index 68a9d8b91..e5d658605 100644 --- a/packages/filecmd.rb +++ b/packages/filecmd.rb @@ -2,7 +2,7 @@ require 'package' class Filecmd < Package description 'file and libmagic determine file type' - homepage 'https://www.darwinsys.com/file/' + homepage 'https://darwinsys.com/file/' version '5.45-8dc5513' license 'BSD-2 and GPL-3+' # Chromebrew's filefix is GPL-3+, file itself is BSD-2 compatibility 'all' diff --git a/packages/fontconfig.rb b/packages/fontconfig.rb index f9fa916c6..e8540a854 100644 --- a/packages/fontconfig.rb +++ b/packages/fontconfig.rb @@ -24,7 +24,7 @@ class Fontconfig < Meson depends_on 'gperf' => :build depends_on 'graphite' => :build depends_on 'harfbuzz' # R - depends_on 'jsonc' => :build + depends_on 'json_c' => :build depends_on 'libpng' => :build depends_on 'util_linux' => :build diff --git a/packages/freedos.rb b/packages/freedos.rb index 9c3855bce..225f2dc29 100644 --- a/packages/freedos.rb +++ b/packages/freedos.rb @@ -9,7 +9,7 @@ class Freedos < Package source_url 'https://downloads.sourceforge.net/project/freedos/Kernel/2042/ke2042_86f32.zip' source_sha256 '460a6be669a24223e0b0ff7a92502624eb45d1271a535f345b24d5562b29b467' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'wayland_protocols' depends_on 'hicolor_icon_theme' depends_on 'gtk3' diff --git a/packages/freerdp.rb b/packages/freerdp.rb index f8de8b422..b73a96dd7 100644 --- a/packages/freerdp.rb +++ b/packages/freerdp.rb @@ -33,7 +33,7 @@ class Freerdp < Package depends_on 'icu4c' # R depends_on 'krb5' # R depends_on 'libfdk_aac' => :build - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libmp3lame' # R depends_on 'libsdl2' # R depends_on 'libsoxr' # R diff --git a/packages/funny_manpages.rb b/packages/funny_manpages.rb index 90a122a4e..758a85223 100644 --- a/packages/funny_manpages.rb +++ b/packages/funny_manpages.rb @@ -10,7 +10,7 @@ class Funny_manpages < Package source_url 'https://github.com/ltworf/funny-manpages.git' git_hashtag @_ver - depends_on 'mandb' + depends_on 'man_db' def self.install FileUtils.mkdir_p "#{CREW_DEST_MAN_PREFIX}/man1/" diff --git a/packages/gcr_3.rb b/packages/gcr_3.rb index 3b8f0496e..6bb1914e3 100644 --- a/packages/gcr_3.rb +++ b/packages/gcr_3.rb @@ -29,7 +29,7 @@ class Gcr_3 < Meson depends_on 'harfbuzz' # R depends_on 'hicolor_icon_theme' => :build depends_on 'libgcrypt' # R - depends_on 'libjpeg' => :build + depends_on 'libjpeg_turbo' => :build depends_on 'libsecret' # R depends_on 'libxslt' => :build depends_on 'p11kit' # R diff --git a/packages/gcr_4.rb b/packages/gcr_4.rb index c097ff279..a1396cf5a 100644 --- a/packages/gcr_4.rb +++ b/packages/gcr_4.rb @@ -28,7 +28,7 @@ class Gcr_4 < Meson depends_on 'gtk4' => :build depends_on 'hicolor_icon_theme' => :build depends_on 'libgcrypt' => :build - depends_on 'libjpeg' => :build + depends_on 'libjpeg_turbo' => :build depends_on 'libsecret' => :build depends_on 'libxslt' => :build depends_on 'p11kit' => :build diff --git a/packages/gdal.rb b/packages/gdal.rb index 3aa7b96c4..5ed52422c 100644 --- a/packages/gdal.rb +++ b/packages/gdal.rb @@ -24,11 +24,11 @@ class Gdal < CMake depends_on 'giflib' # R depends_on 'glibc' # R depends_on 'hdf5' # R - depends_on 'jsonc' # R + depends_on 'json_c' # R depends_on 'libarchive' # R depends_on 'libdeflate' # R depends_on 'libheif' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libjxl' # R depends_on 'libpng' # R depends_on 'libwebp' # R @@ -39,7 +39,7 @@ class Gdal < CMake depends_on 'openssl' # R depends_on 'pcre2' # R depends_on 'poppler' # R - depends_on 'proj4' # R + depends_on 'proj' # R depends_on 'py3_numpy' => :build depends_on 'qhull' # R depends_on 'sqlite' # R diff --git a/packages/gdk_pixbuf.rb b/packages/gdk_pixbuf.rb index c09138ceb..3eaf62578 100644 --- a/packages/gdk_pixbuf.rb +++ b/packages/gdk_pixbuf.rb @@ -20,7 +20,7 @@ class Gdk_pixbuf < Package depends_on 'glib' # R depends_on 'gobject_introspection' => :build depends_on 'harfbuzz' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libtiff' # R depends_on 'libwebp' # R depends_on 'pango' => :build diff --git a/packages/gegl.rb b/packages/gegl.rb index efbfc2d3a..1d2feec8a 100644 --- a/packages/gegl.rb +++ b/packages/gegl.rb @@ -31,7 +31,7 @@ class Gegl < Meson depends_on 'jasper' # R depends_on 'json_glib' # R depends_on 'lcms' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'librsvg' # R depends_on 'libsdl2' # R diff --git a/packages/gemacs.rb b/packages/gemacs.rb index 26a5f3784..6501988bd 100644 --- a/packages/gemacs.rb +++ b/packages/gemacs.rb @@ -37,7 +37,7 @@ class Gemacs < Package depends_on 'jansson' # R depends_on 'lcms' # R depends_on 'libice' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libotf' # R depends_on 'libpng' # R depends_on 'librsvg' # R diff --git a/packages/ghostscript.rb b/packages/ghostscript.rb index fc37cdf31..b074e3c8d 100644 --- a/packages/ghostscript.rb +++ b/packages/ghostscript.rb @@ -32,7 +32,7 @@ class Ghostscript < Package depends_on 'lcms' # R depends_on 'libarchive' # R depends_on 'libice' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpaper' # R depends_on 'libpng' # R depends_on 'libsm' # R diff --git a/packages/gimp.rb b/packages/gimp.rb index 0d6ccba8a..3936e7883 100644 --- a/packages/gimp.rb +++ b/packages/gimp.rb @@ -41,7 +41,7 @@ class Gimp < Meson depends_on 'gobject_introspection' # R depends_on 'gtk3' # R depends_on 'harfbuzz' # R - depends_on 'jsonc' => :build + depends_on 'json_c' => :build depends_on 'json_glib' # R depends_on 'lcms' # R depends_on 'libarchive' # R @@ -50,7 +50,7 @@ class Gimp < Meson depends_on 'libgudev' # R depends_on 'libheif' # R depends_on 'libice' => :build - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libjxl' # R depends_on 'libmng' # R depends_on 'libmypaint' # R diff --git a/packages/girara.rb b/packages/girara.rb index 6eb2a719f..2f6727509 100644 --- a/packages/girara.rb +++ b/packages/girara.rb @@ -18,6 +18,6 @@ class Girara < Meson depends_on 'gtk3' depends_on 'glib' - depends_on 'jsonc' + depends_on 'json_c' depends_on 'json_glib' end diff --git a/packages/glmark2.rb b/packages/glmark2.rb index cf8c6c14a..0e5062512 100644 --- a/packages/glmark2.rb +++ b/packages/glmark2.rb @@ -22,7 +22,7 @@ class Glmark2 < Package depends_on 'gcc_lib' # R depends_on 'glibc' # R depends_on 'libdrm' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libpng' depends_on 'libx11' depends_on 'libxcb' diff --git a/packages/gnome_autoar.rb b/packages/gnome_autoar.rb index 6c1c1a7c3..2d0efb0fd 100644 --- a/packages/gnome_autoar.rb +++ b/packages/gnome_autoar.rb @@ -27,7 +27,7 @@ class Gnome_autoar < Meson depends_on 'gtk_doc' => :build depends_on 'harfbuzz' # R depends_on 'libarchive' # R - depends_on 'libjpeg' => :build + depends_on 'libjpeg_turbo' => :build depends_on 'pango' # R depends_on 'vala' => :build depends_on 'zlibpkg' # R diff --git a/packages/gnome_desktop.rb b/packages/gnome_desktop.rb index 0163e43a9..8adedd5da 100644 --- a/packages/gnome_desktop.rb +++ b/packages/gnome_desktop.rb @@ -29,7 +29,7 @@ class Gnome_desktop < Meson depends_on 'gtk_doc' => :build depends_on 'harfbuzz' # R depends_on 'iso_codes' => :build - depends_on 'libjpeg' => :build + depends_on 'libjpeg_turbo' => :build depends_on 'libseccomp' # R depends_on 'libxkbcommon' # R depends_on 'libxkbfile' => :build diff --git a/packages/gnuastro.rb b/packages/gnuastro.rb index a1638358b..a152ce244 100644 --- a/packages/gnuastro.rb +++ b/packages/gnuastro.rb @@ -23,7 +23,7 @@ class Gnuastro < Autotools depends_on 'glibc' depends_on 'gsl' depends_on 'libgit2' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libtiff' depends_on 'wcslib' depends_on 'xzutils' diff --git a/packages/go.rb b/packages/go.rb index 6435eec5d..4cbc43e25 100644 --- a/packages/go.rb +++ b/packages/go.rb @@ -2,7 +2,7 @@ require 'package' class Go < Package description 'Go is an open source programming language that makes it easy to build simple, reliable, and efficient software.' - homepage 'https://golang.org/' + homepage 'https://go.dev' version '1.22.3' license 'BSD' compatibility 'all' diff --git a/packages/go_bootstrap.rb b/packages/go_bootstrap.rb index 5b200f875..ce61a9411 100644 --- a/packages/go_bootstrap.rb +++ b/packages/go_bootstrap.rb @@ -2,7 +2,7 @@ require 'package' class Go_bootstrap < Package description 'Bootstrap tool chain for the Go programming language.' - homepage 'https://golang.org/' + homepage 'https://go.dev' version '1.4-1' license 'BSD' compatibility 'all' diff --git a/packages/graphicsmagick.rb b/packages/graphicsmagick.rb index eba2dbc60..80f9f69d0 100644 --- a/packages/graphicsmagick.rb +++ b/packages/graphicsmagick.rb @@ -33,7 +33,7 @@ class Graphicsmagick < Package depends_on 'libdeflate' # R depends_on 'libheif' # R depends_on 'libice' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libjxl' # R depends_on 'libmd' # R depends_on 'libpng' # R diff --git a/packages/gstreamer.rb b/packages/gstreamer.rb index 81f59b671..2f841fedc 100644 --- a/packages/gstreamer.rb +++ b/packages/gstreamer.rb @@ -59,8 +59,8 @@ class Gstreamer < Meson depends_on 'libglvnd' # R depends_on 'libgudev' # R depends_on 'libiec61883' # R - depends_on 'libjpeg' - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' + depends_on 'libjpeg_turbo' # R depends_on 'libmodplug' # R depends_on 'libmp3lame' # R depends_on 'libogg' # R diff --git a/packages/gtk2.rb b/packages/gtk2.rb index 3b89ec482..3e3962082 100644 --- a/packages/gtk2.rb +++ b/packages/gtk2.rb @@ -25,7 +25,7 @@ class Gtk2 < Package depends_on 'glib' depends_on 'gtk_doc' depends_on 'harfbuzz' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libx11' depends_on 'libxcomposite' depends_on 'libxcursor' diff --git a/packages/gtk3.rb b/packages/gtk3.rb index 764caa959..b8a41c0cc 100644 --- a/packages/gtk3.rb +++ b/packages/gtk3.rb @@ -41,7 +41,7 @@ class Gtk3 < Meson depends_on 'json_glib' => :build depends_on 'libdeflate' => :build # Do we need this? depends_on 'libepoxy' # R - depends_on 'libjpeg' => :build # Do we need this? + depends_on 'libjpeg_turbo' => :build # Do we need this? depends_on 'librsvg' # L depends_on 'libsass' => :build depends_on 'libspectre' => :build diff --git a/packages/gtk4.rb b/packages/gtk4.rb index 0fe0cbd51..dafd1dadf 100644 --- a/packages/gtk4.rb +++ b/packages/gtk4.rb @@ -41,7 +41,7 @@ class Gtk4 < Meson depends_on 'iso_codes' => :build depends_on 'libcloudproviders' # R depends_on 'libepoxy' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'librsvg' # L depends_on 'libsass' => :build diff --git a/packages/handbrake.rb b/packages/handbrake.rb index 945e95550..b00f879ca 100644 --- a/packages/handbrake.rb +++ b/packages/handbrake.rb @@ -35,7 +35,7 @@ class Handbrake < Package depends_on 'libass' # R depends_on 'libdvdcss' depends_on 'libgudev' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libmp3lame' # R depends_on 'libogg' # R depends_on 'libpng' # R diff --git a/packages/harfbuzz.rb b/packages/harfbuzz.rb index ced08e8cb..7c3f90985 100644 --- a/packages/harfbuzz.rb +++ b/packages/harfbuzz.rb @@ -33,7 +33,7 @@ class Harfbuzz < Meson depends_on 'gperf' => :build depends_on 'graphite' # R depends_on 'icu4c' # R - depends_on 'jsonc' => :build + depends_on 'json_c' => :build depends_on 'libffi' => :build depends_on 'libpng' # R depends_on 'libx11' # R diff --git a/packages/health_check.rb b/packages/health_check.rb index 06c8431bd..7a169c37b 100644 --- a/packages/health_check.rb +++ b/packages/health_check.rb @@ -17,7 +17,7 @@ class Health_check < Package x86_64: '7cbdce7237b0d8a6dcfeabf7cc143c08111af98875e83cb441346769cdbfa033' }) - depends_on 'jsonc' + depends_on 'json_c' def self.build system 'make' diff --git a/packages/hplip.rb b/packages/hplip.rb index 2e4bb41f5..170590673 100644 --- a/packages/hplip.rb +++ b/packages/hplip.rb @@ -16,7 +16,7 @@ class Hplip < Package depends_on 'cups' depends_on 'dbus' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'sane_backends' depends_on 'gcc_lib' # R depends_on 'glibc' # R diff --git a/packages/imagemagick7.rb b/packages/imagemagick7.rb index e5415cb80..8e1c062b5 100644 --- a/packages/imagemagick7.rb +++ b/packages/imagemagick7.rb @@ -39,7 +39,7 @@ class Imagemagick7 < Autotools depends_on 'libdeflate' # R depends_on 'libheif' # R depends_on 'libice' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libjxl' # R depends_on 'libmd' # R depends_on 'libpng' # R diff --git a/packages/imlib2.rb b/packages/imlib2.rb index 07b7fd8d9..137fff26e 100644 --- a/packages/imlib2.rb +++ b/packages/imlib2.rb @@ -21,7 +21,7 @@ class Imlib2 < Package depends_on 'giflib' depends_on 'libid3tag' depends_on 'libheif' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libjxl' depends_on 'libtiff' depends_on 'libx11' diff --git a/packages/inkscape.rb b/packages/inkscape.rb index b8fd48c60..0b06fd68d 100644 --- a/packages/inkscape.rb +++ b/packages/inkscape.rb @@ -45,7 +45,7 @@ class Inkscape < CMake depends_on 'libcdr' # R depends_on 'libepoxy' # R depends_on 'libice' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'librevenge' # R depends_on 'libsigcplusplus' # R diff --git a/packages/irrlicht.rb b/packages/irrlicht.rb index 52dffeeaa..1d8f8ed9c 100644 --- a/packages/irrlicht.rb +++ b/packages/irrlicht.rb @@ -19,7 +19,7 @@ class Irrlicht < Package depends_on 'libxrandr' depends_on 'libglvnd' depends_on 'libxxf86vm' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libpng' depends_on 'dos2unix' => :build depends_on 'bzip2' # R diff --git a/packages/jasper.rb b/packages/jasper.rb index 46485965a..e8a7dacf4 100644 --- a/packages/jasper.rb +++ b/packages/jasper.rb @@ -18,7 +18,7 @@ class Jasper < Package depends_on 'freeglut' depends_on 'libglu' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'mesa' depends_on 'shared_mime_info' depends_on 'gcc_lib' # R diff --git a/packages/jp2a.rb b/packages/jp2a.rb index 732e8b8cd..b567fd75f 100644 --- a/packages/jp2a.rb +++ b/packages/jp2a.rb @@ -19,7 +19,7 @@ class Jp2a < Autotools depends_on 'curl' # R depends_on 'glibc' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'ncurses' # R depends_on 'termcap' # R diff --git a/packages/jpegoptim.rb b/packages/jpegoptim.rb index 7d7b39818..2633bf766 100644 --- a/packages/jpegoptim.rb +++ b/packages/jpegoptim.rb @@ -17,7 +17,7 @@ class Jpegoptim < Package x86_64: '0954751ef6aada53613c24fba136c5a2257c64338ad972e6bc07597041d0bddc' }) - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' def self.build system "./configure #{CREW_OPTIONS}" diff --git a/packages/jsonc.rb b/packages/json_c.rb similarity index 98% rename from packages/jsonc.rb rename to packages/json_c.rb index 285430d15..e58f1042b 100644 --- a/packages/jsonc.rb +++ b/packages/json_c.rb @@ -1,6 +1,6 @@ require 'buildsystems/cmake' -class Jsonc < CMake +class Json_c < CMake description 'JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects.' homepage 'https://github.com/json-c/json-c' version '0.17-20230812' diff --git a/packages/leptonica.rb b/packages/leptonica.rb index 481883d01..c72319c1d 100644 --- a/packages/leptonica.rb +++ b/packages/leptonica.rb @@ -20,7 +20,7 @@ class Leptonica < Package depends_on 'glibc' # R depends_on 'harfbuzz' => :build depends_on 'libdeflate' => :build - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'libtiff' # R depends_on 'libwebp' # R diff --git a/packages/libadwaita.rb b/packages/libadwaita.rb index a33cd2a3c..e7516fd18 100644 --- a/packages/libadwaita.rb +++ b/packages/libadwaita.rb @@ -29,7 +29,7 @@ class Libadwaita < Meson depends_on 'graphene' # R depends_on 'gtk4' # R depends_on 'harfbuzz' => :build - depends_on 'libjpeg' => :build + depends_on 'libjpeg_turbo' => :build depends_on 'libsass' => :build depends_on 'libxml2' # R depends_on 'libyaml' # R diff --git a/packages/libavif.rb b/packages/libavif.rb index 95bacae64..637eca2e2 100644 --- a/packages/libavif.rb +++ b/packages/libavif.rb @@ -23,7 +23,7 @@ class Libavif < CMake depends_on 'glibc' # R depends_on 'glib' # R depends_on 'libaom' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'libtiff' # L depends_on 'libwebp' # R diff --git a/packages/libefl.rb b/packages/libefl.rb index 80412fcff..e5ad51abb 100644 --- a/packages/libefl.rb +++ b/packages/libefl.rb @@ -22,7 +22,7 @@ class Libefl < Package depends_on 'libusb' depends_on 'fontconfig' depends_on 'fribidi' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libpng' depends_on 'giflib' depends_on 'libtiff' diff --git a/packages/ffcall.rb b/packages/libffcall.rb similarity index 97% rename from packages/ffcall.rb rename to packages/libffcall.rb index c7b2a3a8b..e6ee94eac 100644 --- a/packages/ffcall.rb +++ b/packages/libffcall.rb @@ -1,6 +1,6 @@ require 'package' -class Ffcall < Package +class Libffcall < Package description 'GNU libffcall is a library which can be used to build foreign function call interfaces in embedded interpreters.' homepage 'https://www.gnu.org/software/libffcall/' version '2.0' diff --git a/packages/libffi.rb b/packages/libffi.rb index 1370d5458..e53da06df 100644 --- a/packages/libffi.rb +++ b/packages/libffi.rb @@ -2,7 +2,7 @@ require 'package' class Libffi < Package description 'The libffi library provides a portable, high level programming interface to various calling conventions.' - homepage 'https://github.com/libffi/libffi/' + homepage 'https://sourceware.org/libffi/' version '3.4.4' license 'MIT' compatibility 'all' diff --git a/packages/libgd.rb b/packages/libgd.rb index 5efa11e84..07de3199c 100644 --- a/packages/libgd.rb +++ b/packages/libgd.rb @@ -2,7 +2,7 @@ require 'package' class Libgd < Package description 'GD is an open source code library for the dynamic creation of images by programmers.' - homepage 'https://libgd.org/' + homepage 'https://libgd.github.io/' version '2.3.3' license 'custom' compatibility 'all' diff --git a/packages/libgdiplus.rb b/packages/libgdiplus.rb index c1707f57a..8315c5e53 100644 --- a/packages/libgdiplus.rb +++ b/packages/libgdiplus.rb @@ -25,7 +25,7 @@ class Libgdiplus < Package depends_on 'graphite' depends_on 'imake' => :build depends_on 'libexif' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libpng' depends_on 'libtiff' depends_on 'libwebp' diff --git a/packages/libgeotiff.rb b/packages/libgeotiff.rb index 80cd33f3c..973fa359c 100644 --- a/packages/libgeotiff.rb +++ b/packages/libgeotiff.rb @@ -20,7 +20,7 @@ class Libgeotiff < Package depends_on 'gcc_lib' # R depends_on 'glibc' # R depends_on 'libtiff' # R - depends_on 'proj4' # R + depends_on 'proj' # R def self.build system "cmake -B builddir -G Ninja \ diff --git a/packages/libgxps.rb b/packages/libgxps.rb index 810f57a30..b26b71537 100644 --- a/packages/libgxps.rb +++ b/packages/libgxps.rb @@ -29,7 +29,7 @@ class Libgxps < Meson depends_on 'gtk_doc' => :build depends_on 'lcms' depends_on 'libarchive' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libpaper' depends_on 'libpng' depends_on 'libtiff' diff --git a/packages/libhandy.rb b/packages/libhandy.rb index 51d3b6cdb..a45102395 100644 --- a/packages/libhandy.rb +++ b/packages/libhandy.rb @@ -26,7 +26,7 @@ class Libhandy < Meson depends_on 'glib' # R depends_on 'gtk3' # R depends_on 'harfbuzz' # R - depends_on 'libjpeg' => :build + depends_on 'libjpeg_turbo' => :build depends_on 'pango' # R depends_on 'vala' => :build depends_on 'zlibpkg' => :build diff --git a/packages/libheif.rb b/packages/libheif.rb index 420733b53..9fa013ebf 100644 --- a/packages/libheif.rb +++ b/packages/libheif.rb @@ -25,7 +25,7 @@ class Libheif < Package depends_on 'graphviz' => :build # Only needed for dot. depends_on 'libaom' # R depends_on 'libde265' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'libtiff' # L depends_on 'libwebp' # R diff --git a/packages/libhubbub.rb b/packages/libhubbub.rb index d92419ba7..f00d8edb8 100644 --- a/packages/libhubbub.rb +++ b/packages/libhubbub.rb @@ -18,7 +18,7 @@ class Libhubbub < Package }) depends_on 'libxslt' - depends_on 'jsonc' + depends_on 'json_c' depends_on 'libparserutils' def self.build diff --git a/packages/libjpeg.rb b/packages/libjpeg_turbo.rb similarity index 97% rename from packages/libjpeg.rb rename to packages/libjpeg_turbo.rb index 5a649fb66..c38074391 100644 --- a/packages/libjpeg.rb +++ b/packages/libjpeg_turbo.rb @@ -1,6 +1,6 @@ require 'package' -class Libjpeg < Package +class Libjpeg_turbo < Package description 'Libjpeg-turbo implements both the traditional libjpeg API as well as the less powerful but more straightforward TurboJPEG API.' homepage 'https://libjpeg-turbo.org' version '3.0.1' diff --git a/packages/libjxl.rb b/packages/libjxl.rb index 292cd574a..772f46780 100644 --- a/packages/libjxl.rb +++ b/packages/libjxl.rb @@ -33,7 +33,7 @@ class Libjxl < Package depends_on 'harfbuzz' => :build depends_on 'highway' # R depends_on 'json_glib' => :build - depends_on 'libjpeg' # R This needs to be turbo. + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'openexr' # R depends_on 'pango' => :build diff --git a/packages/libmng.rb b/packages/libmng.rb index ee4f0c771..484db8e00 100644 --- a/packages/libmng.rb +++ b/packages/libmng.rb @@ -18,7 +18,7 @@ class Libmng < Autotools }) depends_on 'lcms' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'glibc' # R depends_on 'zlibpkg' # R diff --git a/packages/libmypaint.rb b/packages/libmypaint.rb index 4346ac5f1..0362c1e9a 100644 --- a/packages/libmypaint.rb +++ b/packages/libmypaint.rb @@ -18,7 +18,7 @@ class Libmypaint < Package }) depends_on 'gegl' - depends_on 'jsonc' + depends_on 'json_c' depends_on 'openmp' depends_on 'babl' # R depends_on 'gcc_lib' # R diff --git a/packages/libnvme.rb b/packages/libnvme.rb index f15ffeb5f..fe260761b 100644 --- a/packages/libnvme.rb +++ b/packages/libnvme.rb @@ -17,7 +17,7 @@ class Libnvme < Package x86_64: '29c8f05ab437e44302ea683763a4fec9d67f2bef1d1bcd92db473b5df01d851d' }) - depends_on 'jsonc' => :build + depends_on 'json_c' => :build depends_on 'ninja' => :build depends_on 'openssl' => :build depends_on 'swig' => :build diff --git a/packages/libpng.rb b/packages/libpng.rb index 4c4d22b2c..58f01b08b 100644 --- a/packages/libpng.rb +++ b/packages/libpng.rb @@ -2,7 +2,7 @@ require 'package' class Libpng < Package description 'libpng is the official PNG reference library.' - homepage 'http://libpng.org/pub/png/libpng.html' + homepage 'http://www.libpng.org/pub/png/libpng.html' version '1.6.43' license 'libpng2' compatibility 'all' diff --git a/packages/libraw.rb b/packages/libraw.rb index 04f25f9b6..2b9428542 100644 --- a/packages/libraw.rb +++ b/packages/libraw.rb @@ -21,7 +21,7 @@ class Libraw < Package depends_on 'openmp' depends_on 'gcc_lib' # R depends_on 'glibc' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'zlibpkg' # R def self.build diff --git a/packages/librsvg.rb b/packages/librsvg.rb index 1fb658080..4dc602a22 100644 --- a/packages/librsvg.rb +++ b/packages/librsvg.rb @@ -29,7 +29,7 @@ class Librsvg < Autotools depends_on 'harfbuzz' # R depends_on 'icu4c' # R depends_on 'libcroco' => :build - depends_on 'libjpeg' => :build + depends_on 'libjpeg_turbo' => :build depends_on 'libpng' # R depends_on 'libxml2' # R depends_on 'pango' # R diff --git a/packages/libsixel.rb b/packages/libsixel.rb index aac97ffe6..2474135b7 100644 --- a/packages/libsixel.rb +++ b/packages/libsixel.rb @@ -19,7 +19,7 @@ class Libsixel < Package x86_64: '16d7382c5229870d3954338748174d402db8542408b33bea49e6c3066a9c942a' }) - depends_on 'libjpeg' => :build + depends_on 'libjpeg_turbo' => :build depends_on 'libpng' => :build depends_on 'python3' => :build depends_on 'gdk_pixbuf' => :build diff --git a/packages/libspectre.rb b/packages/libspectre.rb index b16079231..6753126d1 100644 --- a/packages/libspectre.rb +++ b/packages/libspectre.rb @@ -17,7 +17,7 @@ class Libspectre < Package }) depends_on 'ghostscript' # = libgs - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'gcc_lib' # R depends_on 'glibc' # R diff --git a/packages/libtiff.rb b/packages/libtiff.rb index 54ded28de..8aad2cbea 100644 --- a/packages/libtiff.rb +++ b/packages/libtiff.rb @@ -26,7 +26,7 @@ class Libtiff < Package depends_on 'libglu' unless ARCH == 'i686' # R depends_on 'libglvnd' unless ARCH == 'i686' # R depends_on 'libice' unless ARCH == 'i686' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libsm' unless ARCH == 'i686' # R depends_on 'libwebp' unless ARCH == 'i686' # R depends_on 'libx11' unless ARCH == 'i686' # R diff --git a/packages/libvncserver.rb b/packages/libvncserver.rb index 90d5825d2..197df178a 100644 --- a/packages/libvncserver.rb +++ b/packages/libvncserver.rb @@ -22,7 +22,7 @@ class Libvncserver < Package depends_on 'gtk2' => :build depends_on 'libcyrussasl' # R depends_on 'libgcrypt' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'lzo' # R depends_on 'openssl' # R diff --git a/packages/libwebp.rb b/packages/libwebp.rb index 8af5aac6b..eee86070b 100644 --- a/packages/libwebp.rb +++ b/packages/libwebp.rb @@ -25,7 +25,7 @@ class Libwebp < Package depends_on 'libglu' # R depends_on 'libglvnd' # R depends_on 'libice' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'libsdl' => :build depends_on 'libsm' # R diff --git a/packages/libwmf.rb b/packages/libwmf.rb index b9c638e11..44c4d77d5 100644 --- a/packages/libwmf.rb +++ b/packages/libwmf.rb @@ -23,7 +23,7 @@ class Libwmf < Autotools depends_on 'glib' # R depends_on 'libbsd' # R depends_on 'libgd' => :build - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libmd' # R depends_on 'libpng' # R depends_on 'libx11' # R diff --git a/packages/libyuv.rb b/packages/libyuv.rb index 17db210b9..5cb84a359 100644 --- a/packages/libyuv.rb +++ b/packages/libyuv.rb @@ -19,7 +19,7 @@ class Libyuv < CMake depends_on 'gcc_lib' # R depends_on 'glibc_lib' # R depends_on 'glibc' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R def self.patch system "sed -i 's,DESTINATION lib,DESTINATION lib#{CREW_LIB_SUFFIX},g' CMakeLists.txt" diff --git a/packages/links.rb b/packages/links.rb index d5bc7a822..7903ee0ed 100644 --- a/packages/links.rb +++ b/packages/links.rb @@ -21,7 +21,7 @@ class Links < Package depends_on 'bzip2' depends_on 'glibc' # R depends_on 'libbsd' # R - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libpng' depends_on 'lzma' depends_on 'openssl' diff --git a/packages/mandb.rb b/packages/man_db.rb similarity index 99% rename from packages/mandb.rb rename to packages/man_db.rb index eaa1f0a99..0c60c7a7c 100644 --- a/packages/mandb.rb +++ b/packages/man_db.rb @@ -1,6 +1,6 @@ require 'package' -class Mandb < Package +class Man_db < Package description 'mandb is used to initialize or manually update index database caches that are usually maintained by man.' homepage 'https://man-db.nongnu.org/' version '2.12.1' diff --git a/packages/manpages.rb b/packages/manpages.rb index 74bf3c552..d0d6fbba6 100644 --- a/packages/manpages.rb +++ b/packages/manpages.rb @@ -17,7 +17,7 @@ class Manpages < Package x86_64: '812d7acf982fd98946aba5132a08685a950d7e6bddfd8ba9e4b45b4ed3b38b29' }) - depends_on 'mandb' + depends_on 'man_db' def self.install system 'make', "DESTDIR=#{CREW_DEST_DIR}", "prefix=#{CREW_PREFIX}", 'install' diff --git a/packages/mapserver.rb b/packages/mapserver.rb index 19b54174d..4cc424e4d 100644 --- a/packages/mapserver.rb +++ b/packages/mapserver.rb @@ -24,8 +24,8 @@ class Mapserver < Package depends_on 'geos' depends_on 'glib' depends_on 'harfbuzz' - depends_on 'libjpeg' - depends_on 'proj4' + depends_on 'libjpeg_turbo' + depends_on 'proj' depends_on 'freetype' # R depends_on 'gcc_lib' # R depends_on 'glibc' # R diff --git a/packages/metasploit.rb b/packages/metasploit.rb index d6ca12a7f..d959c6a2c 100644 --- a/packages/metasploit.rb +++ b/packages/metasploit.rb @@ -15,7 +15,7 @@ class Metasploit < Package depends_on 'readline' depends_on 'openssl' depends_on 'libpcap' - depends_on 'postgres' + depends_on 'postgresql' depends_on 'sqlite' depends_on 'libxslt' depends_on 'libxml2' diff --git a/packages/mjpegtools.rb b/packages/mjpegtools.rb index 763d86770..bcf4d6701 100644 --- a/packages/mjpegtools.rb +++ b/packages/mjpegtools.rb @@ -17,7 +17,7 @@ class Mjpegtools < Package }) depends_on 'libdv' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libpng' depends_on 'libsdl' depends_on 'libsdl2' diff --git a/packages/mongodb.rb b/packages/mongodb.rb index 77e5fdbfc..bd3936992 100644 --- a/packages/mongodb.rb +++ b/packages/mongodb.rb @@ -2,7 +2,7 @@ require 'package' class Mongodb < Package description 'MongoDB is the next-generation database that lets you create applications never before possible.' - homepage 'https://www.mongodb.com/' + homepage 'https://www.mongodb.com' # We use 3.2 branch here since: # - 3.2 branch works well with gcc-4.9.4 # - master 3.4 branch requires gcc-5.4.0 diff --git a/packages/moonbuggy.rb b/packages/moon_buggy.rb similarity index 91% rename from packages/moonbuggy.rb rename to packages/moon_buggy.rb index 3060e7d93..69203a0f1 100644 --- a/packages/moonbuggy.rb +++ b/packages/moon_buggy.rb @@ -1,8 +1,8 @@ require 'package' -class Moonbuggy < Package +class Moon_buggy < Package description 'Moon-buggy is a simple character graphics game where you drive some kind of car across the moon\'s surface.' - homepage 'http://www.seehuhn.de/pages/moon-buggy' + homepage 'https://www.seehuhn.de/pages/moon-buggy.html' version '1.0.51' license 'GPL-2' compatibility 'all' diff --git a/packages/motif.rb b/packages/motif.rb index 691955a21..19c472fa3 100644 --- a/packages/motif.rb +++ b/packages/motif.rb @@ -18,7 +18,7 @@ class Motif < Package depends_on 'fontconfig' depends_on 'freetype' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libpng' depends_on 'sommelier' depends_on 'expat' # R diff --git a/packages/mpc.rb b/packages/mpc.rb index cc86a6e25..576cccb81 100644 --- a/packages/mpc.rb +++ b/packages/mpc.rb @@ -2,7 +2,7 @@ require 'package' class Mpc < Package description 'Gnu Mpc is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result.' - homepage 'http://www.multiprecision.org/' + homepage 'https://www.multiprecision.org' version '1.2.1' license 'LGPL-2.1' compatibility 'all' diff --git a/packages/mpv.rb b/packages/mpv.rb index c4140258f..cef65e83d 100644 --- a/packages/mpv.rb +++ b/packages/mpv.rb @@ -36,7 +36,7 @@ class Mpv < Meson depends_on 'libdvdnav' # R depends_on 'libdvdread' # R depends_on 'libglvnd' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libplacebo' # R depends_on 'libsdl2' # R depends_on 'libva' # R diff --git a/packages/mupdf.rb b/packages/mupdf.rb index 9e99e4ac9..1ba02a2a5 100644 --- a/packages/mupdf.rb +++ b/packages/mupdf.rb @@ -22,7 +22,7 @@ class Mupdf < Package depends_on 'glibc' # R depends_on 'jbigkit' depends_on 'curl' # R - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libx11' # R depends_on 'libxext' # R depends_on 'libxrandr' # R diff --git a/packages/nautilus.rb b/packages/nautilus.rb index a88687ad0..83175c788 100644 --- a/packages/nautilus.rb +++ b/packages/nautilus.rb @@ -46,7 +46,7 @@ class Nautilus < Meson depends_on 'libarchive' => :build depends_on 'libcloudproviders' # R depends_on 'libhandy' => :build - depends_on 'libjpeg' => :build + depends_on 'libjpeg_turbo' => :build depends_on 'libportal' # R depends_on 'libxml2' => :build depends_on 'pango' => :build diff --git a/packages/ndctl.rb b/packages/ndctl.rb index 7a730cf3f..5c732511b 100644 --- a/packages/ndctl.rb +++ b/packages/ndctl.rb @@ -19,7 +19,7 @@ class Ndctl < Package depends_on 'ruby_asciidoctor' => :build depends_on 'bash_completion' => :build depends_on 'iniparser' => :build - depends_on 'jsonc' => :build + depends_on 'json_c' => :build depends_on 'keyutils' => :build depends_on 'libkmod' => :build depends_on 'xmlto' => :build diff --git a/packages/netcat.rb b/packages/netcat.rb index d7eb3cb67..26a068f91 100644 --- a/packages/netcat.rb +++ b/packages/netcat.rb @@ -2,7 +2,7 @@ require 'package' class Netcat < Package description 'Netcat is a featured networking utility which reads and writes data across network connections, using the TCP/IP protocol.' - homepage 'http://netcat.sourceforge.net/' + homepage 'https://netcat.sourceforge.net' version '0.7.1' license 'netcat' compatibility 'all' diff --git a/packages/nethack4.rb b/packages/nethack4.rb index a9db9283c..ededc89a8 100644 --- a/packages/nethack4.rb +++ b/packages/nethack4.rb @@ -2,7 +2,7 @@ require 'package' class Nethack4 < Package description 'NetHack is a \'roguelike\' game following in the same tradition; the player controls an adventurer delving into a randomly generated dungeon to retrieve the Amulet of Yendor from its depths.' - homepage 'http://nethack4.org/' + homepage 'http://nethack4.org' version '4.3.0-beta2-1' license 'nethack' compatibility 'i686,x86_64' diff --git a/packages/newsboat.rb b/packages/newsboat.rb index d09e29d48..54ba4fe44 100644 --- a/packages/newsboat.rb +++ b/packages/newsboat.rb @@ -22,7 +22,7 @@ class Newsboat < Package depends_on 'curl' depends_on 'libxml2' depends_on 'libstfl' - depends_on 'jsonc' + depends_on 'json_c' depends_on 'openssl' depends_on 'ruby_asciidoctor' => :build depends_on 'rust' => :build diff --git a/packages/openjpeg.rb b/packages/openjpeg.rb index 96f7b32a5..198debaff 100644 --- a/packages/openjpeg.rb +++ b/packages/openjpeg.rb @@ -19,7 +19,7 @@ class Openjpeg < CMake depends_on 'glibc' # R depends_on 'jbigkit' # R depends_on 'libdeflate' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'libtiff' # R depends_on 'libwebp' # R diff --git a/packages/php72.rb b/packages/php72.rb index 759743f1b..743996ae6 100644 --- a/packages/php72.rb +++ b/packages/php72.rb @@ -19,7 +19,7 @@ class Php72 < Package depends_on 'libgcrypt' depends_on 'libiconv' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libxslt' depends_on 'libzip' depends_on 'curl' diff --git a/packages/php73.rb b/packages/php73.rb index 2ee24fb0c..d9890c82d 100644 --- a/packages/php73.rb +++ b/packages/php73.rb @@ -18,7 +18,7 @@ class Php73 < Package depends_on 'curl' depends_on 'libgcrypt' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libpng' depends_on 'libxpm' depends_on 'libxslt' diff --git a/packages/php74.rb b/packages/php74.rb index b4ff74a7a..fadcac504 100644 --- a/packages/php74.rb +++ b/packages/php74.rb @@ -39,7 +39,7 @@ class Php74 < Package depends_on 'libgcrypt' depends_on 'libgpgerror' # R depends_on 'libidn2' # R - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libnghttp2' # R depends_on 'libpng' depends_on 'libpsl' # R diff --git a/packages/php80.rb b/packages/php80.rb index 2627fb1ff..4395bc004 100644 --- a/packages/php80.rb +++ b/packages/php80.rb @@ -39,7 +39,7 @@ class Php80 < Package depends_on 'libgcrypt' depends_on 'libgpgerror' # R depends_on 'libidn2' # R - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libnghttp2' # R depends_on 'libpng' depends_on 'libpsl' # R diff --git a/packages/php81.rb b/packages/php81.rb index 804041bac..40f7b9fa2 100644 --- a/packages/php81.rb +++ b/packages/php81.rb @@ -39,7 +39,7 @@ class Php81 < Package depends_on 'libgcrypt' # R depends_on 'libgpgerror' # R depends_on 'libidn2' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libnghttp2' # R depends_on 'libpng' # R depends_on 'libpsl' # R diff --git a/packages/php82.rb b/packages/php82.rb index eace9e392..5cb3e3600 100644 --- a/packages/php82.rb +++ b/packages/php82.rb @@ -40,7 +40,7 @@ class Php82 < Package depends_on 'libgd' # R depends_on 'libgpgerror' # R depends_on 'libidn2' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libnghttp2' # R depends_on 'libpng' # R depends_on 'libpsl' # R diff --git a/packages/php83.rb b/packages/php83.rb index 66786009b..96a0ea299 100644 --- a/packages/php83.rb +++ b/packages/php83.rb @@ -40,7 +40,7 @@ class Php83 < Package depends_on 'libgd' # R depends_on 'libgpgerror' # R depends_on 'libidn2' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libnghttp2' # R depends_on 'libpng' # R depends_on 'libpsl' # R diff --git a/packages/pkgconfig.rb b/packages/pkg_config.rb similarity index 96% rename from packages/pkgconfig.rb rename to packages/pkg_config.rb index 2b8b1a905..ba8066320 100644 --- a/packages/pkgconfig.rb +++ b/packages/pkg_config.rb @@ -1,8 +1,8 @@ require 'package' -class Pkgconfig < Package +class Pkg_config < Package description 'pkg-config is a helper tool used when compiling applications and libraries.' - homepage 'https://gitlab.freedesktop.org/pkg-config/pkg-config' + homepage 'https://www.freedesktop.org/wiki/Software/pkg-config/' version '0.29.2-d97d' license 'GPL-2' compatibility 'all' diff --git a/packages/podofo.rb b/packages/podofo.rb index 0a5794ab0..ffbe834c5 100644 --- a/packages/podofo.rb +++ b/packages/podofo.rb @@ -19,7 +19,7 @@ class Podofo < Package depends_on 'fontconfig' depends_on 'freetype' depends_on 'libidn' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libpng' depends_on 'libtiff' depends_on 'libxml2' diff --git a/packages/poppler.rb b/packages/poppler.rb index 8ea15f6c0..bd0cddfd5 100644 --- a/packages/poppler.rb +++ b/packages/poppler.rb @@ -26,7 +26,7 @@ class Poppler < Package depends_on 'glib' # R depends_on 'harfbuzz' # R depends_on 'lcms' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'libtiff' # R depends_on 'nspr' => :build diff --git a/packages/postgres.rb b/packages/postgresql.rb similarity index 98% rename from packages/postgres.rb rename to packages/postgresql.rb index dce85ab84..f2981084a 100644 --- a/packages/postgres.rb +++ b/packages/postgresql.rb @@ -1,8 +1,8 @@ require 'package' -class Postgres < Package +class Postgresql < Package description 'PostgreSQL is a powerful, open source object-relational database system.' - homepage 'https://www.postgresql.org/' + homepage 'https://www.postgresql.org' version '16.2' license 'PostgreSQL and GPL-2' compatibility 'x86_64 aarch64 armv7l' diff --git a/packages/progress.rb b/packages/progress.rb index b55618a21..2953cf9dd 100644 --- a/packages/progress.rb +++ b/packages/progress.rb @@ -17,7 +17,7 @@ class Progress < Package x86_64: 'e3e4b39e3be040d3d1ce716b253a625d0aa77839cdc7e22d479649748bbfa403' }) - depends_on 'pkgconfig' => :build + depends_on 'pkg_config' => :build depends_on 'ncurses' def self.build diff --git a/packages/proj4.rb b/packages/proj.rb similarity index 70% rename from packages/proj4.rb rename to packages/proj.rb index 7b06b0d63..b5da26332 100644 --- a/packages/proj4.rb +++ b/packages/proj.rb @@ -1,8 +1,8 @@ require 'package' -class Proj4 < Package - description 'proj.4 is a standard Unix filter function which converts geographic longitude and latitude coordinates into cartesian coordinates (and vice versa), and it is a C API for software developers to include coordinate transformation in their own software.' - homepage 'https://proj4.org/' +class Proj < Package + description 'PROJ is a generic coordinate transformation software that transforms geospatial coordinates from one coordinate reference system (CRS) to another.' + homepage 'https://proj.org' version '6.3.2' license 'MIT' compatibility 'all' diff --git a/packages/pulseaudio.rb b/packages/pulseaudio.rb index 5962d036b..15e90821c 100644 --- a/packages/pulseaudio.rb +++ b/packages/pulseaudio.rb @@ -32,7 +32,7 @@ class Pulseaudio < Meson # depends_on 'gsettings_desktop_schemas' # L depends_on 'gstreamer' # R depends_on 'jack' # R - depends_on 'jsonc' => :build + depends_on 'json_c' => :build depends_on 'libcap' # R depends_on 'libgconf' => :build depends_on 'libice' # R diff --git a/packages/py3_pillow.rb b/packages/py3_pillow.rb index d52e4cf2f..828ed7ed3 100644 --- a/packages/py3_pillow.rb +++ b/packages/py3_pillow.rb @@ -12,7 +12,7 @@ class Py3_pillow < Pip depends_on 'freetype' # R depends_on 'glibc' # R depends_on 'lcms' # R - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'libtiff' # R depends_on 'libwebp' # R depends_on 'libxcb' diff --git a/packages/qemacs.rb b/packages/qemacs.rb index c3575834d..dc342a62e 100644 --- a/packages/qemacs.rb +++ b/packages/qemacs.rb @@ -2,7 +2,7 @@ require 'package' class Qemacs < Package description 'QEmacs (for Quick Emacs) is a very small but powerful UNIX editor.' - homepage 'http://bellard.org/qemacs/' + homepage 'https://bellard.org/qemacs/' version '0.3.3' license 'LGPL-2.1+ and GPL-2+' compatibility 'all' diff --git a/packages/qemu.rb b/packages/qemu.rb index 8f301505e..e01cb50d7 100644 --- a/packages/qemu.rb +++ b/packages/qemu.rb @@ -41,7 +41,7 @@ class Qemu < Package depends_on 'libcyrussasl' # R depends_on 'libepoxy' # R depends_on 'libgcrypt' - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'libsdl2' # R depends_on 'libseccomp' # R diff --git a/packages/qpdf.rb b/packages/qpdf.rb index 3b74aae04..d3ea4c713 100644 --- a/packages/qpdf.rb +++ b/packages/qpdf.rb @@ -17,7 +17,7 @@ class Qpdf < Package x86_64: '36dde4a77f5bbad284e02f9ca7d684a36d6b03c97addfe7a7667711feb5fdecd' }) - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'gcc_lib' # R depends_on 'glibc' # R depends_on 'gnutls' # R diff --git a/packages/qt5_base.rb b/packages/qt5_base.rb index 6744af53c..555231f9d 100644 --- a/packages/qt5_base.rb +++ b/packages/qt5_base.rb @@ -42,7 +42,7 @@ class Qt5_base < Package depends_on 'libglvnd' # R depends_on 'libice' # R depends_on 'libinput' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'libsm' # R depends_on 'libvpx' => :build diff --git a/packages/qt5_webengine.rb b/packages/qt5_webengine.rb index 7712cca50..04f19a2a8 100644 --- a/packages/qt5_webengine.rb +++ b/packages/qt5_webengine.rb @@ -39,7 +39,7 @@ class Qt5_webengine < Package depends_on 'lcms' # R depends_on 'libevent' # R depends_on 'libglvnd' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'libvpx' # R depends_on 'libwebp' # R diff --git a/packages/r.rb b/packages/r.rb index 711624eed..ca0d57878 100644 --- a/packages/r.rb +++ b/packages/r.rb @@ -24,7 +24,7 @@ class R < Autotools depends_on 'icu4c' # R depends_on 'lapack' # R depends_on 'libice' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'libsm' # R depends_on 'libtiff' # R diff --git a/packages/readline.rb b/packages/readline.rb index 69bfce90f..b4c9db84d 100644 --- a/packages/readline.rb +++ b/packages/readline.rb @@ -2,7 +2,7 @@ require 'package' class Readline < Package description 'The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in.' - homepage 'http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html' + homepage 'https://tiswww.cwru.edu/php/chet/readline/rltop.html' version '8.2' license 'GPL-2' compatibility 'all' diff --git a/packages/scrollz.rb b/packages/scrollz.rb index 15b0b4a98..d3dd56bfd 100644 --- a/packages/scrollz.rb +++ b/packages/scrollz.rb @@ -2,7 +2,7 @@ require 'package' class Scrollz < Package description 'ScrollZ is an advanced IRC client based on ircII.' - homepage 'http://www.scrollz.info/' + homepage 'https://www.scrollz.info' version '2.3-1' license 'BSD' compatibility 'all' diff --git a/packages/sdl2_image.rb b/packages/sdl2_image.rb index 3622eb2ee..d4fa2c59f 100644 --- a/packages/sdl2_image.rb +++ b/packages/sdl2_image.rb @@ -19,7 +19,7 @@ class Sdl2_image < Autotools depends_on 'gcc_lib' # R depends_on 'glibc' # R depends_on 'libavif' => :build - depends_on 'libjpeg' => :build + depends_on 'libjpeg_turbo' => :build depends_on 'libpng' => :build depends_on 'libsdl2' # R depends_on 'libtiff' => :build diff --git a/packages/spice_gtk.rb b/packages/spice_gtk.rb index a9c6a9480..b8084172e 100644 --- a/packages/spice_gtk.rb +++ b/packages/spice_gtk.rb @@ -21,7 +21,7 @@ class Spice_gtk < Package depends_on 'gtk3' depends_on 'libcacard' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'opus' depends_on 'usbredir' depends_on 'gstreamer' diff --git a/packages/tesseract.rb b/packages/tesseract.rb index 38dc64776..e933c5a2c 100644 --- a/packages/tesseract.rb +++ b/packages/tesseract.rb @@ -41,7 +41,7 @@ class Tesseract < CMake depends_on 'libcyrussasl' => :build depends_on 'libdeflate' => :build depends_on 'libidn2' => :build - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libnghttp2' => :build depends_on 'libpng' # R depends_on 'libpsl' => :build diff --git a/packages/testdisk.rb b/packages/testdisk.rb index 0821ce05a..85fa3311a 100644 --- a/packages/testdisk.rb +++ b/packages/testdisk.rb @@ -19,7 +19,7 @@ class Testdisk < Package depends_on 'apr_iconv' depends_on 'compressdoc' => :build - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'ncurses' depends_on 'zlibpkg' depends_on 'e2fsprogs' # R diff --git a/packages/tracker3_miners.rb b/packages/tracker3_miners.rb index c2cf660d6..d518233f3 100644 --- a/packages/tracker3_miners.rb +++ b/packages/tracker3_miners.rb @@ -33,7 +33,7 @@ class Tracker3_miners < Meson depends_on 'libexif' # R depends_on 'libgrss' # R depends_on 'libgsf' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'libseccomp' # R depends_on 'libtiff' # R diff --git a/packages/v4l_utils.rb b/packages/v4l_utils.rb index 73626eeb2..9fe56ea85 100644 --- a/packages/v4l_utils.rb +++ b/packages/v4l_utils.rb @@ -19,7 +19,7 @@ class V4l_utils < Package depends_on 'alsa_lib' depends_on 'eudev' depends_on 'libglu' - depends_on 'libjpeg' + depends_on 'libjpeg_turbo' depends_on 'mesa' unless ARCH == 'i686' depends_on 'qt5_base' unless ARCH == 'i686' depends_on 'sdl2_image' diff --git a/packages/weather.rb b/packages/weather.rb index 51bcb3fdc..6697b7726 100644 --- a/packages/weather.rb +++ b/packages/weather.rb @@ -2,7 +2,7 @@ require 'package' class Weather < Package description 'This command-line utility is intended to provide quick access to current weather conditions and forecasts.' - homepage 'http://fungi.yuggoth.org/weather/' + homepage 'https://fungi.yuggoth.org/weather/' version '2.3' license 'ISC' compatibility 'all' diff --git a/packages/webkit2gtk_4.rb b/packages/webkit2gtk_4.rb index a51ddf879..aa54c65a6 100644 --- a/packages/webkit2gtk_4.rb +++ b/packages/webkit2gtk_4.rb @@ -42,7 +42,7 @@ class Webkit2gtk_4 < Package depends_on 'libgcrypt' # R depends_on 'libglvnd' # R depends_on 'libgpgerror' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libjxl' # R depends_on 'libnotify' depends_on 'libpng' # R diff --git a/packages/webkit2gtk_4_1.rb b/packages/webkit2gtk_4_1.rb index 7566b8e55..616f45b77 100644 --- a/packages/webkit2gtk_4_1.rb +++ b/packages/webkit2gtk_4_1.rb @@ -44,7 +44,7 @@ class Webkit2gtk_4_1 < Package depends_on 'libgcrypt' # R depends_on 'libglvnd' # R depends_on 'libgpgerror' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libjxl' # R depends_on 'libnotify' depends_on 'libpng' # R diff --git a/packages/webkitgtk_6.rb b/packages/webkitgtk_6.rb index 06bdfd509..6ab7abbe7 100644 --- a/packages/webkitgtk_6.rb +++ b/packages/webkitgtk_6.rb @@ -44,7 +44,7 @@ class Webkitgtk_6 < Package depends_on 'libgcrypt' # R depends_on 'libglvnd' # R depends_on 'libgpgerror' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libjxl' # R depends_on 'libnotify' depends_on 'libpng' # R diff --git a/packages/weston.rb b/packages/weston.rb index 984366b1f..e812b3cd9 100644 --- a/packages/weston.rb +++ b/packages/weston.rb @@ -33,7 +33,7 @@ class Weston < Meson depends_on 'libevdev' # R depends_on 'libglvnd' # R depends_on 'libinput' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'libunwind' depends_on 'libva' # R diff --git a/packages/wine.rb b/packages/wine.rb index 786d78355..095131d8d 100644 --- a/packages/wine.rb +++ b/packages/wine.rb @@ -26,7 +26,7 @@ class Wine < Package depends_on 'libfaudio' => :build depends_on 'libglu' => :build depends_on 'libgphoto' # R - depends_on 'libjpeg' => :build + depends_on 'libjpeg_turbo' => :build depends_on 'libpcap' # R depends_on 'libpng' => :build depends_on 'libsm' => :build diff --git a/packages/wxwidgets.rb b/packages/wxwidgets.rb index 7d78e0c4b..ab1c06899 100644 --- a/packages/wxwidgets.rb +++ b/packages/wxwidgets.rb @@ -36,7 +36,7 @@ class Wxwidgets < Package depends_on 'libglu' # R depends_on 'libglvnd' # R depends_on 'libice' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libnotify' # R depends_on 'libpng' # R depends_on 'libsdl2' # R diff --git a/packages/wxwidgets30.rb b/packages/wxwidgets30.rb index f1234aa8b..a238f3635 100644 --- a/packages/wxwidgets30.rb +++ b/packages/wxwidgets30.rb @@ -29,7 +29,7 @@ class Wxwidgets30 < Package depends_on 'harfbuzz' # R depends_on 'libglu' # R depends_on 'libglvnd' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libnotify' # R depends_on 'libsdl' => :build depends_on 'libsecret' => :build diff --git a/packages/wxwidgets31.rb b/packages/wxwidgets31.rb index 6f8edff67..1784aa59d 100644 --- a/packages/wxwidgets31.rb +++ b/packages/wxwidgets31.rb @@ -38,7 +38,7 @@ class Wxwidgets31 < Package depends_on 'harfbuzz' # R depends_on 'libglu' # R depends_on 'libglvnd' # R - depends_on 'libjpeg' # R + depends_on 'libjpeg_turbo' # R depends_on 'libnotify' # R depends_on 'libsdl' => :build depends_on 'libsecret' # R diff --git a/packages/xzutils.rb b/packages/xzutils.rb index 9aa2b9b25..564234456 100644 --- a/packages/xzutils.rb +++ b/packages/xzutils.rb @@ -2,7 +2,7 @@ require 'buildsystems/cmake' class Xzutils < CMake description 'XZ Utils is free general-purpose data compression software with a high compression ratio.' - homepage 'http://tukaani.org/xz/' + homepage 'https://tukaani.org/xz/' version '5.6.1' license 'GPL-3' compatibility 'all'