Merge pull request #11441 from 4fury-c3440d8/new

gdb rebuild guile.

programming/debug/gdb/actions.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licenses/gpl.txt
+# See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
 from pisi.actionsapi import get
 from pisi.actionsapi import autotools
@@ -10,17 +10,14 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 
 def setup():
-    shelltools.system('sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure')
+    #shelltools.system('sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure')
-    
+
     shelltools.makedirs("build")
     shelltools.cd("build")
     shelltools.system("../configure \
                        --enable-tui \
                        --prefix=/usr \
                        --disable-nls \
-                       --with-python \
-                       --disable-rpath \
-                       --with-guile=guile-2.0 \
                        --with-system-readline \
                        --enable-source-highlight \
                        --with-python=/usr/bin/python \
@@ -28,7 +25,6 @@ def setup():
                        --with-system-gdbinit=/etc/gdb/gdbinit \
                        --with-separate-debug-dir=/usr/lib/debug")
 
-
 def build():
     shelltools.cd("build")
     autotools.make()

programming/debug/gdb/files/arch/readline8.patch

@@ -0,0 +1,31 @@
+commit 1add37b567a7dee39d99f37b37802034c3fce9c4
+Author: Andreas Schwab <schwab@linux-m68k.org>
+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 *

programming/debug/gdb/pspec.xml

@@ -3,7 +3,7 @@
 <PISI>
     <Source>
         <Name>gdb</Name>
-        <Homepage>http://www.gnu.org/software/gdb/</Homepage>
+        <Homepage>https://www.sourceware.org/gdb/</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -19,15 +19,16 @@
             <Dependency>xz-devel</Dependency>
             <Dependency>mpfr-devel</Dependency>
             <Dependency>expat-devel</Dependency>
+            <Dependency>guile-devel</Dependency>
             <Dependency>python-devel</Dependency>
             <Dependency>xxhash-devel</Dependency>
             <Dependency>ncurses-devel</Dependency>
-            <Dependency>guile2.0-devel</Dependency>
             <Dependency>readline-devel</Dependency>
             <Dependency>source-highlight-devel</Dependency>
         </BuildDependencies>
         <Patches>
-<!--             <Patch level="1">0001-AArch64-Make-gdbserver-register-set-selection-dynami.patch</Patch> -->
+            <!-- <Patch level="1">0001-AArch64-Make-gdbserver-register-set-selection-dynami.patch</Patch> -->
+            <Patch level="1">arch/readline8.patch</Patch>
         </Patches>
     </Source>
 
@@ -38,11 +39,11 @@
             <Dependency>xz</Dependency>
             <Dependency>mpfr</Dependency>
             <Dependency>expat</Dependency>
+            <Dependency>guile</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>xxhash</Dependency>
             <Dependency>python</Dependency>
             <Dependency>ncurses</Dependency>
-            <Dependency>guile2.0</Dependency>
             <Dependency>readline</Dependency>
             <Dependency>source-highlight</Dependency>
         </RuntimeDependencies>
@@ -68,6 +69,13 @@
     </Package>
 
     <History>
+        <Update release="12">
+            <Date>2023-02-05</Date>
+            <Version>12.1</Version>
+            <Comment>Rebuild guile.</Comment>
+            <Name>fury</Name>
+            <Email>uglyside@yandex.ru</Email>
+        </Update>
         <Update release="11">
             <Date>2023-01-28</Date>
             <Version>12.1</Version>