Attachment 1976490 Details for Bug 2223939 – mingw-filesystem.diff

mingw-filesystem.diff

mingw-filesystem.diff (text/plain), 11.56 KB, created by Richard W.M. Jones on 2023-07-19 10:46:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard W.M. Jones

Created: 2023-07-19 10:46:03 UTC

Size: 11.56 KB

patch

obsolete

>Only in new/usr/i686-w64-mingw32/sys-root/mingw/share: icons
>Only in new/usr/i686-w64-mingw32/sys-root/mingw/share: metainfo
>diff -ur old/usr/lib/rpm/macros.d/macros.mingw new/usr/lib/rpm/macros.d/macros.mingw
>--- old/usr/lib/rpm/macros.d/macros.mingw	2023-07-19 10:49:35.877009062 +0100
>+++ new/usr/lib/rpm/macros.d/macros.mingw	2023-07-19 10:49:43.835101163 +0100
>@@ -65,12 +65,15 @@
> run_mingw_make()                                                    \
> {                                                                   \
> %if 0%{?mingw_build_win32} == 1                                     \
>+%{mingw32_env}                                                      \
> %{__make} -C build_win32$MINGW_BUILDDIR_SUFFIX "$@" $MINGW32_MAKE_ARGS   \
> %endif                                                              \
> %if 0%{?mingw_build_win64} == 1                                     \
>+%{mingw64_env}                                                      \
> %{__make} -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" $MINGW64_MAKE_ARGS   \
> %endif                                                              \
> %if 0%{?mingw_build_ucrt64} == 1                                    \
>+%{ucrt64_env}                                                       \
> %{__make} -C build_ucrt64$MINGW_BUILDDIR_SUFFIX "$@" $UCRT64_MAKE_ARGS   \
> %endif                                                              \
> }                                                                   \
>@@ -100,53 +103,56 @@
> }                                                      \
> run_mingw_cmake
> 
>-%mingw_cmake_kde4                                      \
>-run_mingw_cmake_kde4()                                 \
>+
>+%mingw_qmake_qt5                                       \
>+run_mingw_qmake_qt5()                                  \
> {                                                      \
> %if 0%{?mingw_build_win32} == 1                        \
> mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
> pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
>-    %{?mingw32_cmake_kde4 "$@"}                        \
>+    %{?mingw32_qmake_qt5} "$@"                         \
> popd                                                   \
> %endif                                                 \
> %if 0%{?mingw_build_win64} == 1                        \
> mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
> pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
>-    %{?mingw64_cmake_kde4 "$@"}                        \
>+    %{?mingw64_qmake_qt5} "$@"                         \
> popd                                                   \
> %endif                                                 \
> %if 0%{?mingw_build_ucrt64} == 1                       \
> mkdir -p build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
> pushd build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
>-    %{?ucrt64_cmake_kde4 "$@"}                         \
>+    %{?ucrt64_qmake_qt5} "$@"                          \
> popd                                                   \
> %endif                                                 \
> }                                                      \
>-run_mingw_cmake_kde4
>+run_mingw_qmake_qt5
> 
>-%mingw_qmake_qt5                                       \
>-run_mingw_qmake_qt5()                                  \
>+
>+%mingw_qmake_qt6                                       \
>+run_mingw_qmake_qt6()                                  \
> {                                                      \
> %if 0%{?mingw_build_win32} == 1                        \
> mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
> pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
>-    %{?mingw32_qmake_qt5} "$@"                         \
>+    %{?mingw32_qmake_qt6} "$@"                         \
> popd                                                   \
> %endif                                                 \
> %if 0%{?mingw_build_win64} == 1                        \
> mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
> pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
>-    %{?mingw64_qmake_qt5} "$@"                         \
>+    %{?mingw64_qmake_qt6} "$@"                         \
> popd                                                   \
> %endif                                                 \
> %if 0%{?mingw_build_ucrt64} == 1                       \
> mkdir -p build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
> pushd build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
>-    %{?ucrt64_qmake_qt5} "$@"                          \
>+    %{?ucrt64_qmake_qt6} "$@"                          \
> popd                                                   \
> %endif                                                 \
> }                                                      \
>-run_mingw_qmake_qt5
>+run_mingw_qmake_qt6
>+
> 
> %mingw_meson                                           \
> run_mingw_meson()                                      \
>diff -ur old/usr/lib/rpm/macros.d/macros.mingw32 new/usr/lib/rpm/macros.d/macros.mingw32
>--- old/usr/lib/rpm/macros.d/macros.mingw32	2023-07-19 10:49:35.807008252 +0100
>+++ new/usr/lib/rpm/macros.d/macros.mingw32	2023-07-19 10:49:43.765100353 +0100
>@@ -27,6 +27,7 @@
> %mingw32_cppflags        %{nil}
> %mingw32_fflags          -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
> %mingw32_ldflags         -fstack-protector -lssp
>+%mingw32_rustflags       -Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cforce-frame-pointers=yes --cap-lints=warn
> 
> %mingw32_cc              %{mingw32_target}-gcc
> %mingw32_cxx             %{mingw32_target}-g++
>@@ -50,7 +51,7 @@
> %mingw32_windmc          %{mingw32_target}-windmc
> %mingw32_windres         %{mingw32_target}-windres
> 
>-%mingw32_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
>+%mingw32_env unset $(/usr/bin/env | grep -E '^(\w+)=(.*)$' | grep -Evw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
>   if test -z "$PATH_ORIG" ; then \
>     PATH_ORIG="$PATH"; export PATH_ORIG; \
>   fi; \
>@@ -77,6 +78,7 @@
>   FFLAGS="${MINGW32_FFLAGS-%mingw32_fflags}"; export FFLAGS; \
>   FCFLAGS="${MINGW32_FCFLAGS-%mingw32_fflags}"; export FCFLAGS; \
>   LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \
>+  RUSTFLAGS="${MINGW32_RUSTFLAGS:-%mingw32_rustflags}"; export RUSTFLAGS; \
>   for i in `ls %{mingw32_bindir}/*|grep -- "-config\$"` ; do \
>     x=`basename $i|tr "a-z+-." "A-ZX_"`; \
>     declare -x $x="$i" ; export $x; \
>@@ -146,12 +148,10 @@
>   MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir} ${MINGW32_CMAKE_ARGS}" \
>   %mingw32_cmake_generic
> 
>-%mingw32_cmake_kde4 \
>-  MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}/kde4 ${MINGW32_CMAKE_ARGS}" \
>-  %mingw32_cmake_generic
>-
> %mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
> 
>+%mingw32_qmake_qt6 /usr/bin/%{mingw32_target}-qmake-qt6
>+
> %mingw32_meson %{mingw32_env} ; \
>   unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
>   CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \\\
>diff -ur old/usr/lib/rpm/macros.d/macros.mingw64 new/usr/lib/rpm/macros.d/macros.mingw64
>--- old/usr/lib/rpm/macros.d/macros.mingw64	2023-07-19 10:49:35.821008414 +0100
>+++ new/usr/lib/rpm/macros.d/macros.mingw64	2023-07-19 10:49:43.779100515 +0100
>@@ -27,6 +27,7 @@
> %mingw64_cppflags        %{nil}
> %mingw64_fflags          -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
> %mingw64_ldflags         -fstack-protector -lssp
>+%mingw64_rustflags       -Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cforce-frame-pointers=yes --cap-lints=warn
> 
> %mingw64_cc              %{mingw64_target}-gcc
> %mingw64_cxx             %{mingw64_target}-g++
>@@ -50,7 +51,7 @@
> %mingw64_windmc          %{mingw64_target}-windmc
> %mingw64_windres         %{mingw64_target}-windres
> 
>-%mingw64_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
>+%mingw64_env unset $(/usr/bin/env | grep -E '^(\w+)=(.*)$' | grep -Evw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
>   if test -z "$PATH_ORIG" ; then \
>     PATH_ORIG="$PATH"; export PATH_ORIG; \
>   fi; \
>@@ -77,6 +78,7 @@
>   FFLAGS="${MINGW64_FFLAGS-%mingw64_fflags}"; export FFLAGS; \
>   FCFLAGS="${MINGW64_FCFLAGS-%mingw64_fflags}"; export FCFLAGS; \
>   LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \
>+  RUSTFLAGS="${MINGW64_RUSTFLAGS:-%mingw64_rustflags}"; export RUSTFLAGS; \
>   for i in `ls %{mingw64_bindir}/*|grep -- "-config\$"` ; do \
>     x=`basename $i|tr "a-z+-." "A-ZX_"`; \
>     declare -x $x="$i" ; export $x; \
>@@ -146,12 +148,10 @@
>   MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir} ${MINGW64_CMAKE_ARGS}" \
>   %mingw64_cmake_generic
> 
>-%mingw64_cmake_kde4 \
>-  MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}/kde4 ${MINGW64_CMAKE_ARGS}" \
>-  %mingw64_cmake_generic
>-
> %mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
> 
>+%mingw64_qmake_qt6 /usr/bin/%{mingw64_target}-qmake-qt6
>+
> %mingw64_meson %{mingw64_env} ; \
>   unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
>   CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \\\
>diff -ur old/usr/lib/rpm/macros.d/macros.ucrt64 new/usr/lib/rpm/macros.d/macros.ucrt64
>--- old/usr/lib/rpm/macros.d/macros.ucrt64	2023-07-19 10:49:35.891009224 +0100
>+++ new/usr/lib/rpm/macros.d/macros.ucrt64	2023-07-19 10:49:43.849101325 +0100
>@@ -49,7 +49,7 @@
> %ucrt64_windmc          %{ucrt64_target}-windmc
> %ucrt64_windres         %{ucrt64_target}-windres
> 
>-%ucrt64_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
>+%ucrt64_env unset $(/usr/bin/env | grep -E '^(\w+)=(.*)$' | grep -Evw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
>   if test -z "$PATH_ORIG" ; then \
>     PATH_ORIG="$PATH"; export PATH_ORIG; \
>   fi; \
>diff -ur old/usr/lib/rpm/mingw-find-debuginfo.sh new/usr/lib/rpm/mingw-find-debuginfo.sh
>--- old/usr/lib/rpm/mingw-find-debuginfo.sh	2023-07-19 10:49:35.878009073 +0100
>+++ new/usr/lib/rpm/mingw-find-debuginfo.sh	2023-07-19 10:49:43.835101163 +0100
>@@ -12,7 +12,7 @@
> 
> for f in `find $RPM_BUILD_ROOT -type f -name "*.exe" -or -name "*.dll" -or -name "*.pyd"`
> do
>-	case $(mingw-objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
>+	case $(mingw-objdump -h $f 2>/dev/null | grep -Eo '(debug[\.a-z_]*|gnu.version)') in
> 	    *debuglink*) continue ;;
> 	    *debug*) ;;
> 	    *gnu.version*)
>diff -ur old/usr/lib/rpm/mingw-find-lang.sh new/usr/lib/rpm/mingw-find-lang.sh
>--- old/usr/lib/rpm/mingw-find-lang.sh	2023-07-19 10:49:35.878009073 +0100
>+++ new/usr/lib/rpm/mingw-find-lang.sh	2023-07-19 10:49:43.835101163 +0100
>@@ -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
>Only in new/usr/x86_64-w64-mingw32/sys-root/mingw/share: icons
>Only in new/usr/x86_64-w64-mingw32/sys-root/mingw/share: metainfo
>Only in new/usr/x86_64-w64-mingw32ucrt/sys-root/mingw/share: icons
>Only in new/usr/x86_64-w64-mingw32ucrt/sys-root/mingw/share: metainfo

Actions: View

Attachments on bug 2223939: 1976490