Date: Thursday, November 10, 2022 @ 01:25:05
  Author: foutrelis
Revision: 461058

Uncap guile version and fix build with readline 8

Added:
  gdb/trunk/readline8.patch
Modified:
  gdb/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   15 +++++++++------
 readline8.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-11-10 00:46:31 UTC (rev 461057)
+++ PKGBUILD    2022-11-10 01:25:05 UTC (rev 461058)
@@ -13,17 +13,21 @@
 arch=(x86_64)
 url='https://www.gnu.org/software/gdb/'
 license=(GPL3)
-makedepends=(glibc gcc-libs texinfo python guile ncurses expat xz mpfr 
source-highlight
-             readline)
-source=(https://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.xz{,.sig})
+makedepends=(glibc gcc-libs texinfo python guile ncurses expat xz mpfr
+             source-highlight boost readline)
+source=(https://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.xz{,.sig}
+        readline8.patch)
 sha1sums=('2edabd9f5766b84889b07b366b4438e93e994005'
-          'SKIP')
+          'SKIP'
+          '9a57ab62b2f1fdbb73fff3f502827101ea945d59')
 
b2sums=('7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd'
-        'SKIP')
+        'SKIP'
+        
'e2deed0d704caf3ae3e99242006f2b8a9abe5e81c75beb664b90f1ca1d79d3e2ecdf40edaca946bc4af1d2958efaf42d4a49afdde8e85fa98108522a0a82ebf4')
 validpgpkeys=('F40ADB902B24264AA42E50BF92EDB04BFF325CF3') # Joel Brobecker
 
 build() {
   cd gdb-$pkgver
+  patch -Np1 -i ../readline8.patch
 
   mkdir -p build && cd build
   ../configure \
@@ -33,7 +37,6 @@
     --enable-tui \
     --with-system-readline \
     --with-python=/usr/bin/python \
-    --with-guile=guile-2.2 \
     --with-system-gdbinit=/etc/gdb/gdbinit
   make
 }

Added: readline8.patch
===================================================================
--- readline8.patch                             (rev 0)
+++ readline8.patch     2022-11-10 01:25:05 UTC (rev 461058)
@@ -0,0 +1,31 @@
+commit 1add37b567a7dee39d99f37b37802034c3fce9c4
+Author: Andreas Schwab <[email protected]>
+Date:   Sun Mar 20 14:01:54 2022 +0100
+
+    Add support for readline 8.2
+    
+    In readline 8.2 the type of rl_completer_word_break_characters changed to
+    include const.
+
+diff --git a/gdb/completer.c b/gdb/completer.c
+index d3900ae2014..a51c16ac7f8 100644
+--- a/gdb/completer.c
++++ b/gdb/completer.c
+@@ -36,7 +36,7 @@
+    calling a hook instead so we eliminate the CLI dependency.  */
+ #include "gdbcmd.h"
+ 
+-/* Needed for rl_completer_word_break_characters() and for
++/* Needed for rl_completer_word_break_characters and for
+    rl_filename_completion_function.  */
+ #include "readline/readline.h"
+ 
+@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw ()
+       rl_basic_quote_characters = NULL;
+     }
+ 
+-  return rl_completer_word_break_characters;
++  return (char *) rl_completer_word_break_characters;
+ }
+ 
+ char *

Reply via email to