X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kde-common-PLD.patch;h=2cb771ab1a541bdce2cbff0f40c18854a14ff4c7;hb=refs%2Ftags%2Fauto%2Fth%2Fkdelibs-3_5_7-2;hp=9c7a7332dadc117d303424d3e4721e1e64ffb126;hpb=251e5330e3a61cfc6721e752310e606c630aafb1;p=packages%2Fakode.git

diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
index 9c7a733..2cb771a 100644
--- a/kde-common-PLD.patch
+++ b/kde-common-PLD.patch
@@ -1,4 +1,3 @@
-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 @@
@@ -119,24 +118,36 @@ diff -urN kdelibs-3.5.3.or/admin/acinclude.m4.in kdelibs-3.5.3/admin/acinclude.m
  AC_MSG_RESULT($QTDOCDIR)
  
  AC_SUBST(QTDOCDIR)
-diff -urN kdelibs-3.5.3.or/admin/cvs.sh kdelibs-3.5.3/admin/cvs.sh
---- kdelibs-3.5.3.or/admin/cvs.sh	2006-05-23 13:02:06.000000000 +0000
-+++ kdelibs-3.5.3/admin/cvs.sh	2006-07-01 14:57:24.295293250 +0000
-@@ -32,7 +32,7 @@
- required_autoconf_version="2.53 or newer"
- AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
- case $AUTOCONF_VERSION in
--  Autoconf*2.5* | autoconf*2.5* ) : ;;
-+  Autoconf*2.5* | autoconf*2.5* | Autoconf*2.6* | autoconf*2.6* ) : ;;
-   "" )
-     echo "*** AUTOCONF NOT FOUND!."
-     echo "*** KDE requires autoconf $required_autoconf_version"
-@@ -47,7 +47,7 @@
- 
- AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
- case $AUTOHEADER_VERSION in
--  Autoconf*2.5* | autoheader*2.5* ) : ;;
-+  Autoconf*2.5* | autoheader*2.5* | Autoconf*2.6* | autoheader*2.6* ) : ;;
-   "" )
-     echo "*** AUTOHEADER NOT FOUND!."
-     echo "*** KDE requires autoheader $required_autoconf_version"
+--- gwenview-1.4.0/admin/am_edit	2006-09-25 00:04:55.213036950 +0300
++++ kdelibs-3.5.5/admin/am_edit	2006-10-03 11:40:08.052152886 +0300
+@@ -499,6 +499,15 @@
+         }
+     }
+ 
++    $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CXXLD\)';
++    if ($MakefileData =~ m/$lookup/) {
++        substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
++    }
++    $lookup = '(LINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CCLD\)';
++    if ($MakefileData =~ m/$lookup/) {
++        substituteLine($lookup, "$1 \"\$\(CCLD\)\"");
++    }
++
+     $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
+ 
+     $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
+@@ -578,6 +587,14 @@
+         local @kde_options = split(/[\034\s]+/, $kde_options_str);
+         if (grep(/^foreign$/, @kde_options)) {
+             push(@foreignfiles, $makefileDir . "/");
++
++            # always do this. don't care if it's foreign file. we *need* CXXLD quoted for libtool argument.
++            $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link) \$\(CXXLD\)';
++            if ($MakefileData =~ m/$lookup/) {
++                substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
++                updateMakefile ();
++            }
++
+             return 0; # don't touch me
+         }
+         for $opt (@kde_options) {