gcc: skip cygwin libstdc++ patch which adds libiconv and libintl deps

This added a runtime dep on iconv and gettext development files, which
we were missing. Let's skip this for now to keep the update simpler.

If someone is missing those features we can look into adding them back.

See https://github.com/msys2/MSYS2-packages/pull/5458#issuecomment-3008811572

gcc/0951-11.2.0-msys2-spec.patch

@@ -37,17 +37,17 @@ diff -Nur gcc-13.4.0.orig/gcc/config/i386/cygwin.h gcc-13.4.0/gcc/config/i386/cy
 +      builtin_define ("__MSYS__");				\
        if (!TARGET_64BIT)					\
  	builtin_define ("__CYGWIN32__");			\
-       builtin_define ("__unix__");				\
+       builtin_define_std ("unix");				\
-@@ -85,7 +86,7 @@
+@@ -83,7 +84,7 @@
+ #define LIB_SPEC "\
+   %{pg:-lgmon} \
    %{pthread: } \
-   -lintl \
-   -liconv \
 -  -lcygwin \
 +  -lmsys-2.0 \
    %{mwindows:-lgdi32 -lcomdlg32} \
    %{fvtable-verify=preinit:-lvtv -lpsapi; \
      fvtable-verify=std:-lvtv -lpsapi} \
-@@ -130,8 +131,8 @@
+@@ -128,8 +129,8 @@
    %{shared: %{mdll: %eshared and mdll are not compatible}} \
    %{shared: --shared} %{mdll:--dll} \
    %{static:-Bstatic} %{!static:-Bdynamic} \
@@ -58,7 +58,7 @@ diff -Nur gcc-13.4.0.orig/gcc/config/i386/cygwin.h gcc-13.4.0/gcc/config/i386/cy
    %{rdynamic: --export-all-symbols} \
    %{!shared: %{!mdll: --large-address-aware --tsaware}}"
  
-@@ -153,7 +154,7 @@
+@@ -151,7 +152,7 @@
  #else
  #define LIBGCC_EH_EXTN "-sjlj"
  #endif
@@ -94,8 +94,8 @@ diff -Nur gcc-13.4.0.orig/libgcc/config/i386/t-cygwin gcc-13.4.0/libgcc/config/i
  	-I$(srcdir)/../winsup/cygwin/include
  
  # Cygwin-specific parts of LIB_SPEC
--SHLIB_LC = -lintl -liconv -lcygwin -ladvapi32 -lshell32 -luser32 -lkernel32
+-SHLIB_LC = -lcygwin -ladvapi32 -lshell32 -luser32 -lkernel32
-+SHLIB_LC = -lintl -liconv -lmsys-2.0 -ladvapi32 -lshell32 -luser32 -lkernel32
++SHLIB_LC = -lmsys-2.0 -ladvapi32 -lshell32 -luser32 -lkernel32
  
  # We have already included one of the t-{dw2,sjlj}-eh fragments for EH_MODEL
  SHLIB_EH_EXTENSION = $(subst -dw2,,-$(EH_MODEL))

gcc/PKGBUILD

@@ -10,7 +10,7 @@ pkgname=('gcc' 'gcc-libs')
 # NOTE: libtool must be rebuilt with each new gcc version.
 # FIXME: run compileall on /usr/share/gcc-${pkgver}/python/libstdcxx on the next version update
 pkgver=15.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
 license=('spdx:GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND GCC-exception-3.1 AND GFDL-1.3-or-later')
@@ -20,7 +20,7 @@ msys2_references=(
   "cpe: cpe:/a:gnu:gcc"
 )
 makedepends=('gcc' 'binutils' 'autotools'
-             'isl-devel' 'libiconv-devel' 'gettext-devel' 'gmp-devel' 'mpc-devel' 'mpfr-devel' 'zlib-devel'
+             'isl-devel' 'gmp-devel' 'mpc-devel' 'mpfr-devel' 'zlib-devel'
              'windows-default-manifest' 'gperf')
 options=('!emptydirs') # '!strip' 'debug')
 source=(https://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/gcc-${pkgver}.tar.xz
@@ -64,7 +64,7 @@ sha256sums=('e2b09ec21660f01fecffb715e0120265216943f038d0e48a9868713e54f06cea'
             '2a48b2a29652d7dee5578aed9e56dcd448d9f50b19387dfa462fc2ffb4ad5d9e'
             '25d1b2d4cd985cdf3e140b9724fd0c10590a7d06519aef6391c3f3029bffd6eb'
             '646b6e802e46f932fa793e0e9348c7c98064e46a9bac76f4ad258b66b2b3bba9'
-            'e5206542f38b448d121787936023c9ea30e4bb2f5491ca91137b387581a44551')
+            '82bc03f43fd7e103c1373433340d6654cbc771723db54430b18eff48a3935a45')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -108,11 +108,17 @@ prepare() {
     0012-Cygwin-define-STD_UNIX.patch \
     0101-Cygwin-enable-libgccjit-not-just-for-MingW.patch \
     0102-Cygwin-testsuite-fixes-for-libgccjit.patch \
-    0301-libstdc-Implement-most-of-locale-features-for-newlib.patch \
-    0401-fix-build-stage1-now-depends-on-libintl-libiconv.patch \
     0403-fix-build-pretty-print.patch \
     0404-fix-build-opts.patch
 
+  # Skipped Cygwin patches
+  #
+  # Would need a dependency on libiconv and libintl development files, see
+  # https://github.com/msys2/MSYS2-packages/pull/5458#issuecomment-3008811572
+  # https://cygwin.com/pipermail/cygwin-apps/2025-May/044326.html
+  # 0301-libstdc-Implement-most-of-locale-features-for-newlib.patch
+  # 0401-fix-build-stage1-now-depends-on-libintl-libiconv.patch
+
   # MSYS2 Patches
   apply_patch_with_msg \
     0950-11.2.0-configure-msys2.patch \