summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElan Ruusamäe2006-09-24 21:08:41 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit67f0d3225d8a2e9a7d0dff3f8983eb4155648620 (patch)
tree427f216252b9e73d1f6f26557933e29d7ab8757b
parent90002e0351fabd65fead9b08c086f2d1caf32224 (diff)
downloadsmb4k-auto/ac/kdenetwork-3_5_4-2.zip
smb4k-auto/ac/kdenetwork-3_5_4-2.tar.gz
Changed files: kde-common-PLD.patch -> 1.9
-rw-r--r--kde-common-PLD.patch10
1 files changed, 5 insertions, 5 deletions
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 . "/");