summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-12-18 09:44:52 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-12-18 09:44:52 +0000
commit20cdfe02911dc74eb825043dc2a1353c9a8b6d3a (patch)
tree77c40ffd1948e8503b6fb9984a3d50e8e21feacc /patches
parentAdd fbsd-conf patch from ELT-patches as a sample of elibtoolize patches. (diff)
downloadautoepatch-20cdfe02911dc74eb825043dc2a1353c9a8b6d3a.tar.gz
autoepatch-20cdfe02911dc74eb825043dc2a1353c9a8b6d3a.tar.bz2
autoepatch-20cdfe02911dc74eb825043dc2a1353c9a8b6d3a.zip
Add a patch for KDE's admindir to show that autoepatch can be used for more than just ELT patches.
svn path=/trunk/; revision=4
Diffstat (limited to 'patches')
-rw-r--r--patches/kde-autoconf/70-kdebase-3.5.0.patch20
-rw-r--r--patches/kde-autoconf/kde-autoconf.sh12
2 files changed, 32 insertions, 0 deletions
diff --git a/patches/kde-autoconf/70-kdebase-3.5.0.patch b/patches/kde-autoconf/70-kdebase-3.5.0.patch
new file mode 100644
index 0000000..de18588
--- /dev/null
+++ b/patches/kde-autoconf/70-kdebase-3.5.0.patch
@@ -0,0 +1,20 @@
+--- admin/cvs.sh
++++ admin/cvs.sh
+@@ -32,7 +32,7 @@ check_autotool_versions()
+ 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 @@ esac
+
+ 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/patches/kde-autoconf/kde-autoconf.sh b/patches/kde-autoconf/kde-autoconf.sh
new file mode 100644
index 0000000..af582fe
--- /dev/null
+++ b/patches/kde-autoconf/kde-autoconf.sh
@@ -0,0 +1,12 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+patch_targets() {
+ # If we are not using autoconf 2.6, just skip the patch for the sake of
+ # limiting the resulting patche
+ [[ $(WANT_AUTOCONF=2.5 autoconf --version | head -n 1) == autoconf*2.6* ]] \
+ || return 0
+
+ # Find the admindir, wherever it is.
+ find "${WORKDIR}" -path '*/admin/cvs.sh' -type f
+}