From kde-commits  Mon Apr 23 19:25:44 2007
From: David Faure <faure () kde ! org>
Date: Mon, 23 Apr 2007 19:25:44 +0000
To: kde-commits
Subject: branches/KDE/3.5/kdelibs
Message-Id: <1177356344.539555.9233.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=117735637402494

SVN commit 657304 by dfaure:

Fight against -R/usr/lib
+ two minor unrelated fixes


 M  +1 -0      kdecore/configure.in.in  
 M  +2 -0      kdoctools/configure.in.in  
 M  +1 -1      kio/kio/kzip.cpp  
 M  +1 -1      kio/tests/kurifiltertest.cpp  
 M  +1 -0      kioslave/http/configure.in.in  


--- branches/KDE/3.5/kdelibs/kdecore/configure.in.in #657303:657304
@@ -191,6 +191,7 @@
       LIBART_RPATH=
       for args in $LIBART_LIBS; do
 	  case $args in
+	    -L/usr/lib) ;;
 	    -L*)
   	       LIBART_RPATH="$LIBART_RPATH $args"
  	       ;;
--- branches/KDE/3.5/kdelibs/kdoctools/configure.in.in #657303:657304
@@ -15,6 +15,7 @@
      LIBXML_RPATH=
      for args in $LIBXML_LIBS; do
 	  case $args in
+	    -L/usr/lib) ;;
 	    -L*)
   	       LIBXML_RPATH="$LIBXML_RPATH $args"
  	       ;;
@@ -45,6 +46,7 @@
        LIBXSLT_RPATH=
        for args in $LIBXSLT_LIBS; do
 	  case $args in
+	    -L/usr/lib) ;;
 	    -L*)
   	       LIBXSLT_RPATH="$LIBXSLT_RPATH $args"
  	       ;;
--- branches/KDE/3.5/kdelibs/kio/kio/kzip.cpp #657303:657304
@@ -407,7 +407,7 @@
     char buffer[47];
 
     // Check that it's a valid ZIP file
-    // KArchive::open() opened the underlying device already.
+    // the above code opened the underlying device already.
     QIODevice* dev = device();
 
     if (!dev) {
--- branches/KDE/3.5/kdelibs/kio/tests/kurifiltertest.cpp #657303:657304
@@ -241,7 +241,7 @@
 
     filter( "/", "/", KURIFilterData::LOCAL_DIR );
     filter( "/", "/", KURIFilterData::LOCAL_DIR, "kshorturifilter" );
-    filter( "~/.kderc", QDir::homeDirPath().local8Bit()+"/.kderc", KURIFilterData::LOCAL_FILE, "kshorturifilter" );
+    filter( "~/.bashrc", QDir::homeDirPath().local8Bit()+"/.bashrc", KURIFilterData::LOCAL_FILE, "kshorturifilter" );
     filter( "~", QDir::homeDirPath().local8Bit(), KURIFilterData::LOCAL_DIR, "kshorturifilter", "/tmp" );
     filter( "~foobar", 0, KURIFilterData::ERROR, "kshorturifilter" );
     filter( "user@host.domain", "mailto:user@host.domain", KURIFilterData::NET_PROTOCOL ); // new in KDE-3.2
--- branches/KDE/3.5/kdelibs/kioslave/http/configure.in.in #657303:657304
@@ -24,6 +24,7 @@
     if test "$USE_RPATH" = yes; then
       for args in $GSSAPI_LIBS; do
         case $args in
+          -L/usr/lib) ;;
           -L*)
              GSSAPI_RPATH="$GSSAPI_RPATH $args"
              ;;