From 05b397c2f2621522b71999ad324ac0f26573803d Mon Sep 17 00:00:00 2001 From: djurban Date: Tue, 3 May 2005 17:34:53 +0000 Subject: [PATCH] - remove braindamaged blacklisting of gcc 4.00 by kde, our gcc is patched and it doesnt miscompile kde Changed files: kde-common-gcc4.patch -> 1.1 --- kde-common-gcc4.patch | 125 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 kde-common-gcc4.patch diff --git a/kde-common-gcc4.patch b/kde-common-gcc4.patch new file mode 100644 index 0000000..2d17b24 --- /dev/null +++ b/kde-common-gcc4.patch @@ -0,0 +1,125 @@ +--- amarok/admin/acinclude.m4.in.orig 2005-05-03 16:39:47.000000000 +0200 ++++ amarok/admin/acinclude.m4.in 2005-05-03 17:18:15.629229288 +0200 +@@ -428,7 +428,7 @@ + if test "$1" = "default"; then + + if test -z "$kde_htmldir"; then +- kde_htmldir='\${datadir}/doc/HTML' ++ kde_htmldir='/usr/share/doc/kde/HTML' + fi + if test -z "$kde_appsdir"; then + kde_appsdir='\${datadir}/applnk' +@@ -2909,46 +2909,6 @@ + ]) + + +-AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER], +-[ +- AC_MSG_CHECKING([whether $CC is blacklisted]) +- +- dnl In theory we have tu run this test against $CC and $CXX +- dnl in C and in C++ mode, because its perfectly legal for +- dnl the user to mix compiler versions, since C has a defined +- dnl ABI. +- dnl +- dnl For now, we assume the user is not on crack. +- +- AC_TRY_COMPILE([ +-#ifdef __GNUC__ +-#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0 +-choke me +-#endif +-#endif +-], , +- kde_bad_compiler=no, +- kde_bad_compiler=yes +-) +- +- AC_MSG_RESULT($kde_bad_compiler) +- +-if test "$kde_bad_compiler" = "yes"; then +- AC_MSG_ERROR([ +- +-This particular compiler version is blacklisted because it +-is known to miscompile KDE. Please use a newer version, or +-if that is not yet available, choose an older version. +- +-Please do not report a bug or bother us reporting this +-configure error. We know about it, and we introduced +-it by intention to avoid untraceable bugs or crashes in KDE. +- +-]) +-fi +- +-]) +- + dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given + AC_DEFUN([AC_VALIDIFY_CXXFLAGS], + [dnl +@@ -3058,8 +3018,6 @@ + + AC_PROG_CXX + +- KDE_CHECK_FOR_BAD_COMPILER +- + if test "$GXX" = "yes" || test "$CXX" = "KCC"; then + if test "$kde_use_debug_code" != "no"; then + if test "$CXX" = "KCC"; then +@@ -4402,9 +4360,9 @@ + LIBPYTHON=-lpython$version + fi + +-AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir) ++AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir) + python_moddir=$python_moddir/python$version +-if test ! -r $python_moddir/copy.py; then ++if test ! -r $python_moddir/copy.pyc; then + python_moddir=no + fi + +@@ -4551,32 +4509,11 @@ + [ + AC_MSG_CHECKING([for utmp file]) + +- AC_CACHE_VAL(kde_cv_utmp_file, +- [ +- kde_cv_utmp_file=no ++ AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx]) + +- for ac_file in \ +- \ +- /var/run/utmp \ +- /var/adm/utmp \ +- /etc/utmp \ +- ; \ +- do +- if test -r "$ac_file"; then +- kde_cv_utmp_file=$ac_file +- break +- fi +- done +- ]) +- +- if test "$kde_cv_utmp_file" != "no"; then +- AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) +- $1 +- AC_MSG_RESULT($kde_cv_utmp_file) +- else +- $2 +- AC_MSG_RESULT([non found]) +- fi ++ AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) ++ $1 ++ AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.) + ]) + + +@@ -5359,7 +5296,7 @@ + kde_qtdir="$with_qt_dir" + fi + +-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR) ++AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR) + AC_MSG_RESULT($QTDOCDIR) + + AC_SUBST(QTDOCDIR) -- 2.44.0