X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kde-common-PLD.patch;h=0828582ef2453aec4d31e8542b3c41433b2b8324;hb=refs%2Ftags%2Fauto%2Fth%2Fkdebase-3_5_4-2_1;hp=6e6315e7a7dda16d3b832c037261ec1c65df8794;hpb=3083e66bf87f3423d90f2a5feb2955f63ced1003;p=packages%2Fakode.git

diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
index 6e6315e..0828582 100644
--- a/kde-common-PLD.patch
+++ b/kde-common-PLD.patch
@@ -1,5 +1,6 @@
---- kde-common/admin/acinclude.m4.in.2.455	2004-06-01 13:50:00.863844064 +0200
-+++ kde-common/admin/acinclude.m4.in	2004-06-01 13:49:21.877770848 +0200
+diff -urN kdelibs-3.5.3.or/admin/acinclude.m4.in kdelibs-3.5.3/admin/acinclude.m4.in
+--- kdelibs-3.5.3.or/admin/acinclude.m4.in	2006-05-23 13:02:06.000000000 +0000
++++ kdelibs-3.5.3/admin/acinclude.m4.in	2006-07-01 14:55:49.345359250 +0000
 @@ -428,7 +428,7 @@
  if test "$1" = "default"; then
  
@@ -9,14 +10,78 @@
    fi
    if test -z "$kde_appsdir"; then
      kde_appsdir='\${datadir}/applnk'
-@@ -4276,32 +4276,11 @@
+@@ -2977,41 +2977,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
+ 
+ ])
+ 
+@@ -3153,8 +3118,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
+@@ -4579,9 +4542,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
+ 
+@@ -4728,32 +4691,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 \
@@ -30,8 +95,7 @@
 -     fi
 -    done
 -    ])
-+    AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
- 
+-
 -    if test "$kde_cv_utmp_file" != "no"; then
 -	AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
 -	$1
@@ -46,7 +110,7 @@
  ])
  
  
-@@ -5078,7 +5057,7 @@
+@@ -5536,7 +5478,7 @@
    kde_qtdir="$with_qt_dir"
  fi
  
@@ -55,3 +119,4 @@
  AC_MSG_RESULT($QTDOCDIR)
  
  AC_SUBST(QTDOCDIR)
+