summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-03-26 07:11:44 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-03-26 07:41:45 +0000
commit03b49d094d09ff67226c469d33f664fe1f5c700f (patch)
treebb807efe8404931c6d91dc4c092e16122e402c73
parent82be8474198d7a29ae784ff677a0a0b48d0133a5 (diff)
downloadaports-03b49d094d09ff67226c469d33f664fe1f5c700f.tar.bz2
aports-03b49d094d09ff67226c469d33f664fe1f5c700f.tar.xz
main/parted: fix building with readline-6.3
-rw-r--r--main/parted/APKBUILD15
-rw-r--r--main/parted/parted-3.1-readline.patch11
2 files changed, 21 insertions, 5 deletions
diff --git a/main/parted/APKBUILD b/main/parted/APKBUILD
index 7c03d561b..3956840b0 100644
--- a/main/parted/APKBUILD
+++ b/main/parted/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=parted
pkgver=3.1
-pkgrel=1
+pkgrel=2
pkgdesc="Utility to create, destroy, resize, check and copy partitions"
url="http://www.gnu.org/software/parted/parted.html"
arch="all"
@@ -10,7 +10,9 @@ subpackages="$pkgname-dev $pkgname-doc"
depends=
makedepends="pkgconfig e2fsprogs-dev readline-dev ncurses-dev lvm2-dev bash"
source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
- fix-includes.patch"
+ fix-includes.patch
+ parted-3.1-readline.patch
+ "
_builddir="$srcdir"/$pkgname-$pkgver
@@ -45,8 +47,11 @@ package() {
return 0
}
md5sums="5d89d64d94bcfefa9ce8f59f4b81bdcb parted-3.1.tar.xz
-e87ffa1171acbebfa9d2475a093e7e64 fix-includes.patch"
+e87ffa1171acbebfa9d2475a093e7e64 fix-includes.patch
+7f3c0f9d2fa2569054734149c1bf9d0c parted-3.1-readline.patch"
sha256sums="5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15 parted-3.1.tar.xz
-f87c9290e861b969f4520a1af84ebf4b8f5f1437c1d78ee235d5ffcda3bffe84 fix-includes.patch"
+f87c9290e861b969f4520a1af84ebf4b8f5f1437c1d78ee235d5ffcda3bffe84 fix-includes.patch
+a6ee5fd919a2a035309b70decce60514587a27d1603f361a48dbaf2757b8a8cc parted-3.1-readline.patch"
sha512sums="f29a67a16cf79f08abbfc5eeb6ad0480d834aa50e715378626dc89e3b12ce71f19202e9f38429e5521ebe877c4e74ff1e08f0b0ecbdbe79ba1c51fdcbef6e852 parted-3.1.tar.xz
-55ee63c218d1867c0f2c596e7c3eec5c42af160181456cc551fe3d432eabed0ac2dd3a3955ff0c375f76aeec8071e7f55a32834b87a0d39b8ef30361f671bfdd fix-includes.patch"
+55ee63c218d1867c0f2c596e7c3eec5c42af160181456cc551fe3d432eabed0ac2dd3a3955ff0c375f76aeec8071e7f55a32834b87a0d39b8ef30361f671bfdd fix-includes.patch
+a32774fb51fee399a2d2248415efc3a9ebe948c342f42704b38b23abfa1067845e8dffd606cb24ed5f971ce7ec3e18b707f72c0d00cb20a4d0dc6350dbb12c29 parted-3.1-readline.patch"
diff --git a/main/parted/parted-3.1-readline.patch b/main/parted/parted-3.1-readline.patch
new file mode 100644
index 000000000..936ec00cb
--- /dev/null
+++ b/main/parted/parted-3.1-readline.patch
@@ -0,0 +1,11 @@
+--- a/parted/ui.c
++++ b/parted/ui.c
+@@ -1474,7 +1474,7 @@
+ #ifdef HAVE_LIBREADLINE
+ if (!opt_script_mode) {
+ rl_initialize ();
+- rl_attempted_completion_function = (CPPFunction*) complete_function;
++ rl_attempted_completion_function = (rl_completion_func_t*) complete_function;
+ readline_state.in_readline = 0;
+ }
+ #endif