bootstrap: remove now unused intltool on all platforms

It is not used by any packages anymore and a perl dependency
(XML::Parser) now has issues installing on MacOS.

Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1328>

6 files changed, 1 insertions, 71 deletions

diff --git a/cerbero/bootstrap/build_tools.py b/cerbero/bootstrap/build_tools.py
index 4aba4111..17012760 100644
--- a/cerbero/bootstrap/build_tools.py
+++ b/cerbero/bootstrap/build_tools.py
@@ -32,9 +32,8 @@ from cerbero.enums import Platform, Distro
 class BuildTools(BootstrapperBase, Fetch):
     BUILD_TOOLS = ['automake', 'autoconf', 'libtool', 'pkg-config', 'orc', 'gettext-m4', 'meson']
     PLAT_BUILD_TOOLS = {
-        Platform.DARWIN: ['intltool', 'sed', 'gperf', 'bison', 'flex', 'moltenvk-tools'],
+        Platform.DARWIN: ['sed', 'gperf', 'bison', 'flex', 'moltenvk-tools'],
         Platform.WINDOWS: ['nasm'],
-        Platform.LINUX: ['intltool-m4'],
     }
 
     def __init__(self, config, offline):
@@ -57,9 +56,6 @@ class BuildTools(BootstrapperBase, Fetch):
 
             if self.config.distro == Distro.MSYS:
                 self.PLAT_BUILD_TOOLS[Platform.WINDOWS].append('gperf')
-                # UWP config does not build any autotools recipes
-                if not self.config.variants.uwp:
-                    self.PLAT_BUILD_TOOLS[Platform.WINDOWS].append('intltool')
 
         if self.config.target_platform != Platform.LINUX and not self.config.prefix_is_executable():
             # For glib-mkenums and glib-genmarshal
diff --git a/cerbero/bootstrap/linux.py b/cerbero/bootstrap/linux.py
index 43c79286..d7ab0836 100644
--- a/cerbero/bootstrap/linux.py
+++ b/cerbero/bootstrap/linux.py
@@ -99,7 +99,6 @@ class DebianBootstrapper(UnixBootstrapper):
         'libegl1-mesa-dev',
         'git',
         'xutils-dev',
-        'intltool',
         'ccache',
         'python3-setuptools',
         'libssl-dev',
@@ -153,7 +152,6 @@ class RedHatBootstrapper(UnixBootstrapper):
         'nasm',
         'pkgconfig',
         'curl',
-        'intltool',
         'rpm-build',
         'redhat-rpm-config',
         'python3-devel',
@@ -217,7 +215,6 @@ class OpenSuseBootstrapper(UnixBootstrapper):
         'bison',
         'flex',
         'nasm',
-        'intltool',
         'patterns-openSUSE-devel_rpm_build',
         'python3-devel',
         'xorg-x11-libXrender-devel',
@@ -249,7 +246,6 @@ class ArchBootstrapper(UnixBootstrapper):
     command = ['-S', '--needed']
     yes_arg = ['--noconfirm']
     packages = [
-        'intltool',
         'cmake',
         'ninja',
         'libtool',
@@ -296,7 +292,6 @@ class GentooBootstrapper(UnixBootstrapper):
     command = ['-u']
     yes_arg = []  # Does not seem interactive
     packages = [
-        'dev-util/intltool',
         'dev-util/cmake',
         'dev-util/ninja',
         'sys-devel/libtool',
diff --git a/cerbero/bootstrap/osx.py b/cerbero/bootstrap/osx.py
index 884b077a..7be891c9 100644
--- a/cerbero/bootstrap/osx.py
+++ b/cerbero/bootstrap/osx.py
@@ -16,7 +16,6 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-import os
 
 from cerbero.bootstrap import BootstrapperBase
 from cerbero.bootstrap.bootstrapper import register_system_bootstrapper
@@ -25,34 +24,19 @@ from cerbero.utils import shell
 from cerbero.utils import messages as m
 from cerbero.enums import Architecture
 
-CPANM_VERSION = '1.7044'
-CPANM_URL_TPL = 'https://raw.githubusercontent.com/miyagawa/cpanminus/{}/cpanm'
-CPANM_CHECKSUM = '22b92506243649a73cfb55c5990cedd24cdbb20b15b4530064d2496d94d1642b'
-
 
 class OSXBootstrapper(BootstrapperBase):
     def __init__(self, config, offline, assume_yes):
         super().__init__(config, offline)
-        url = CPANM_URL_TPL.format(CPANM_VERSION)
-        self.fetch_urls.append((url, None, CPANM_CHECKSUM))
 
     async def start(self, jobs=0):
         # skip system package install if not needed
         if not self.config.distro_packages_install:
             return
-        self._install_perl_deps()
         if self.config.arch == Architecture.ARM64:
             m.message('Installing rosetta needed for some package installation scripts')
             shell.new_call(['/usr/sbin/softwareupdate', '--install-rosetta', '--agree-to-license'])
 
-    def _install_perl_deps(self):
-        cpanm_installer = os.path.join(self.config.local_sources, 'cpanm')
-        shell.new_call(['chmod', '+x', cpanm_installer])
-        # Install XML::Parser, required for intltool
-        cmd = ['sudo', cpanm_installer, 'XML::Parser']
-        m.message("Installing XML::Parser, may require a password for running '" + ' '.join(cmd) + "'")
-        shell.new_call(cmd, interactive=True)
-
 
 def register_all():
     register_system_bootstrapper(Distro.OS_X, OSXBootstrapper)
diff --git a/cerbero/bootstrap/windows.py b/cerbero/bootstrap/windows.py
index d1a94030..6219195f 100644
--- a/cerbero/bootstrap/windows.py
+++ b/cerbero/bootstrap/windows.py
@@ -53,8 +53,6 @@ KHRONOS_WGL_TPL = 'https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registr
 WGL_CHECKSUM = '8961c809d180e3590fca32053341fe3a83394edcb936f7699f0045feadb16115'
 
 # Extra binary dependencies
-INTLTOOL_URL = 'https://download.gnome.org/binaries/win32/intltool/0.40/intltool_0.40.4-1_win32.zip'
-INTLTOOL_CHECKSUM = '7180a780cee26c5544c06a73513c735b7c8c107db970b40eb7486ea6c936cb33'
 XZ_URL = 'https://tukaani.org/xz/xz-5.2.5-windows.zip'
 XZ_CHECKSUM = 'd83b82ca75dfab39a13dda364367b34970c781a9df4d41264db922ac3a8f622d'
 
@@ -76,11 +74,6 @@ class MSYSBootstrapper(BootstrapperBase):
         url = MINGW_PERL_TPL.format(PERL_VERSION)
         self.fetch_urls.append((url, None, MINGW_PERL_CHECKSUM))
         self.extract_steps.append((url, True, self.perl_prefix))
-        # Newer versions of binary deps such as intltool. Must be extracted
-        # after the MinGW toolchain from above is extracted so that it
-        # replaces the older files.
-        self.fetch_urls.append((INTLTOOL_URL, None, INTLTOOL_CHECKSUM))
-        self.extract_steps.append((INTLTOOL_URL, True, self.prefix))
         # Newer version of xz that supports multithreaded compression. Need
         # to extract to a temporary directory, then overwrite the existing
         # lzma/xz binaries.
@@ -92,7 +85,6 @@ class MSYSBootstrapper(BootstrapperBase):
         self.install_mingwget_deps()  # FIXME: This uses the network
         self.fix_mingw_unused()
         self.fix_openssl_mingw_perl()
-        self.fix_bin_deps()
         self.install_xz()
 
     def install_mingwget_deps(self):
@@ -145,12 +137,6 @@ class MSYSBootstrapper(BootstrapperBase):
         for b in ('xz.exe', 'xzdec.exe', 'lzmadec.exe', 'lzmainfo.exe'):
             shutil.copy2(os.path.join(src, b), os.path.join(msys_bindir, b))
 
-    def fix_bin_deps(self):
-        # replace /opt/perl/bin/perl in intltool
-        files = shell.ls_files(['bin/intltool*'], self.prefix)
-        for f in files:
-            shell.replace(os.path.join(self.prefix, f), {'/opt/perl/bin/perl': '/bin/perl'})
-
 
 class MSYS2Bootstrapper(BootstrapperBase):
     """
@@ -161,7 +147,6 @@ class MSYS2Bootstrapper(BootstrapperBase):
     packages = [
         'flex',
         'bison',
-        'intltool',
         'gperf',
         'make',
         'diffutils',
diff --git a/recipes/build-tools/intltool-m4.recipe b/recipes/build-tools/intltool-m4.recipe
deleted file mode 100644
index d8873cab..00000000
--- a/recipes/build-tools/intltool-m4.recipe
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
-import shutil
-
-class Recipe(recipe.Recipe):
-    name = 'intltool-m4'
-    version = '0.51.0'
-    licenses = [License.GPLv2Plus]
-    stype = SourceType.TARBALL
-    btype = BuildType.CUSTOM
-    url = 'https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz'
-    tarball_checksum = '67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd'
-    tarball_dirname = 'intltool-%(version)s'
-
-    files_devel = ['share/aclocal/intltool.m4']
-
-    async def install(self):
-        m4 = os.path.join(self.build_dir, 'intltool.m4')
-        shutil.copy(m4, os.path.join(self.config.prefix, 'share', 'aclocal', 'intltool.m4'))
diff --git a/recipes/build-tools/intltool.recipe b/recipes/build-tools/intltool.recipe
deleted file mode 100644
index cdb908a0..00000000
--- a/recipes/build-tools/intltool.recipe
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
-import shutil
-
-class Recipe(recipe.Recipe):
-    name = 'intltool'
-    version = '0.51.0'
-    licenses = [License.GPLv2Plus]
-    stype = SourceType.TARBALL
-    url = 'https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz'
-    tarball_checksum = '67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd'
-
-    files_bins = ['intltool-extract', 'intltool-merge', 'intltool-prepare', 'intltool-update', 'intltoolize']