wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout d26d6aab28da (bug 1003702) for breaking everything

Browse Source
This commit is contained in:
Randell Jesup 2014-05-01 03:05:14 -04:00
parent 93e853468f
commit df622e94ed
4 changed files with 0 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
intl/icu-patches/suppress-warnings.diff
View File

@ -1,80 +0,0 @@
diff --git a/intl/icu/source/acinclude.m4 b/intl/icu/source/acinclude.m4
--- a/intl/icu/source/acinclude.m4
+++ b/intl/icu/source/acinclude.m4
@@ -466,30 +466,36 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
*)
# Do not use -ansi. It limits us to C90, and it breaks some platforms.
# We use -std=c99 to disable the gnu99 defaults and its associated warnings
CFLAGS="$CFLAGS -std=c99"
;;
esac
CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
+
+ # Suppress clang C warnings:
+ CFLAGS="$CFLAGS -Wno-sign-compare -Wno-unused"
else
case "${host}" in
*-*-cygwin)
if test "`$CC /help 2>&1 | head -c9`" = "Microsoft"
then
CFLAGS="$CFLAGS /W4"
fi ;;
*-*-mingw32|*-*-mingw64)
CFLAGS="$CFLAGS -W4" ;;
esac
fi
if test "$GXX" = yes
then
CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
+
+ # Suppress clang C++ warnings:
+ CXXFLAGS="$CXXFLAGS -Wno-unused -Wno-unused-parameter"
else
case "${host}" in
*-*-cygwin)
if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft"
then
CXXFLAGS="$CXXFLAGS /W4"
fi ;;
*-*-mingw32|*-*-mingw64)
diff --git a/intl/icu/source/configure b/intl/icu/source/configure
--- a/intl/icu/source/configure
+++ b/intl/icu/source/configure
@@ -4089,30 +4089,36 @@ fi
*)
# Do not use -ansi. It limits us to C90, and it breaks some platforms.
# We use -std=c99 to disable the gnu99 defaults and its associated warnings
CFLAGS="$CFLAGS -std=c99"
;;
esac
CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
+
+ # Suppress clang C warnings:
+ CFLAGS="$CFLAGS -Wno-sign-compare -Wno-unused"
else
case "${host}" in
*-*-cygwin)
if test "`$CC /help 2>&1 | head -c9`" = "Microsoft"
then
CFLAGS="$CFLAGS /W4"
fi ;;
*-*-mingw32|*-*-mingw64)
CFLAGS="$CFLAGS -W4" ;;
esac
fi
if test "$GXX" = yes
then
CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
+
+ # Suppress clang C++ warnings:
+ CXXFLAGS="$CXXFLAGS -Wno-unused -Wno-unused-parameter"
else
case "${host}" in
*-*-cygwin)
if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft"
then
CXXFLAGS="$CXXFLAGS /W4"
fi ;;
*-*-mingw32|*-*-mingw64)

6
intl/icu/source/acinclude.m4
View File

@ -471,9 +471,6 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
esac
CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
# Suppress clang C warnings:
CFLAGS="$CFLAGS -Wno-sign-compare -Wno-unused"
else
case "${host}" in
*-*-cygwin)
@ -488,9 +485,6 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
if test "$GXX" = yes
then
CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
# Suppress clang C++ warnings:
CXXFLAGS="$CXXFLAGS -Wno-unused -Wno-unused-parameter"
else
case "${host}" in
*-*-cygwin)

6
intl/icu/source/configure vendored
View File

@ -4094,9 +4094,6 @@ $as_echo "$ac_use_strict_options" >&6; }
esac
CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
# Suppress clang C warnings:
CFLAGS="$CFLAGS -Wno-sign-compare -Wno-unused"
else
case "${host}" in
*-*-cygwin)
@ -4111,9 +4108,6 @@ $as_echo "$ac_use_strict_options" >&6; }
if test "$GXX" = yes
then
CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
# Suppress clang C++ warnings:
CXXFLAGS="$CXXFLAGS -Wno-unused -Wno-unused-parameter"
else
case "${host}" in
*-*-cygwin)

1
intl/update-icu.sh
View File

@ -55,6 +55,5 @@ patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-899722-4
patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-915735
patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/genrb-omitCollationRules.diff
patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/qualify-uinitonce-windows.diff
patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/suppress-warnings.diff
hg addremove ${icu_dir}