From 23c34dde70f1be18fdd714cccab6f2c4f2fe6539 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 17 Sep 2021 09:59:48 +0200 Subject: [PATCH] setup distro scripts: sort packages alphabetically --- scripts/setup-archlinux.sh | 28 ++++++++++++++-------------- scripts/setup-termux.sh | 18 +++++++++--------- scripts/setup-ubuntu.sh | 34 +++++++++++++++++----------------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/scripts/setup-archlinux.sh b/scripts/setup-archlinux.sh index ef87a5cb8..2a769956d 100755 --- a/scripts/setup-archlinux.sh +++ b/scripts/setup-archlinux.sh @@ -2,7 +2,6 @@ set -e -u PACKAGES="" -PACKAGES+=" patch" PACKAGES+=" asciidoc" PACKAGES+=" asciidoctor" # Used by weechat for man pages. PACKAGES+=" automake" @@ -10,37 +9,38 @@ PACKAGES+=" bison" PACKAGES+=" clang" # Used by golang, useful to have same compiler building. PACKAGES+=" curl" # Used for fetching sources. PACKAGES+=" ed" # Used by bc. +PACKAGES+=" expat" # Needed by ghostscript. PACKAGES+=" flex" +PACKAGES+=" gawk" # Needed by apr-util. PACKAGES+=" gcc" # Host C/C++ compiler. PACKAGES+=" gettext" # Provides 'msgfmt'. PACKAGES+=" git" # Used by the neovim build. +PACKAGES+=" glib2" # Provides 'glib-genmarshal' which the glib build uses. +PACKAGES+=" gnupg" # Needed to verify downloaded debs. PACKAGES+=" gperf" # Used by the fontconfig build. PACKAGES+=" help2man" PACKAGES+=" intltool" # Used by qalc build. -PACKAGES+=" glib2" # Provides 'glib-genmarshal' which the glib build uses. +PACKAGES+=" jre8-openjdk-headless" +PACKAGES+=" libjpeg-turbo" # Needed by ghostscript. PACKAGES+=" libtool" +PACKAGES+=" lua" # Needed to build luarocks package. PACKAGES+=" lzip" -PACKAGES+=" python" -PACKAGES+=" python2" -PACKAGES+=" tar" -PACKAGES+=" unzip" PACKAGES+=" m4" +PACKAGES+=" openssl" # Needed to build rust. +PACKAGES+=" patch" PACKAGES+=" pkgconf" +PACKAGES+=" python" PACKAGES+=" python-docutils" # For rst2man, used by mpv. +PACKAGES+=" python-recommonmark" # Needed for LLVM-8 documentation. PACKAGES+=" python-setuptools" # Needed by at least asciinema. PACKAGES+=" python-sphinx" # Needed by notmuch man page generation. +PACKAGES+=" python2" PACKAGES+=" ruby" # Needed to build ruby. PACKAGES+=" scons" +PACKAGES+=" tar" PACKAGES+=" texinfo" +PACKAGES+=" unzip" PACKAGES+=" xmlto" -PACKAGES+=" expat" # Needed by ghostscript. -PACKAGES+=" libjpeg-turbo" # Needed by ghostscript. -PACKAGES+=" gawk" # Needed by apr-util. -PACKAGES+=" openssl" # Needed to build rust. -PACKAGES+=" gnupg" # Needed to verify downloaded debs. -PACKAGES+=" lua" # Needed to build luarocks package. -PACKAGES+=" python-recommonmark" # Needed for LLVM-8 documentation. -PACKAGES+=" jre8-openjdk-headless" # Do not require sudo if already running as root. if [ "$(id -u)" = "0" ]; then diff --git a/scripts/setup-termux.sh b/scripts/setup-termux.sh index 642734c6b..7c699c597 100755 --- a/scripts/setup-termux.sh +++ b/scripts/setup-termux.sh @@ -1,15 +1,15 @@ #!/bin/bash +PACKAGES="" # Tier 1: requirements for the core build scripts in scripts/build/. -PACKAGES="binutils-gold" # Part of binutils which is dependency of clang. -PACKAGES+=" clang" # Required to build termux-elf-cleaner as well as other - # C/C++ packages. -PACKAGES+=" file" # Used in termux_step_massage(). -PACKAGES+=" gnupg" # Used in termux_get_repo_files() and build-package.sh. -PACKAGES+=" lzip" # Used by tar to extract *.tar.lz source archives. -PACKAGES+=" patch" # Used for applying patches on source code. -PACKAGES+=" python" # Used buildorder.py core script. -PACKAGES+=" unzip" # Used to extract *.zip source archives. +PACKAGES+=" binutils-gold" # Part of binutils which is dependency of clang. +PACKAGES+=" clang" # Required for termux-elf-cleaner and C/C++ packages. +PACKAGES+=" file" # Used in termux_step_massage(). +PACKAGES+=" gnupg" # Used in termux_get_repo_files() and build-package.sh. +PACKAGES+=" lzip" # Used by tar to extract *.tar.lz source archives. +PACKAGES+=" patch" # Used for applying patches on source code. +PACKAGES+=" python" # Used buildorder.py core script. +PACKAGES+=" unzip" # Used to extract *.zip source archives. # Tier 2: requirements for building many other packages. PACKAGES+=" asciidoc" diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 60fab9374..9a91ec3ed 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -23,9 +23,9 @@ PACKAGES+=" unzip" # Used by common build systems. PACKAGES+=" autoconf" +PACKAGES+=" autogen" PACKAGES+=" automake" PACKAGES+=" autopoint" -PACKAGES+=" autogen" PACKAGES+=" bison" PACKAGES+=" flex" PACKAGES+=" g++" @@ -35,8 +35,8 @@ PACKAGES+=" gettext" PACKAGES+=" gperf" PACKAGES+=" intltool" PACKAGES+=" libglib2.0-dev" -PACKAGES+=" libtool-bin" PACKAGES+=" libltdl-dev" +PACKAGES+=" libtool-bin" PACKAGES+=" m4" PACKAGES+=" pkg-config" PACKAGES+=" scons" @@ -50,10 +50,10 @@ PACKAGES+=" pandoc" PACKAGES+=" python3-docutils" PACKAGES+=" python3-recommonmark" PACKAGES+=" python3-sphinx" +PACKAGES+=" scdoc" PACKAGES+=" texinfo" PACKAGES+=" xmlto" PACKAGES+=" xmltoman" -PACKAGES+=" scdoc" # Needed by python modules (e.g. asciinema) and some build systems. PACKAGES+=" python3.7" @@ -149,21 +149,21 @@ PACKAGES+=" nasm" PACKAGES+=" rsync" # Needed by packages in unstable repository. +PACKAGES+=" comerr-dev" PACKAGES+=" docbook-to-man" PACKAGES+=" docbook-utils" PACKAGES+=" erlang-nox" +PACKAGES+=" heimdal-multidev" +PACKAGES+=" libconfig-dev" +PACKAGES+=" libevent-dev" PACKAGES+=" libgc-dev" PACKAGES+=" libgmp-dev" -PACKAGES+=" libunistring-dev" -PACKAGES+=" libparse-yapp-perl" -PACKAGES+=" heimdal-multidev" -PACKAGES+=" comerr-dev" -PACKAGES+=" llvm-10-tools" -PACKAGES+=" llvm-10-dev" -PACKAGES+=" libevent-dev" -PACKAGES+=" libreadline-dev" -PACKAGES+=" libconfig-dev" PACKAGES+=" libjansson-dev" +PACKAGES+=" libparse-yapp-perl" +PACKAGES+=" libreadline-dev" +PACKAGES+=" libunistring-dev" +PACKAGES+=" llvm-10-dev" +PACKAGES+=" llvm-10-tools" # Needed by packages in X11 repository. PACKAGES+=" alex" @@ -174,25 +174,25 @@ PACKAGES+=" gtk-3-examples" PACKAGES+=" gtk-doc-tools" PACKAGES+=" happy" PACKAGES+=" itstool" +PACKAGES+=" libdbus-glib-1-dev-bin" PACKAGES+=" libgdk-pixbuf2.0-dev" +PACKAGES+=" libwayland-dev" PACKAGES+=" python-setuptools" PACKAGES+=" python3-xcbgen" PACKAGES+=" sassc" PACKAGES+=" texlive-extra-utils" +PACKAGES+=" wayland-scanner++" PACKAGES+=" xfce4-dev-tools" PACKAGES+=" xfonts-utils" PACKAGES+=" xutils-dev" -PACKAGES+=" libdbus-glib-1-dev-bin" -PACKAGES+=" wayland-scanner++" -PACKAGES+=" libwayland-dev" # Needed by packages in science repository -PACKAGES+=" sqlite3" PACKAGES+=" protobuf-c-compiler" +PACKAGES+=" sqlite3" # Needed by packages in game repository -PACKAGES+=" python3-yaml" PACKAGES+=" cvs" +PACKAGES+=" python3-yaml" # Needed by apt. PACKAGES+=" triehash"