This commit was manufactured by cvs2git to create branch 'unlabeled-1.31.2'.

Sprout from master 2007-03-05 20:36:22 UTC vip <vip@pld-linux.org> '- up to 2.1.1'
Delete:
    kde-ac260-lt.patch
    kde-ac260.patch
    kde-common-LD_quote.patch

diff --git a/kde-ac260-lt.patch b/kde-ac260-lt.patch
deleted file mode 100644 (file)
index acbbc6c..0000000
--- a/kde-ac260-lt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN arts-1.5.4.org/admin/libtool.m4.in arts-1.5.4/admin/libtool.m4.in
---- arts-1.5.4.org/admin/libtool.m4.in 2006-07-24 09:06:24.000000000 +0200
-+++ arts-1.5.4/admin/libtool.m4.in     2006-09-09 12:45:13.172062500 +0200
-@@ -3542,7 +3542,7 @@
-   # The `*' in the case matches for architectures that use `case' in
-   # $output_verbose_cmd can trigger glob expansion during the loop
-   # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
- 
-   for p in `eval $output_verbose_link_cmd`; do
-     case $p in

diff --git a/kde-ac260.patch b/kde-ac260.patch
deleted file mode 100644 (file)
index 17567e3..0000000
--- a/kde-ac260.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dbus-1-qt3-0.2/admin/cvs.sh.wigeta 2006-08-17 20:33:33.000000000 +0200
-+++ dbus-1-qt3-0.2/admin/cvs.sh        2006-08-17 20:34:23.000000000 +0200
-@@ -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.[56]* | autoconf*2.[56]* ) : ;;
-   "" )
-     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.[56]* | autoheader*2.[56]* ) : ;;
-   "" )
-     echo "*** AUTOHEADER NOT FOUND!."
-     echo "*** KDE requires autoheader $required_autoconf_version"

diff --git a/kde-common-LD_quote.patch b/kde-common-LD_quote.patch
deleted file mode 100644 (file)
index 7d65c3f..0000000
--- a/kde-common-LD_quote.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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) {