diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3121284aa..313c2aba4c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -666,6 +666,7 @@ gimp-win-eol: tags: - macos variables: + ORKA_RUNNER: tahoe-1 PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true' before_script: - export GIMP_PREFIX="$PWD/_install-$(uname -m)" diff --git a/build/macos/2_bundle-gimp-uni_base.py b/build/macos/2_bundle-gimp-uni_base.py index bc7b7a55f6..148d53826c 100644 --- a/build/macos/2_bundle-gimp-uni_base.py +++ b/build/macos/2_bundle-gimp-uni_base.py @@ -152,7 +152,7 @@ GIMP_DISTRIB.mkdir(parents=True, exist_ok=True) shutil.copy2(Path(f"{GIMP_SOURCE}/build/macos/Info.plist"), GIMP_DISTRIB) ### FIXME: Icon (generate Assets.car for Liquid Glass: https://gitlab.gnome.org/Infrastructure/Infrastructure/-/issues/2159) (GIMP_DISTRIB / "Resources").mkdir(parents=True, exist_ok=True) -#subprocess.run(["xcrun","actool",str(Path(f"{os.getenv('MESON_BUILD_ROOT')}/gimp-data/images/logo/AppIcon.icon")),"--output-format","human-readable-text","--compile",f"{GIMP_DISTRIB / 'Resources'}","--include-all-app-icons","--enable-on-demand-resources","NO","--enable-icon-stack-fallback-generation","NO","--development-region","en","--target-device","mac","--platform","macosx","--minimum-deployment-target",os.getenv('MACOSX_DEPLOYMENT_TARGET')], check=True) +subprocess.run(["xcrun","actool",str(Path(f"{os.getenv('MESON_BUILD_ROOT')}/gimp-data/images/logo/AppIcon.icon")),"--output-format","human-readable-text","--compile",f"{GIMP_DISTRIB / 'Resources'}","--include-all-app-icons","--enable-on-demand-resources","NO","--enable-icon-stack-fallback-generation","NO","--development-region","en","--target-device","mac","--platform","macosx","--minimum-deployment-target",os.getenv('MACOSX_DEPLOYMENT_TARGET')], check=True) shutil.copy2(Path(f"{os.getenv('MESON_BUILD_ROOT')}/gimp-data/images/logo/gimp.icns"), GIMP_DISTRIB / "Resources/AppIcon.icns") shutil.copy2(Path(f"{os.getenv('MESON_BUILD_ROOT')}/build/macos/fileicon-xcf.icns"), GIMP_DISTRIB / "Resources/fileicon-xcf.icns") shutil.copy2(Path(f"{os.getenv('MESON_BUILD_ROOT')}/build/macos/fileicon.icns"), GIMP_DISTRIB / "Resources/fileicon.icns") diff --git a/build/macos/Info.plist b/build/macos/Info.plist index cf52a42657..5c696e19a6 100644 --- a/build/macos/Info.plist +++ b/build/macos/Info.plist @@ -8,6 +8,8 @@ gimp%MUTEX_SUFFIX% CFBundleIconFile AppIcon.icns + CFBundleIconName + AppIcon CFBundleIdentifier %BUNDLE_IDENTIFIER% CFBundleInfoDictionaryVersion