From 683d2a8c2ee76b09bb13dd5c4da0e9fb57893e74 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 5 Feb 2025 17:16:11 -0700 Subject: [PATCH] prevent message catalogs (*.mo) for appdata from being placed in the wrong location These message catalogs are specifically installed elsewhere in these scripts, and they should be excluded from a find(1)-based discovery process. Note that the order of discovery will vary depending on (at least) filesystem tyoe, and so without this fix, the .mo files from gtk2_ardour/appdata could end up overwriting the .mo friles from gtk2_ardour itself. This happened for the 8.11 release --- tools/linux_packaging/build | 2 +- tools/osx_packaging/osx_build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index a2b736f02d..0ee5d06ea2 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -301,7 +301,7 @@ if test x$WITH_NLS != x ; then LINGUAS= for pkg in gtk2_ardour libs/ardour libs/gtkmm2ext libs/tk/ytk ; do - files=`find ../../$pkg -name "*.mo"` + files=`find ../../$pkg -name "*.mo" \! -path "*/appdata/*"` # # the package name is appended with a number so that diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 264fd9a13f..11d18eb9d3 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -268,7 +268,7 @@ if test x$WITH_NLS != x ; then LINGUAS= for pkg in gtk2_ardour libs/ardour libs/gtkmm2ext lib/tk/ytk ; do - files=`find ../../$pkg -name "*.mo"` + files=`find ../../$pkg -name \! -path "*/appdata/*" "*.mo"` # # the package name is appended with a number so that