From 1e2dceaef1bec1ef70f4da83e084521b3c36e1fd Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 7 Jun 2023 21:50:24 +0200 Subject: [PATCH] - updated to 3.4.0 --- ddd-am185.patch | 11 ----- ddd-gcc.4.4-build.patch | 10 ---- ddd-info.patch | 43 ++--------------- ddd.spec | 53 +++++++++++---------- fix-ftbfs-gcc-9.patch | 101 ---------------------------------------- 5 files changed, 32 insertions(+), 186 deletions(-) delete mode 100644 ddd-am185.patch delete mode 100644 ddd-gcc.4.4-build.patch delete mode 100644 fix-ftbfs-gcc-9.patch diff --git a/ddd-am185.patch b/ddd-am185.patch deleted file mode 100644 index 8968228..0000000 --- a/ddd-am185.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ddd-3.3.10/configure.ac~ 2004-11-11 00:03:30.000000000 +0100 -+++ ddd-3.3.10/configure.ac 2004-11-11 00:03:30.000000000 +0100 -@@ -57,7 +57,7 @@ - dnl 1.x: minimum required version - dnl foreign: we don't follow the normal rules for GNU packages (no COPYING - dnl file in the top srcdir, etc, etc), so stop complaining. --AM_INIT_AUTOMAKE([1.9 foreign]) -+AM_INIT_AUTOMAKE([1.8.5 foreign]) - AC_PROG_MAKE_SET - dnl - dnl diff --git a/ddd-gcc.4.4-build.patch b/ddd-gcc.4.4-build.patch deleted file mode 100644 index 4fb15b2..0000000 --- a/ddd-gcc.4.4-build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ddd-3.3.12/ddd/strclass.C 2009-02-11 17:25:06.000000000 +0000 -+++ ddd-3.3.12.new/ddd/strclass.C 2009-12-02 20:36:58.000000000 +0000 -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - #include - - void string::error(const char* msg) const diff --git a/ddd-info.patch b/ddd-info.patch index 14d0613..15889ee 100644 --- a/ddd-info.patch +++ b/ddd-info.patch @@ -1,11 +1,10 @@ -diff -urN ddd-3.3.7.orig/ddd/ddd.texi ddd-3.3.7/ddd/ddd.texi ---- ddd-3.3.7.orig/ddd/ddd.texi 2003-05-24 17:27:08.000000000 +0200 -+++ ddd-3.3.7/ddd/ddd.texi 2003-08-26 18:49:03.000000000 +0200 -@@ -96,9 +96,9 @@ +--- ddd-3.4.0/ddd/ddd.texi.orig 2023-06-07 20:54:36.189527766 +0200 ++++ ddd-3.4.0/ddd/ddd.texi 2023-06-07 21:11:29.797369915 +0200 +@@ -97,9 +97,9 @@ @finalout @c Info Dir settings --@dircategory Programming & development tools. +-@dircategory Programming \& development tools. +@dircategory Programming tools: @direntry -* DDD: (ddd). The Data Display Debugger. @@ -28,37 +27,3 @@ diff -urN ddd-3.3.7.orig/ddd/ddd-themes.texi ddd-3.3.7/ddd/ddd-themes.texi @end direntry @c %**end of header ---- a/ddd/ddd.texi.orig 2009-02-11 17:25:07 +0000 -+++ b/ddd/ddd.texi -@@ -1,4 +1,4 @@ --\def\postscript{}\input texinfo @c -*- texinfo -*- -+\def\postscript\input texinfo @c -*- texinfo -*- - @c $Id$ - @c DDD Manual - -@@ -154,7 +154,7 @@ - @c The title page. - @ifnothtml - @titlepage --@sp -7 -+@sp 7 - @ifnottex - @title Debugging with @value{DDD} - @subtitle User's Guide and Reference Manual ---- a/ddd/ddd-themes.texi.orig 2009-02-11 17:25:07 +0000 -+++ b/ddd/ddd-themes.texi -@@ -1,4 +1,4 @@ --\def\postscript{}\input texinfo @c -*- texinfo -*- -+\def\postscript\input texinfo @c -*- texinfo -*- - @c $Id$ - @c Writing DDD Themes - -@@ -136,7 +136,7 @@ - @c The title page. - @ifnothtml - @titlepage --@sp -7 -+@sp 7 - @ifnottex - @title Writing @value{DDD} Themes - @subtitle User's Guide and Reference Manual diff --git a/ddd.spec b/ddd.spec index 99395b1..d61ddd5 100644 --- a/ddd.spec +++ b/ddd.spec @@ -3,35 +3,38 @@ Summary(ja.UTF-8): GDB,DBX,Ladebug,JDB,Perl,Pythonのグラフィカルデバッ Summary(pl.UTF-8): Interfejs X do debugerów GDB, DBX i XDB Summary(zh_CN.UTF-8): 图形化的程序调试器前端;如GDB,DBX,Ladebug,JDB,Perl,Python Name: ddd -Version: 3.3.12 -Release: 15 +Version: 3.4.0 +Release: 1 Epoch: 1 -License: GPL +License: GPL v3+ Group: Development/Debuggers -Source0: http://ftp.gnu.org/gnu/ddd/%{name}-%{version}.tar.gz -# Source0-md5: c50396db7bac3862a6d2555b3b22c34e +Source0: https://ftp.gnu.org/gnu/ddd/%{name}-%{version}.tar.gz +# Source0-md5: 23fc7448a189908c945fe2ba7fd3a53a Source1: %{name}.desktop -Source2: http://art.gnome.org/images/icons/other/Debugger.png +# originally http://art.gnome.org/images/icons/other/Debugger.png +Source2: Debugger.png # Source2-md5: c046d9b0a04abdbb4a2be08a374ac2cd Patch0: %{name}-ptrace.patch Patch1: %{name}-info.patch Patch2: %{name}-home_etc.patch -Patch3: %{name}-am185.patch -Patch4: %{name}-gcc.4.4-build.patch -Patch5: fix-ftbfs-gcc-9.patch URL: http://www.gnu.org/software/ddd/ -BuildRequires: autoconf >= 2.59 +BuildRequires: autoconf >= 2.71 BuildRequires: automake >= 1:1.9 -BuildRequires: bison +BuildRequires: bison >= 1.28 BuildRequires: elfutils-devel BuildRequires: flex +BuildRequires: gnulib BuildRequires: libstdc++-devel -BuildRequires: libtool +BuildRequires: libtool >= 2:2 BuildRequires: motif-devel BuildRequires: ncurses-devel >= 5.0 BuildRequires: readline-devel +BuildRequires: xorg-lib-libX11-devel +BuildRequires: xorg-lib-libXaw-devel +BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-lib-libXpm-devel +BuildRequires: xorg-lib-libXt-devel BuildRequires: texinfo Requires: gdb Requires: xorg-lib-libXt >= 1.0.0 @@ -87,9 +90,8 @@ pełną edycją, historią i wyszukiwaniem. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 + +ln -sf %{_datadir}/gnulib/doc/fdl-1.3.texi ddd/fdl-1.3.texi %build %{__libtoolize} @@ -111,27 +113,28 @@ install -d $RPM_BUILD_ROOT{%{_appdefsdir},%{_desktopdir},%{_pixmapsdir}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install ddd/Ddd $RPM_BUILD_ROOT%{_appdefsdir} +cp -p ddd/Ddd $RPM_BUILD_ROOT%{_appdefsdir} -install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/ddd.png +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/ddd.png %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/postshell +%post -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%postun -p /sbin/postshell +%postun -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} %files %defattr(644,root,root,755) -%doc AUTHORS NEWS README TIPS TODO doc/*.pdf +%doc AUTHORS CREDITS NEWS README TIPS doc/*.pdf %attr(755,root,root) %{_bindir}/ddd -%{_datadir}/ddd* +%{_datadir}/ddd-%{version} %{_appdefsdir}/Ddd %{_desktopdir}/ddd.desktop -%{_pixmapsdir}/*.png -%{_mandir}/man1/* -%{_infodir}/ddd* +%{_pixmapsdir}/ddd.png +%{_mandir}/man1/ddd.1* +%{_infodir}/ddd.info* +%{_infodir}/ddd-themes.info* diff --git a/fix-ftbfs-gcc-9.patch b/fix-ftbfs-gcc-9.patch deleted file mode 100644 index 4ce9379..0000000 --- a/fix-ftbfs-gcc-9.patch +++ /dev/null @@ -1,101 +0,0 @@ -From: Sophie Brun -Date: Mon, 30 Sep 2019 16:17:19 +0200 -Subject: Fix ftbfs with GCC-9 - -Last-Update: 2019-10-01 -Description: -"If a friend declaration specifies a default, it must be a friend -function definition, and no other declarations of this function are -allowed in the translation unit." -Remove default values from declaration and change these functions calls -in the code to add default values if not overwritten. ---- - ddd/DispValue.C | 4 ++-- - ddd/complete.C | 2 +- - ddd/exit.C | 2 +- - ddd/strclass.C | 1 + - ddd/strclass.h | 10 ++++++---- - 5 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/ddd/DispValue.C b/ddd/DispValue.C -index de25768..2656242 100644 ---- a/ddd/DispValue.C -+++ b/ddd/DispValue.C -@@ -1432,8 +1432,8 @@ void DispValue::get_index_surroundings(string& prefix, string& suffix) const - - for (int i = 1; i < nchildren(); i++) - { -- prefix = common_prefix(prefix, child(i)->full_name()); -- suffix = common_suffix(suffix, child(i)->full_name()); -+ prefix = common_prefix(prefix, child(i)->full_name(), 0); -+ suffix = common_suffix(suffix, child(i)->full_name(), -1); - } - } - -diff --git a/ddd/complete.C b/ddd/complete.C -index b161e74..4bde5ff 100644 ---- a/ddd/complete.C -+++ b/ddd/complete.C -@@ -354,7 +354,7 @@ static void complete_reply(const string& complete_answer, void *qu_data) - string common_pfx = completions[0]; - int i; - for (i = 1; i < completions_size; i++) -- common_pfx = common_prefix(common_pfx, completions[i]); -+ common_pfx = common_prefix(common_pfx, completions[i], 0); - - if (completions_size > 1 && input == common_pfx) - { -diff --git a/ddd/exit.C b/ddd/exit.C -index f490c23..664f203 100644 ---- a/ddd/exit.C -+++ b/ddd/exit.C -@@ -478,7 +478,7 @@ void get_core_pattern(int signal) - str_func_ret = "core"; - } - else { -- readline(patternfile, pattern); -+ readline(patternfile, pattern, '\n', 1); - core_pat = pattern.chars(); - while(*core_pat) - { -diff --git a/ddd/strclass.C b/ddd/strclass.C -index be0bade..dfbb054 100644 ---- a/ddd/strclass.C -+++ b/ddd/strclass.C -@@ -1563,6 +1563,7 @@ std::istream& operator>>(std::istream& s, string& x) - return s; - } - -+ - int readline(std::istream& s, string& x, char terminator, int discard) - { - assert(!x.consuming()); -diff --git a/ddd/strclass.h b/ddd/strclass.h -index 7ef16fa..035a17e 100644 ---- a/ddd/strclass.h -+++ b/ddd/strclass.h -@@ -811,9 +811,11 @@ public: - const regex& sep); - - friend string common_prefix(const string& x, const string& y, -- int startpos = 0); -+ int startpos); -+ - friend string common_suffix(const string& x, const string& y, -- int startpos = -1); -+ int startpos); -+ - friend string replicate(char c, int n); - friend string replicate(const string& y, int n); - friend string join(const string *src, int n, const string& sep); -@@ -864,8 +866,8 @@ public: - friend std::istream& operator>>(std::istream& s, string& x); - - friend int readline(std::istream& s, string& x, -- char terminator = '\n', -- int discard_terminator = 1); -+ char terminator, -+ int discard_terminator); - - // Status - unsigned int length() const; -- 2.44.0