From 063367eefbbe5da8116d4457f3ff38c0d874d7b2 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 21 Apr 2022 22:52:14 +0200 Subject: [PATCH 1/5] Rebuild --- mingw-filesystem.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index acea6f2..79a87fd 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -7,7 +7,7 @@ Name: mingw-filesystem Version: 132 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPLv2+ @@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c %changelog +* Thu Apr 21 2022 Sandro Mani - 132-2 +- Rebuild + * Mon Feb 21 2022 Sandro Mani - 132-1 - Create build_winXX directories with mkdir -p From 8504f8e1ba71a8f08d7a4fb966e7028ac33aafd1 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 9 May 2022 08:49:16 +0100 Subject: [PATCH 2/5] Include glib-mkenums in the toolchain binaries --- mingw-filesystem.spec | 7 +++++-- toolchain-mingw32.meson | 1 + toolchain-mingw64.meson | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 79a87fd..82fc761 100644 --- a/mingw-filesystem.spec +++ b/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: 2%{?dist} +Version: 133 +Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPLv2+ @@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c %changelog +* Mon May 09 2022 Richard Hughes 133-1 +- Include glib-mkenums in the toolchain binaries to avoid installing host GLib for building. + * Thu Apr 21 2022 Sandro Mani - 132-2 - Rebuild diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson index 99fe91a..563565c 100644 --- a/toolchain-mingw32.meson +++ b/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' diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson index 2f633aa..01d83ee 100644 --- a/toolchain-mingw64.meson +++ b/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' From 09ec3aab4557eb6c824fb1606ee1569284132fd2 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 4 Jun 2022 21:57:33 +0200 Subject: [PATCH 3/5] Add shcore.dll to standard dlls --- mingw-filesystem.spec | 7 +++++-- standard-dlls-mingw32 | 1 + standard-dlls-mingw64 | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 82fc761..3a2f943 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -7,7 +7,7 @@ Name: mingw-filesystem Version: 133 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPLv2+ @@ -358,7 +358,10 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c %changelog -* Mon May 09 2022 Richard Hughes 133-1 +* Sat Jun 04 2022 Sandro Mani - 133-2 +- Add shcore.dll to standard dlls + +* Mon May 09 2022 Richard Hughes - 133-1 - Include glib-mkenums in the toolchain binaries to avoid installing host GLib for building. * Thu Apr 21 2022 Sandro Mani - 132-2 diff --git a/standard-dlls-mingw32 b/standard-dlls-mingw32 index 2606332..b400c09 100644 --- a/standard-dlls-mingw32 +++ b/standard-dlls-mingw32 @@ -235,6 +235,7 @@ schedcli.dll scsiport.sys secur32.dll setupapi.dll +shcore.dll shell32.dll shfolder.dll shlwapi.dll diff --git a/standard-dlls-mingw64 b/standard-dlls-mingw64 index 496a4a7..f351110 100644 --- a/standard-dlls-mingw64 +++ b/standard-dlls-mingw64 @@ -983,6 +983,7 @@ sfcfiles.dll sfc_os.dll sfilter2.dll sfmapi.dll +shcore.dll shdocvw.dll shell32.dll shfolder.dll From e497b3803c28cc7481b4120b46c6f252501b929b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 9 Dec 2022 12:28:47 +0100 Subject: [PATCH 4/5] Prevent mingw-find-lang.sh from clobbering previous find-lang results --- mingw-filesystem.spec | 5 ++++- mingw-find-lang.sh | 12 +++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 3a2f943..347b484 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -7,7 +7,7 @@ Name: mingw-filesystem Version: 133 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPLv2+ @@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c %changelog +* Fri Dec 09 2022 Sandro Mani - 133-3 +- Prevent mingw-find-lang.sh from clobbering previous find-lang results + * Sat Jun 04 2022 Sandro Mani - 133-2 - Add shcore.dll to standard dlls diff --git a/mingw-find-lang.sh b/mingw-find-lang.sh index 097fc21..55b9adb 100755 --- a/mingw-find-lang.sh +++ b/mingw-find-lang.sh @@ -2,16 +2,22 @@ # 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 -exit 0 +test -f ${PACKAGE_NAME}-native.lang && mv ${PACKAGE_NAME}-native.lang ${PACKAGE_NAME}.lang From 53c5ff61b851f6d93b07972c505d47e36ab172d7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 5 Apr 2023 14:53:13 +0200 Subject: [PATCH 5/5] Fix mingw-find-lang.sh exit code --- mingw-filesystem.spec | 5 ++++- mingw-find-lang.sh | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 347b484..a6a3848 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -7,7 +7,7 @@ Name: mingw-filesystem Version: 133 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPLv2+ @@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c %changelog +* Wed Apr 05 2023 Sandro Mani - 133-4 +- Fix mingw-find-lang.sh exit code + * Fri Dec 09 2022 Sandro Mani - 133-3 - Prevent mingw-find-lang.sh from clobbering previous find-lang results diff --git a/mingw-find-lang.sh b/mingw-find-lang.sh index 55b9adb..81421fd 100755 --- a/mingw-find-lang.sh +++ b/mingw-find-lang.sh @@ -21,3 +21,4 @@ for target in $targets; do done test -f ${PACKAGE_NAME}-native.lang && mv ${PACKAGE_NAME}-native.lang ${PACKAGE_NAME}.lang +exit 0