X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kde-common-PLD.patch;h=2664ad8c1268f9396150e5e0cb66c7653693df5e;hb=439e251c9c218db657755bde1f9f061eb2177f1c;hp=365f83fd48cbf40eb3a5377b89b806782c1ee5c8;hpb=8d8cab91c3f17aa4e70248b0dcfe0bd5cd9d75e8;p=packages%2Fkmplayer.git diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch index 365f83f..2664ad8 100644 --- a/kde-common-PLD.patch +++ b/kde-common-PLD.patch @@ -118,13 +118,13 @@ AC_MSG_RESULT($QTDOCDIR) AC_SUBST(QTDOCDIR) ---- kdepim-3.5.4/admin/am_edit 2006-09-19 14:20:21.446444147 +0300 -+++ kdepim-3.5.4/admin/am_edit 2006-09-20 00:14:49.967386769 +0300 -@@ -498,6 +498,11 @@ +--- 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\) --tag=CXX --mode=link) \$\(CXXLD\)'; ++ $lookup = '(CXXLINK = \$\(LIBTOOL\) --mode=link --tag=CXX) \$\(CXXLD\)'; + if ($MakefileData =~ m/$lookup/) { + substituteLine($lookup, "$1 \"\$\(CXXLD\)\""); + } @@ -132,7 +132,7 @@ $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g; $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)'; -@@ -573,6 +578,14 @@ +@@ -578,6 +583,14 @@ local @kde_options = split(/[\034\s]+/, $kde_options_str); if (grep(/^foreign$/, @kde_options)) { push(@foreignfiles, $makefileDir . "/");