From 6789a46057d96927fba03cd9e412659f5ff8aac0 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Fri, 25 Aug 2023 20:02:06 -0700
Subject: [PATCH] Update the builder to bundle Pyro5

---
 builders/macosx-builder.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/builders/macosx-builder.py b/builders/macosx-builder.py
index 984649b..b42562b 100644
--- a/builders/macosx-builder.py
+++ b/builders/macosx-builder.py
@@ -261,14 +261,14 @@ class MacOSXBuilder(Builder):
         except Exception:
             pass
 
-    def _install_pyro4(self):
+    def _install_pyro5(self):
         """
-        Install Pyro4 into the vendor directory
+        Install Pyro5 into the vendor directory
         """
-        self._print('Installing Pyro4 for LibreOffice')
+        self._print('Installing Pyro5 for LibreOffice')
         target = os.path.join(self.dist_path, 'plugins', 'presentations', 'lib', 'vendor')
-        argv = ['pip', 'install', 'Pyro4', '-t', target, '--disable-pip-version-check', '--no-compile']
-        self._run_module('pip', argv, 'Error installing pyro4 with pip', run_name='__main__')
+        argv = ['pip', 'install', 'Pyro5', '-t', target, '--disable-pip-version-check', '--no-compile']
+        self._run_module('pip', argv, 'Error installing Pyro5 with pip', run_name='__main__')
         egg_info_glob = glob.glob(os.path.join(target, '*.egg-info'))
         egg_info_glob.extend(glob.glob(os.path.join(target, '*.dist-info')))
         self._print_verbose('... glob: {}'.format(egg_info_glob))
@@ -279,6 +279,7 @@ class MacOSXBuilder(Builder):
         """
         Copy the VLC files into the app bundle
         """
+        self._print('Copying VLC files')
         vlc_path = '/Applications/VLC.app/Contents/MacOS/'
         vlc_dest = os.path.join(self.dist_path, 'vlc')
         if not os.path.exists(vlc_dest):
@@ -393,7 +394,7 @@ class MacOSXBuilder(Builder):
         # self._copy_vlc_files()
         self._copy_bundle_files()
         self._copy_macosx_files()
-        self._install_pyro4()
+        self._install_pyro5()
 
     def after_run_sphinx(self):
         """