From b3c40c7be1ea1baa3540ad1e6c02c0e0f2b5fd6b Mon Sep 17 00:00:00 2001 From: Bruno Lopes Date: Fri, 27 Mar 2026 18:01:36 -0300 Subject: [PATCH] build/linux: Enable "Send by email" on AppImage Hmmm why this was not already enabled? On my tests, it works. Don't remember why I have not handled this before. This commit also reorder the xdg-mail position on macOS script. --- .gitlab-ci.yml | 3 ++- build/linux/appimage/3_dist-gimp-goappimage.sh | 2 ++ build/macos/2_bundle-gimp-uni_base.py | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11b2e33f00..1211023757 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -226,7 +226,8 @@ deps-debian-nonreloc: poppler-data python3 python3-gi - python3-gi-cairo" >> Dockerfile + python3-gi-cairo + xdg-utils" >> Dockerfile - echo "RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen" >> Dockerfile # Prepare environ - echo "FROM $CI_REGISTRY_IMAGE:build-debian-${DEB_VERSION}-${RUNNER}" > Dockerfile2; diff --git a/build/linux/appimage/3_dist-gimp-goappimage.sh b/build/linux/appimage/3_dist-gimp-goappimage.sh index 17bf2a0052..160c7a3bd1 100644 --- a/build/linux/appimage/3_dist-gimp-goappimage.sh +++ b/build/linux/appimage/3_dist-gimp-goappimage.sh @@ -380,6 +380,8 @@ conf_app GS_LIB "share/ghostscript/10*/Resource/Init" ### file-wmf support bund_usr "$UNIX_PREFIX" "share/fonts/type1/urw-base35/Nimbus*" --dest "share/libwmf/fonts" bund_usr "$UNIX_PREFIX" "share/fonts/type1/urw-base35/StandardSymbols*" --dest "share/libwmf/fonts" +### "Send by Email" support +bund_usr "$UNIX_PREFIX" "bin/xdg-email" ### Debug menu: if show_debug_menu is true in app/main.c or --show-debug-menu CLI option is set #### Image graph support bund_usr "$UNIX_PREFIX" "bin/libgvc*" --rename "bin/dot" diff --git a/build/macos/2_bundle-gimp-uni_base.py b/build/macos/2_bundle-gimp-uni_base.py index 6f838fde98..64b4fa7019 100644 --- a/build/macos/2_bundle-gimp-uni_base.py +++ b/build/macos/2_bundle-gimp-uni_base.py @@ -159,8 +159,6 @@ shutil.copy2(Path(f"{os.getenv('MESON_BUILD_ROOT')}/build/macos/fileicon.icns"), ## BUNDLE BASE (BARE MINIMUM TO RUN GTK APPS). -### FIXME: Needed for 'Send to Email' support (should be on sendmail.c source) -bundle(GIMP_SOURCE, "build/macos/patches/xdg-email", "--dest", "MacOS") ### Needed for file dialogs (only .compiled file is needed on macOS) bundle(OPT_PREFIX, "share/glib-*/schemas/gschemas.compiled") ### Mostly bogus since we do use macOS API directly from gimp to open remote files @@ -256,6 +254,8 @@ if os.path.exists(OPT_PREFIX / "bin/port"): bundle(OPT_PREFIX, "share/fonts/libwmf/*", "--dest", "Resources/libwmf/fonts") else: #os.path.exists(OPT_PREFIX / "bin/brew"): bundle(OPT_PREFIX, "Cellar/libwmf/*/share/libwmf/fonts/*", "--dest", "Resources/libwmf/fonts") +### FIXME: Needed for 'Send by Email' support (should be on mail.c source) +bundle(GIMP_SOURCE, "build/macos/patches/xdg-email", "--dest", "MacOS") ### Needed for 'Show image graph'. #### See: https://gitlab.gnome.org/GNOME/gimp/-/issues/6045 bundle(OPT_PREFIX, "bin/dot", "--dest", "MacOS")