cgdb: Update to 0.8.0

cgdb/01-msysize.patch

@@ -1,25 +0,0 @@
-diff -Naur cgdb-0.6.8-orig/config/config.guess cgdb-0.6.8/config/config.guess
---- cgdb-0.6.8-orig/config/config.guess	2013-08-11 14:49:21.000000000 +0300
-+++ cgdb-0.6.8/config/config.guess	2014-12-12 00:31:29.054600000 +0300
-@@ -866,6 +866,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;
-diff -Naur cgdb-0.6.8-orig/configure.ac cgdb-0.6.8/configure.ac
---- cgdb-0.6.8-orig/configure.ac	2014-11-13 22:59:02.000000000 +0300
-+++ cgdb-0.6.8/configure.ac	2014-12-12 00:30:40.647800000 +0300
-@@ -20,7 +20,7 @@
-  *-*-linux*)
-    AC_DEFINE(HAVE_LINUX, 1,  Linux environment)
-    ;;
-- *-*-cygwin*)
-+ *-*-cygwin* | *-*-msys*)
-    AC_DEFINE(HAVE_CYGWIN, 1,  Cygwin environment)
-    ;;
-  *)

cgdb/10-ncursesw-link-tinfow.patch

@@ -1,54 +0,0 @@
-From a8a567fc46fca4ca10a23016e2fe9055669b9102 Mon Sep 17 00:00:00 2001
-From: Ian Dinwoodie <dinwoodieian@gmail.com>
-Date: Wed, 29 Jan 2020 23:58:13 -0500
-Subject: [PATCH] Ncursesw should link with tinfow.
-
-This patch is a response to issue #219.
-
-Signed-off-by: Ian Dinwoodie <dinwoodieian@gmail.com>
----
- config/readline_check_version.m4 | 24 ++++++++++++++++++++----
- 1 file changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/config/readline_check_version.m4 b/config/readline_check_version.m4
-index 567bfbd4..01e61c28 100644
---- a/config/readline_check_version.m4
-+++ b/config/readline_check_version.m4
-@@ -7,10 +7,23 @@ AC_MSG_CHECKING(which library has the termcap functions)
- _bash_needmsg=
- fi
- AC_CACHE_VAL(bash_cv_termcap_lib,
--[AC_CHECK_LIB(]$curses_lib_name[, tgetent, bash_cv_termcap_lib=lib]$curses_lib_name[,
--  [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
--    [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
--      bash_cv_termcap_lib=gnutermcap)])])])
-+[AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
-+if test "$curses_lib_name" = "ncursesw"; then
-+	[AC_CHECK_LIB(ncursesw, tgetent, bash_cv_termcap_lib=libncursesw,
-+		[AC_CHECK_LIB(tinfow, tgetent, bash_cv_termcap_lib=libtinfow)]
-+	)]
-+elif test "$curses_lib_name" = "ncurses"; then
-+	[AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
-+		[AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo)]
-+	)]
-+elif test "$curses_lib_name" = "curses"; then
-+	[AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses)]
-+else
-+	[AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
-+		bash_cv_termcap_lib=gnutermcap
-+	)]
-+fi
-+)])
- if test "X$_bash_needmsg" = "Xyes"; then
- AC_MSG_CHECKING(which library has the termcap functions)
- fi
-@@ -19,6 +32,9 @@ if test $bash_cv_termcap_lib = gnutermcap && test -z "$prefer_curses"; then
- LDFLAGS="$LDFLAGS -L./lib/termcap"
- TERMCAP_LIB="./lib/termcap/libtermcap.a"
- TERMCAP_DEP="./lib/termcap/libtermcap.a"
-+elif test $bash_cv_termcap_lib = libtinfow; then
-+TERMCAP_LIB=-ltinfow
-+TERMCAP_DEP=
- elif test $bash_cv_termcap_lib = libtinfo; then
- TERMCAP_LIB=-ltinfo
- TERMCAP_DEP=

cgdb/PKGBUILD

@@ -1,42 +1,43 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=cgdb
-pkgver=0.7.1
+pkgver=0.8.0
-pkgrel=4
+pkgrel=1
 pkgdesc="Curses-based interface to the GNU Debugger"
 arch=('i686' 'x86_64')
-url="https://cgdb.sourceforge.io/"
+url="https://cgdb.github.io/"
-license=('GPL')
+license=('spdx:GPL-2.0-or-later')
 depends=('libreadline' 'ncurses' 'gdb')
 makedepends=('help2man' 'libreadline-devel' 'ncurses-devel' 'autotools' 'gcc')
-source=("https://cgdb.me/files/${pkgname}-${pkgver}.tar.gz"
+source=("https://cgdb.me/files/${pkgname}-${pkgver}.tar.gz")
-        01-msysize.patch
+sha256sums=('0d38b524d377257b106bad6d856d8ae3304140e1ee24085343e6ddf1b65811f1')
-        10-ncursesw-link-tinfow.patch)
-sha512sums=('34f1fa53cfc9fbf7a2603db169e8338c0bf32200ed7a63e9944951f446e295e49f4ff3c5d0998a4c70bc872376263e1469d7e518becc13b4959f66495d5b9521'
-            '31d2f2573fec3e6569b0c236d60898e5fced21bd3510add98613ce2e75f966a923917ed6eeec475844c3545004d0a17b55de96cfa3eb6f68d5a84636c563ef0e'
-            '0e905af78ddc55f2d57cc9a64a7180f0605d9756caa1d6621def5e26cc445c8327673824506b8790d64f8fa15aa175216ff3f13506b0dea0e44a5df99425afa4')
 
 prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ${srcdir}/01-msysize.patch
-  patch -p1 -i ${srcdir}/10-ncursesw-link-tinfow.patch
 
-  autoreconf -fi -I config
+  echo "$pkgver" > VERSION
+  autoreconf -vfi -I config
 }
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  export MSYSTEM=CYGWIN
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
+
   CFLAGS+=" -D_GNU_SOURCE"
-  CXXFLAGS+=" -std=c++11 -D_GNU_SOURCE"
+  CXXFLAGS+="   -D_GNU_SOURCE"
   ./configure \
     --prefix=/usr \
-    --build=${CHOST} \
+    --build=${CYGWIN_CHOST} \
     --with-readline=/usr \
     --with-ncurses=/usr
+  
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}/" install
 }