[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenox/konq-embed
From:       Luciano Montanaro <mikelima () cirulla ! net>
Date:       2005-08-26 12:57:15
Message-ID: 1125061035.921496.17208.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 453545 by montanaro:

- New patch for the http ioslave in kdelibs 3.4.2
- Removed checks for older kdelibs from prepare_kde_src


 A             kdesrc/kio/http/patches/disable_webdav_ntlp_3.4.2.patch  
 M  +2 -66     prepare_kde_src  


--- trunk/kdenox/konq-embed/prepare_kde_src #453544:453545
@@ -85,33 +85,11 @@
 
 
 case $KDELIBS_VERSION in
-	3.2.*) 
-		cp -p $src/kdecore/kdemacros.h $dst/kdecore/
-		cp -p $src/kdecore/kshell.{cpp,h} $dst/kdecore/ 
-		;;
-	3.3.[12]*) 
-		cp -p $src/kdecore/kextsocklookup.h $dst/kdecore/
-		cp -p $src/kdecore/kdemacros.h $dst/kdecore/
-		cp -p $src/kdecore/kshell.{cpp,h} $dst/kdecore/
-                #mkdir $dst/kdecore/network
-		cp -p $src/kdecore/network/kresolver.{cpp,h} $dst/kdecore
-		cp -p $src/kdecore/network/kresolver_p.h $dst/kdecore
-		cp -p $src/kdecore/network/kresolvermanager.cpp $dst/kdecore
-		cp -p $src/kdecore/network/kresolver_p.h $dst/kdecore
-		cp -p $src/kdecore/network/kresolverstandardworkers.cpp $dst/kdecore
-		cp -p $src/kdecore/network/kresolverstandardworkers_p.h $dst/kdecore
-		cp -p $src/kdecore/network/kresolverworkerbase.cpp $dst/kdecore
-		cp -p $src/kdecore/network/kresolverworkerbase.h $dst/kdecore
-
-		cp -p $src/kdecore/network/ksocketaddress.{cpp,h} $dst/kdecore
-		#cp -p $src/kdecore/network/Makefile.am $dst/kdecore/network
-                ;;
 	3.4.*)
 		cp -p $src/kdecore/kdemacros.h.in $dst/kdecore/
 		cp -p $src/kdecore/kdelibs_export.h $dst/kdecore/
 		cp -p $src/kdecore/kde_file.h $dst/kdecore/
 		cp -p $src/kdecore/kshell.{cpp,h} $dst/kdecore/ 
-		cp -p $src/kdecore/kswap.h $dst/kdecore/ 
 		cp -p $src/kdecore/fixx11h.h $dst/kdecore/
 		
 		cp -p $src/kdecore/network/kresolver.{cpp,h} $dst/kdecore
@@ -149,14 +127,6 @@
 	3.4.*) 
 		cp -p $src/kio/httpfilter/httpfilter.{cc,h} $dst/kio/http/
 		;;
-	3.3.[12]*) 
-		cp -p $src/kio/httpfilter/httpfilter.{cpp,cc,h} $dst/kio/http/
-		perl -pi -e "s,kdemain\(,http_kdemain\(,g" $dst/kio/http/http.cc
-		;;
-	3.[12].*)
-		cp -p $src/kioslave/http/httpfilter.{cpp,cc,h} $dst/kio/http/
-		perl -pi -e "s,kdemain\(,http_kdemain\(,g" $dst/kio/http/http.cc
-		;;
 	*)
 		;;
 esac
@@ -215,9 +185,6 @@
 		perl -pi -e "s,\(kjs/global.h\),\(konq-embed/kdesrc/kjs/global.h\),g" $dst/kjs/configure.in.in
 		cp -p $dst/kjs/Makefile.am.3.4 $dst/kjs/Makefile.am
 		;;
-	3.3.[0123]*) 
-		cp -p $dst/kjs/Makefile.am.3.2 $dst/kjs/Makefile.am
-		;;
 esac
 
 # for kdelibs v3.2 - should be harmless for 3.1
@@ -315,22 +282,14 @@
 #cp -p $src/kio/kssl/ksslinfodlg.{cc,h} $dst/kssl
 # for kdelibs v3.2
 case $KDELIBS_VERSION in
-	3.3.*) 
-		cp $dst/kssl/Makefile.am.3.2 $dst/kssl/Makefile.am
-		cp -p $src/kio/kssl/ksslsession.{cc,h} $dst/kssl
-		cp -p $src/kio/kssl/ksslinfodlg.{cc,h} $dst/kssl
-		;;
 	3.4.*) 
 		cp $dst/kssl/Makefile.am.3.4 $dst/kssl/Makefile.am
 		cp -p $src/kio/kssl/ksslsession.{cc,h} $dst/kssl
 		cp -p $src/kio/kssl/ksslinfodlg.{cc,h} $dst/kssl
 		;;
-	*) 
-		cp $dst/kssl/Makefile.am.3.1 $dst/kssl/Makefile.am
-		;;
 esac
 
-$cp_pr $src/kio/kssl/kssl $dst/kssl
+$cp_pr $src/kio/kssl/kssl/* $dst/kssl/kssl
 
 # Temporary hack, needed for kdelibs 3.1
 perl -pi -e "s/^data/kssldata/" $dst/kssl/kssl/caroot/Makefile.am
@@ -399,29 +358,6 @@
 #( cd ./kdesrc/khtml && patch -p0 < ./khtml_scaling_patch.txt )
 
 case $KDELIBS_VERSION in
-	3.3.1) 
-		echo "*** applying ecma embedded_3.2.patch ..."
-		( cd ./kdesrc/khtml && 
-		  patch -p0 < patches/khtml_ecma_embedded_3.2.patch )
-		echo "*** applying disable-printing patch ..."
-		( cd ./kdesrc/khtml && 
-		  patch -p0 < patches/disable_printing_3.2.patch )
-		echo "*** applying disable-wallet patch ..."
-		( cd ./kdesrc/khtml && 
-		  patch -p0 < patches/disable_wallet_3.3.patch ) 
-		echo "*** applying disable-spelling patch ..."
-		( cd ./kdesrc/khtml && 
-		  patch -p0 < patches/disable_spelling_3.3.patch ) 
-		echo "*** applying no_find_3.3 patch..."
-		( cd ./kdesrc/khtml && 
-		  patch -p0 < patches/khtml_no_find_3.3.patch )
-		echo "*** applying no-webdav patch ..."
-		( cd ./kdesrc/kio/http && 
-		  patch -p0 < patches/disable_webdav_3.2.patch )
-		echo "*** applying disable_ahead_find_3.3 patch..."
-		( cd ./kdesrc/khtml && 
-		  patch -p0 < patches/disable_ahead_find_3.3.patch )
-		;;
         3.4.*)
                 echo "*** applying ecma embedded_3.3.patch ..."
                 ( cd ./kdesrc/khtml &&
@@ -440,7 +376,7 @@
                   patch -p0 < patches/disable_wallet_3.4.patch )
                 echo "*** applying no-webdav patch ..."
                 ( cd ./kdesrc/kio/http &&
-                  patch -p0 < patches/disable_webdav_ntlp_3.4.patch )
+                  patch -p0 < patches/disable_webdav_ntlp_3.4.2.patch )
                 echo "*** applying kdelibs_export patch ..."
                 ( cd ./kdesrc/kssl &&
                   patch -p0 < kdelibs_export.patch )
[prev in list] [next in list] [prev in thread] [next in thread]