Wed Aug 30 21:07:10 2017 UTC ()
Restore the original patch for curses_inc_list and curses_lib_list


(kamil)
diff -r1.127 -r1.128 pkgsrc/emulators/qemu/distinfo
diff -r1.19 -r1.20 pkgsrc/emulators/qemu/patches/patch-configure
cvs diff -r1.127 -r1.128 pkgsrc/emulators/qemu/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/distinfo 2017/08/30 21:00:46 1.127
+++ pkgsrc/emulators/qemu/distinfo 2017/08/30 21:07:10 1.128
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.127 2017/08/30 21:00:46 kamil Exp $ 1$NetBSD: distinfo,v 1.128 2017/08/30 21:07:10 kamil Exp $
2 2
3SHA1 (qemu-2.10.0.tar.xz) = 5d6815fa3ab1c6163c7e886f26153feabdcbb0f8 3SHA1 (qemu-2.10.0.tar.xz) = 5d6815fa3ab1c6163c7e886f26153feabdcbb0f8
4RMD160 (qemu-2.10.0.tar.xz) = 18579f8a5fe77e729b15b1876f4b1456d2c7e30e 4RMD160 (qemu-2.10.0.tar.xz) = 18579f8a5fe77e729b15b1876f4b1456d2c7e30e
5SHA512 (qemu-2.10.0.tar.xz) = 67891e78a0df8538838c5fc6d5208e1e0c23f608013818ea8f2f6b7dcbf80404113559b4d33aea32daf25bd43c2d8b5befbebf9fab16adf74a50218239cead53 5SHA512 (qemu-2.10.0.tar.xz) = 67891e78a0df8538838c5fc6d5208e1e0c23f608013818ea8f2f6b7dcbf80404113559b4d33aea32daf25bd43c2d8b5befbebf9fab16adf74a50218239cead53
6Size (qemu-2.10.0.tar.xz) = 25040324 bytes 6Size (qemu-2.10.0.tar.xz) = 25040324 bytes
7SHA1 (patch-configure) = b64e69bb9b9615e59f921ff35c88f7c58632d265 7SHA1 (patch-configure) = 51d5396f99ef129631138bc51f47bc24775aa08b
8SHA1 (patch-contrib_ivshmem-client_ivshmem-client.c) = 40c8751607cbf66a37e4c4e08f2664b864e2e984 8SHA1 (patch-contrib_ivshmem-client_ivshmem-client.c) = 40c8751607cbf66a37e4c4e08f2664b864e2e984
9SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = d8f53432b5752f4263dc4ef96108a976a05147a3 9SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = d8f53432b5752f4263dc4ef96108a976a05147a3
10SHA1 (patch-ef) = 98a1de2fd48638886b5d16f6a61dc72910e98b41 10SHA1 (patch-ef) = 98a1de2fd48638886b5d16f6a61dc72910e98b41
11SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50 11SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50
12SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420 12SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
13SHA1 (patch-hw_net_e1000.c) = 761e9afb5c74a03ee6cf0b918dd27122777a27b7 13SHA1 (patch-hw_net_e1000.c) = 761e9afb5c74a03ee6cf0b918dd27122777a27b7
14SHA1 (patch-hw_net_e1000__regs.h) = b93974c75bec94cbba048c0b61917177c5cc08c1 14SHA1 (patch-hw_net_e1000__regs.h) = b93974c75bec94cbba048c0b61917177c5cc08c1
15SHA1 (patch-hw_net_e1000e__core.c) = 55917bcb9ca0f80476159e51f4240e8c1df68132 15SHA1 (patch-hw_net_e1000e__core.c) = 55917bcb9ca0f80476159e51f4240e8c1df68132
16SHA1 (patch-hw_net_e1000x__common.h) = 093501bafdaa3a4b4ae705c45ea656a602907d18 16SHA1 (patch-hw_net_e1000x__common.h) = 093501bafdaa3a4b4ae705c45ea656a602907d18
17SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc 17SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
18SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7 18SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
19SHA1 (patch-hw_ppc_mac__newworld.c) = 5131bb6edf8b0acf6e7ed3b6bc7be962dc71eca6 19SHA1 (patch-hw_ppc_mac__newworld.c) = 5131bb6edf8b0acf6e7ed3b6bc7be962dc71eca6
20SHA1 (patch-hw_ppc_mac__oldworld.c) = b71667ab281dc23c9d971dc8754eeefc879bd1d7 20SHA1 (patch-hw_ppc_mac__oldworld.c) = b71667ab281dc23c9d971dc8754eeefc879bd1d7
cvs diff -r1.19 -r1.20 pkgsrc/emulators/qemu/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/patches/Attic/patch-configure 2017/08/30 21:00:46 1.19
+++ pkgsrc/emulators/qemu/patches/Attic/patch-configure 2017/08/30 21:07:10 1.20
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: patch-configure,v 1.19 2017/08/30 21:00:46 kamil Exp $ 1$NetBSD: patch-configure,v 1.20 2017/08/30 21:07:10 kamil Exp $
2 2
3Don't use gld on SunOS 3Don't use gld on SunOS
4Use ncursesw6-config; define NCURSES_WIDECHAR to fix building on Darwin (at least). 4Use ncursesw6-config; define NCURSES_WIDECHAR to fix building on Darwin (at least).
5 5
6--- configure.orig 2017-08-30 16:50:40.000000000 +0000 6--- configure.orig 2017-08-30 16:50:40.000000000 +0000
7+++ configure 7+++ configure
8@@ -747,7 +747,6 @@ SunOS) 8@@ -747,7 +747,6 @@ SunOS)
9 solaris="yes" 9 solaris="yes"
10 make="${MAKE-gmake}" 10 make="${MAKE-gmake}"
11 install="${INSTALL-ginstall}" 11 install="${INSTALL-ginstall}"
12- ld="gld" 12- ld="gld"
13 smbd="${SMBD-/usr/sfw/sbin/smbd}" 13 smbd="${SMBD-/usr/sfw/sbin/smbd}"
14 if test -f /usr/include/sys/soundcard.h ; then 14 if test -f /usr/include/sys/soundcard.h ; then
15 audio_drv_list="oss" 15 audio_drv_list="oss"
16@@ -3117,12 +3116,13 @@ if test "$curses" != "no" ; then 16@@ -3117,12 +3116,13 @@ if test "$curses" != "no" ; then
17 curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):" 17 curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"
18 curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses" 18 curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
19 else 19 else
20- curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:" 20- curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:"
21- curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw" 21- curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"
22+ curses_inc_list="$(@PREFIX@/bin/ncursesw6-config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:" 22+ curses_inc_list="$(@PREFIX@/bin/ncursesw6-config --cflags 2>/dev/null):-I/usr/include/ncursesw:"
23+ curses_lib_list="$(@PREFIX@/bin/ncursesw6-config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw" 23+ curses_lib_list="$(@PREFIX@/bin/ncursesw6-config --libs 2>/dev/null):-lncursesw:-lcursesw"
24 fi 24 fi
25 curses_found=no 25 curses_found=no
26 cat > $TMPC << EOF 26 cat > $TMPC << EOF
27 #include <locale.h> 27 #include <locale.h>
28+#define NCURSES_WIDECHAR 1 28+#define NCURSES_WIDECHAR 1
29 #include <curses.h> 29 #include <curses.h>
30 #include <wchar.h> 30 #include <wchar.h>
31 int main(void) { 31 int main(void) {