Fix mingw-find-lang.sh exit code

mingw-filesystem.spec

@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        132
-Release:        1%{?dist}
+Version:        133
+Release:        4%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -358,6 +358,21 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Wed Apr 05 2023 Sandro Mani <manisandro@gmail.com> - 133-4
+- Fix mingw-find-lang.sh exit code
+
+* Fri Dec 09 2022 Sandro Mani <manisandro@gmail.com> - 133-3
+- Prevent mingw-find-lang.sh from clobbering previous find-lang results
+
+* Sat Jun 04 2022 Sandro Mani <manisandro@gmail.com> - 133-2
+- Add shcore.dll to standard dlls
+
+* Mon May 09 2022 Richard Hughes <richard@hughsie.com> - 133-1
+- Include glib-mkenums in the toolchain binaries to avoid installing host GLib for building.
+
+* Thu Apr 21 2022 Sandro Mani <manisandro@gmail.com> - 132-2
+- Rebuild
+
 * Mon Feb 21 2022 Sandro Mani <manisandro@gmail.com> - 132-1
 - Create build_winXX directories with mkdir -p
 

mingw-find-lang.sh

@@ -2,16 +2,23 @@
 
 # Wrapper for the %find_lang macro which splits out the various translations in per-target lists
 
+PACKAGE_NAME=$2
+
+# If previous result from native find-lang exists, filter mingw entries and move it out of the way
+test -f ${PACKAGE_NAME}.lang && grep -v mingw32 ${PACKAGE_NAME}.lang > ${PACKAGE_NAME}-native.lang
+
 /usr/lib/rpm/find-lang.sh $*
+
 if test $? != 0 ; then
+    test -f ${PACKAGE_NAME}-native.lang && mv ${PACKAGE_NAME}-native.lang ${PACKAGE_NAME}.lang
     exit 1
 fi
 
-PACKAGE_NAME=$2
 targets=`rpm --eval '%{mingw_build_targets}'`
 for target in $targets; do
 	prefix=`rpm --eval "%{${target}_prefix}"`
-	cat $2.lang | grep "$prefix" > ${target}-$PACKAGE_NAME.lang
+	cat ${PACKAGE_NAME}.lang | grep "$prefix" > ${target}-$PACKAGE_NAME.lang
 done
 
+test -f ${PACKAGE_NAME}-native.lang && mv ${PACKAGE_NAME}-native.lang ${PACKAGE_NAME}.lang
 exit 0

standard-dlls-mingw32

@@ -235,6 +235,7 @@ schedcli.dll
 scsiport.sys
 secur32.dll
 setupapi.dll
+shcore.dll
 shell32.dll
 shfolder.dll
 shlwapi.dll

standard-dlls-mingw64

@@ -983,6 +983,7 @@ sfcfiles.dll
 sfc_os.dll
 sfilter2.dll
 sfmapi.dll
+shcore.dll
 shdocvw.dll
 shell32.dll
 shfolder.dll

toolchain-mingw32.meson

@@ -10,6 +10,7 @@ strip = '/usr/bin/i686-w64-mingw32-strip'
 windres = '/usr/bin/i686-w64-mingw32-windres'
 dlltool = '/usr/bin/i686-w64-mingw32-dlltool'
 libgcrypt-config = '/usr/i686-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
+glib-mkenums = '/usr/i686-w64-mingw32/sys-root/mingw/bin/glib-mkenums'
 
 [properties]
 root = '/usr/i686-w64-mingw32/sys-root/mingw'

toolchain-mingw64.meson

@@ -10,6 +10,7 @@ strip = '/usr/bin/x86_64-w64-mingw32-strip'
 windres = '/usr/bin/x86_64-w64-mingw32-windres'
 dlltool = '/usr/bin/x86_64-w64-mingw32-dlltool'
 libgcrypt-config = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
+glib-mkenums = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/glib-mkenums'
 
 [properties]
 root = '/usr/x86_64-w64-mingw32/sys-root/mingw'