aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-12-24 14:10:50 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-12-24 14:10:50 +0000
commit2aa1d10d4130b7e0a967f9ace1972be1994ff7a6 (patch)
tree9d673fecd6cce14bd3277bc4c57c56da99add926 /main
parent792db2a65552e03dd9d04925bd52456b622b4e23 (diff)
downloadaports-2aa1d10d4130b7e0a967f9ace1972be1994ff7a6.tar.bz2
aports-2aa1d10d4130b7e0a967f9ace1972be1994ff7a6.tar.xz
main/qemu: enable ncurses again
Diffstat (limited to 'main')
-rw-r--r--main/qemu/APKBUILD7
-rw-r--r--main/qemu/ncurses.patch13
2 files changed, 19 insertions, 1 deletions
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index bef333b41d..04dcf64343 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qemu
pkgver=2.8.0
-pkgrel=0
+pkgrel=1
pkgdesc="QEMU is a generic machine emulator and virtualizer"
url="http://qemu.org/"
arch="all"
@@ -123,6 +123,7 @@ source="http://wiki.qemu-project.org/download/$pkgname-$pkgver.tar.bz2
musl-F_SHLCK-and-F_EXLCK.patch
fix-sigevent-and-sigval_t.patch
xattr_size_max.patch
+ ncurses.patch
$pkgname-guest-agent.confd
$pkgname-guest-agent.initd
80-kvm.rules
@@ -160,6 +161,7 @@ _compile() {
--enable-libnfs \
--enable-lzo \
--enable-docs \
+ --enable-curses \
--disable-glusterfs \
--disable-debug-info \
--disable-bsd-user \
@@ -286,6 +288,7 @@ d364208c4847ad2baeb237900befecd1 0006-linux-user-signal.c-define-__SIGRTMIN-MAX
19a26bd596f0a1c55d2e831106ce96f5 musl-F_SHLCK-and-F_EXLCK.patch
18f3194bdb0751d1c96140bd4d98b86f fix-sigevent-and-sigval_t.patch
36b835d7f00aa99f69d909bcdff9b1cf xattr_size_max.patch
+4b3b899ebc67accff89ace306d48668e ncurses.patch
1663bc6977f6886a58394155b1bf3676 qemu-guest-agent.confd
ea972f2fc5505488f68320bf386106bb qemu-guest-agent.initd
66660f143235201249dc0648b39b86ee 80-kvm.rules
@@ -297,6 +300,7 @@ af35304b165622a53f7557b59ffd8da5030f5fd444e669c862f9410131f3b987 0001-elfload-l
ec5e2bd34636c47f464c6b9efd01e487a7b81602c8b598df6efe8d8ceed0c2e5 musl-F_SHLCK-and-F_EXLCK.patch
5bd5723873af643406b250641e7eaa248ce728b8caf8e761e219728f59ce6072 fix-sigevent-and-sigval_t.patch
a0c21e70495ac249e3dfcba7420eebe044c6cccc5a8bdc5b635d89ca2e2eac7f xattr_size_max.patch
+f24b9492f208d386edc5a7a5222906e4816733348e0c557c09ce813bbd80be92 ncurses.patch
d84e53a94584f37f3bd1b21f44077b5de0d07094c6729f26ae20ab1f7b9cc298 qemu-guest-agent.confd
5bef90ccab2e743868fd562eee9a3ded35c8d3e01fa387367ed55a0da95570d5 qemu-guest-agent.initd
37f666f1cdb7d8a62171de69b531681dcb0fba74236729dac8b6c019232eba84 80-kvm.rules
@@ -308,6 +312,7 @@ ec84b27648c01c6e58781295dcd0c2ff8e5a635f9836ef50c1da5d0ed125db1afc4cb5b01cb97606
224f5b44da749921e8a821359478c5238d8b6e24a9c0b4c5738c34e82f3062ec4639d495b8b5883d304af4a0d567e38aa6623aac1aa3a7164a5757c036528ac0 musl-F_SHLCK-and-F_EXLCK.patch
5da8114b9bd2e62f0f1f0f73f393fdbd738c5dea827ea60cedffd6f6edd0f5a97489c7148d37a8ec5a148d4e65d75cbefe9353714ee6b6f51a600200133fc914 fix-sigevent-and-sigval_t.patch
4b1e26ba4d53f9f762cbd5cea8ef6f8062d827ae3ae07bc36c5b0c0be4e94fc1856ad2477e8e791b074b8a25d51ed6d0ddd75e605e54600e5dd0799143793ce4 xattr_size_max.patch
+b6ed02aaf95a9bb30a5f107d35371207967edca058f3ca11348b0b629ea7a9c4baa618db68a3df72199eea6d86d14ced74a5a229d17604cc3f0adedcfeae7a73 ncurses.patch
d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f qemu-guest-agent.confd
316b40d97587fea717821852859d81039cfdcb276a658bb6e6fb554e321d5856a833ebb3778149c4732cea625bac320b1008d374c88a9aae35c0fb67977c01b7 qemu-guest-agent.initd
9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2 80-kvm.rules
diff --git a/main/qemu/ncurses.patch b/main/qemu/ncurses.patch
new file mode 100644
index 0000000000..2e9eb2a90d
--- /dev/null
+++ b/main/qemu/ncurses.patch
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 3770d7c..3fe8281 100755
+--- a/configure
++++ b/configure
+@@ -2928,7 +2928,7 @@ if test "$curses" != "no" ; then
+ curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"
+ curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
+ else
+- curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:"
++ curses_inc_list="-DNCURSES_WIDECHAR=1 $($pkg_config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:"
+ curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"
+ fi
+ curses_found=no