ci: Try building rsync in the flatpak yaml

github-flatpak.yaml

@@ -43,6 +43,14 @@ finish-args:
   - --filesystem=host
 
 modules:
+  - name: rsync
+    cleanup: /share/man
+    no-autogen: true
+    sources:
+      - type: archive
+        url: https://download.samba.org/pub/rsync/src/rsync-3.4.1.tar.gz
+        sha256: 2924bcb3a1ed8b551fc101f740b9f0fe0a202b115027647cf69850d65fd88c52
+
   - name: chimerax
     builddir: true
     buildsystem: simple
@@ -79,3 +87,6 @@ modules:
       - (cd lib; for m in $(find . -name Makefile); do sed -i "s/SHLIB_RDIRS=.*/SHLIB_RDIRS='\$\$ORIGIN'/" $m; done)
       - make -j -C src/lib
       - cd src/lib && cp libkrb5.so.3 libk5crypto.so.3 libcom_err.so.3 libkrb5support.so.0 libgssapi_krb5.so.2 /app/lib/python3*/site-packages/PyQt6/Qt6/lib/
+
+cleanup:
+  - '/bin/rsync*'

mk/config.make

@@ -136,9 +136,6 @@ RSYNC = rsync -rltWv --executability
 else
 RSYNC = $(TOP)/prereqs/win32/rsync.convert -rlptWv
 endif
-ifdef FLATPAK_DIST
-RSYNC := $(bindir)/$(RSYNC)
-endif
 
 ifdef WIN32
 PYTHON_INCLUDE_DIRS = -I'$(shell cygpath -m '$(includedir)/python$(PYTHON_VERSION)$(PYTHON_ABI)')'

prereqs/Makefile

@@ -27,7 +27,6 @@ SUBDIRS += win32
 endif
 
 ifdef FLATPAK_DIST
-NEED_RSYNC=1
 NEED_LIBGLU=1
 endif
 
@@ -38,13 +37,6 @@ ffmpeg.install:
 ffmpeg.app-install:
 endif
 
-ifdef NEED_RSYNC
-SUBDIRS += rsync
-else
-rsync.install:
-rsync.app-install:
-endif
-
 ifdef NEED_LIBGLU
 SUBDIRS += libGLU
 else
@@ -117,12 +109,6 @@ $(SUBDIR_APP_INSTALL): build-app-dirs
 ifdef WIN32
 $(subst win32.install,,$(SUBDIR_INSTALL)): win32.install
 endif
-#ifdef UNIX
-#$(subst unix.install,,$(SUBDIR_INSTALL)): unix.install
-#endif
-ifdef FLATPAK_DIST
-$(subst rsync.install,,$(SUBDIR_INSTALL)): rsync.install
-endif
 
 # Please keep dependencies in alphabetical order.
 # All packages that have dependencies should depend on the .install