- tag and mode options are reversed

[packages/akode.git] / kde-common-PLD.patch

diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
index 9c7a7332dadc117d303424d3e4721e1e64ffb126..2664ad8c1268f9396150e5e0cb66c7653693df5e 100644 (file)
--- 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,32 @@ 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"
+--- kdelibs-3.5.4/admin/am_edit        2006-07-24 10:18:33.000000000 +0300
++++ gwenview-1.4.0/admin/am_edit       2006-09-25 00:04:55.213036950 +0300
+@@ -499,6 +499,11 @@
+         }
+     }
+ 
++    $lookup = '(CXXLINK = \$\(LIBTOOL\) --mode=link --tag=CXX) \$\(CXXLD\)';
++    if ($MakefileData =~ m/$lookup/) {
++        substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
++    }
++
+     $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
+ 
+     $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
+@@ -578,6 +583,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) {