X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kde-common-PLD.patch;h=2cb771ab1a541bdce2cbff0f40c18854a14ff4c7;hb=refs%2Ftags%2Fauto%2Fth%2Famarok-1_4_5-3;hp=7aaf479fcea5a9987d0856cdd8a75c91e7db74e5;hpb=7e4269a49484bd08984bb164029fe813625c0acf;p=packages%2Fakode.git

diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
index 7aaf479..2cb771a 100644
--- a/kde-common-PLD.patch
+++ b/kde-common-PLD.patch
@@ -118,18 +118,36 @@
  AC_MSG_RESULT($QTDOCDIR)
  
  AC_SUBST(QTDOCDIR)
-
---- kdelibs-3.5.4/admin/am_edit	2006-07-24 10:18:33.000000000 +0300
-+++ kdepim-3.5.4/admin/am_edit	2006-09-19 14:20:21.446444147 +0300
-@@ -499,6 +498,11 @@
+--- 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\) --tag=CXX --mode=link) \$\(CXXLD\)';
++    $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) {