Fix building with clang (failed with ilmbase and -fno-exceptions)

2 files changed, 16 insertions, 8 deletions

diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 22c21d279ce..424d714f9cc 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.99 2011/01/18 10:22:57 markd Exp $
+$NetBSD: distinfo,v 1.100 2011/08/22 17:16:24 adam Exp $
 
 SHA1 (kdelibs-3.5.10.tar.bz2) = c930a25f4419134def55b8466c3a6f737227fb82
 RMD160 (kdelibs-3.5.10.tar.bz2) = 4c960664283c83ebc8e68932ca9044336fcff223
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779
 SHA1 (patch-ab) = 3a79b3e7fadef1a93a5490b716dace60f3de30a1
 SHA1 (patch-ac) = 205f99e8749c32bf445e23f6076dd642c10c8186
 SHA1 (patch-ad) = d8ddcea1a281474b7694979b14744c5e06b56b65
-SHA1 (patch-ae) = b609ee21da08885fd359b9a163d428cbb3955e74
+SHA1 (patch-ae) = 5cf8eb6bb6a376ee3f9293504ab1cec58646446d
 SHA1 (patch-af) = c77e57b564719c45c24ce737a4c0d4154df8563b
 SHA1 (patch-aj) = 2ec8d33ce6684da7c60759cf395b78fa4ac2eaec
 SHA1 (patch-an) = d34a3cc0ac0b92921bcaeb9b05c5b7a99ee3566c
diff --git a/x11/kdelibs3/patches/patch-ae b/x11/kdelibs3/patches/patch-ae
index 48195bbe5ff..f897d0018b5 100644
--- a/x11/kdelibs3/patches/patch-ae
+++ b/x11/kdelibs3/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.11 2007/10/20 10:36:15 markd Exp $
+$NetBSD: patch-ae,v 1.12 2011/08/22 17:16:24 adam Exp $
 
---- configure.orig	2007-10-09 03:42:25.000000000 +1300
+--- configure.orig	2008-08-20 16:06:05.000000000 +0000
 +++ configure
 @@ -8315,7 +8315,7 @@ darwin* | rhapsody*)
    lt_cv_deplibs_check_method=pass_all
@@ -92,7 +92,7 @@ $NetBSD: patch-ae,v 1.11 2007/10/20 10:36:15 markd Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -45210,7 +45210,7 @@ echo "$as_me: error: Fast malloc is not 
+@@ -45355,7 +45355,7 @@ echo "$as_me: error: Fast malloc is not 
      esac
      case $target_os in
          linux*) ;;
@@ -101,7 +101,15 @@ $NetBSD: patch-ae,v 1.11 2007/10/20 10:36:15 markd Exp $
          *)
              if test "$kde_fast_malloc" = "notgiven"; then
                  kde_fast_malloc=no
-@@ -51069,7 +51069,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
+@@ -49056,6 +49056,7 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} 
+            kde_save_CXXFLAGS="$CXXFLAGS"
+            EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
+            CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
++           CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
+ 
+            cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -51215,7 +51216,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
        gssapi_flavor=HEIMDAL
      fi
    else
@@ -110,7 +118,7 @@ $NetBSD: patch-ae,v 1.11 2007/10/20 10:36:15 markd Exp $
  
  gssapi_incdir=NO
  for i in $search_incs;
-@@ -51112,7 +51112,7 @@ done
+@@ -51258,7 +51259,7 @@ done
              GSSAPI_LIBS="-L$gssapi_libdir "
              test "$USE_RPATH" = yes && GSSAPI_RPATH="-R $gssapi_libdir"
            fi
@@ -119,7 +127,7 @@ $NetBSD: patch-ae,v 1.11 2007/10/20 10:36:15 markd Exp $
            with_gssapi=FOUND
            gssapi_flavor=HEIMDAL
            break
-@@ -51156,7 +51156,7 @@ echo "${ECHO_T}searched but not found" >
+@@ -51302,7 +51303,7 @@ echo "${ECHO_T}searched but not found" >
        GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIBRESOLV}"
      else
        gssapi_flavor=HEIMDAL