Bundle zeroconf instead of downloading at build time.

Bump to the latest version also, seems to work without issues.

install-scripts/meson.build

@@ -19,8 +19,3 @@ meson.add_install_script('meson_install_schemas.py')
 
 # Update the Gtk icon cache
 meson.add_install_script('meson_update_icon_cache.py')
-
-# Flatpak already bundles.
-if bundle_zeroconf and not get_option('flatpak-build')
-    meson.add_install_script('download_zeroconf.py')
-endif

src/grpcio-1.59.0/build_script.py

@@ -7,7 +7,7 @@
 srcdir = sys.argv[1]
 outdir = sys.argv[2]
 
-print("Building grpc s:%s, t:%s" % (srcdir, outdir))
+print("Building grpc s:%s, t:%s" % (srcdir, outdir), flush=True)
 
 # Modifications to grpc tarball (1.59.0) #################################################################
 

src/meson.build

@@ -65,6 +65,7 @@ if bundle_grpc
     dependency('python3')
     current_grpc_version = '1.59.0'
     current_protobuf_version = '4.24.4'
+    current_zeroconf_version  = '0.115.2'
 
     setup = join_paths(meson_source_root, 'grpcio-' + current_grpc_version, 'build_script.py')
 
@@ -85,6 +86,16 @@ if bundle_grpc
         install_dir: install_libdir,
         build_by_default: true,
     )
+
+    setup = join_paths(meson_source_root, 'zeroconf-' + current_zeroconf_version, 'build_script.py')
+
+    grpc = custom_target('zeroconf_build',
+        output: 'zeroconf',
+        command: [setup, join_paths(meson_source_root, 'zeroconf-' + current_zeroconf_version), join_paths(meson.current_build_dir(), 'zeroconf')],
+        install: true,
+        install_dir: install_libdir,
+        build_by_default: true,
+    )
 endif
 
 if bundle_landlock

src/protobuf-4.24.4/build_script.py

@@ -7,7 +7,7 @@
 srcdir = sys.argv[1]
 outdir = sys.argv[2]
 
-print("Building protobuf s:%s, t:%s" % (srcdir, outdir))
+print("Building protobuf s:%s, t:%s" % (srcdir, outdir), flush=True)
 
 try:
     os.chdir(srcdir)

src/server.py

@@ -28,20 +28,8 @@
 from ops import ReceiveOp
 from util import TransferDirection, OpStatus, RemoteStatus
 
-try:
-    import zeroconf_
-    from zeroconf_ import ServiceInfo, Zeroconf, ServiceBrowser
-except:
-    import zeroconf
-
-    zc_version = pkg_resources.parse_version(zeroconf.__version__)
-    zc_min_version = pkg_resources.parse_version("0.27.0")
-
-    if zc_version < zc_min_version:
-        print("Python3 zeroconf must be >= %s" % zc_min_version)
-        exit(1)
-
-    from zeroconf import ServiceInfo, Zeroconf, ServiceBrowser
+import zeroconf
+from zeroconf import ServiceInfo, Zeroconf, ServiceBrowser
 
 _ = gettext.gettext
 
@@ -89,10 +77,7 @@ def __init__(self, ip_info, port, auth_port):
         self.start()
 
     def start_zeroconf(self):
-        try:
-            logging.info("Using bundled zeroconf v%s" % zeroconf_.__version__)
-        except:
-            logging.info("Using system zeroconf v%s" % zeroconf.__version__)
+        logging.info("Using zeroconf version %s %s" % (zeroconf.__version__, "(bundled)" if config.bundle_zeroconf else ""))
 
         self.zeroconf = Zeroconf(interfaces=[self.ip_info.ip4_address])