* [bug#73137] [PATCH] gnu: ddd: Update to 3.4.1.
@ 2024-09-09 6:37 Andy Tai
2024-09-25 2:26 ` [bug#73137] [PATCH v2] " Andy Tai
0 siblings, 1 reply; 3+ messages in thread
From: Andy Tai @ 2024-09-09 6:37 UTC (permalink / raw)
To: 73137; +Cc: Andy Tai
* gnu/packages/debug.scm (ddd): Update to 3.4.1.
[source](origin): Add new patch to fix build.
[arguments]<#:configure-flags>: Add explicit flag fir freetype
include path.
[native-inputs]: Add bison, flex and perl.
[inputs]: Add freetype, libxaw, and libxft.
* gnu/packages/patches/ddd-build.patch: New file.
* gnu/local.mk: Register new file.
Change-Id: Ic305cc0c7e15d0f0565f2adde514a43497e11f98
---
gnu/local.mk | 1 +
gnu/packages/debug.scm | 18 ++++++++++--------
gnu/packages/patches/ddd-build.patch | 24 ++++++++++++++++++++++++
3 files changed, 35 insertions(+), 8 deletions(-)
create mode 100644 gnu/packages/patches/ddd-build.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index ed630041ff..dbf8902cd1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1127,6 +1127,7 @@ dist_patch_DATA = \
%D%/packages/patches/dbus-c++-gcc-compat.patch \
%D%/packages/patches/dbus-c++-threading-mutex.patch \
%D%/packages/patches/dbxfs-remove-sentry-sdk.patch \
+ %D%/packages/patches/ddd-build.patch \
%D%/packages/patches/debops-constants-for-external-program-names.patch \
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
%D%/packages/patches/dee-vapi.patch \
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index cc8e05746a..dd559c3faf 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -52,6 +52,7 @@ (define-module (gnu packages debug)
#:use-module (gnu packages code)
#:use-module (gnu packages compression)
#:use-module (gnu packages flex)
+ #:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gdb)
#:use-module (gnu packages glib)
@@ -1006,23 +1007,24 @@ (define-public seer-gdb
(define-public ddd
(package
(name "ddd")
- (version "3.4.0")
+ (version "3.4.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/ddd/ddd-" version ".tar.gz"))
+ (patches (search-patches "ddd-build.patch"))
(sha256
(base32
- "03sqsfiri5p130cmmzh2wikg0gisql496rvdhr1qaidh1f5bqk2x"))))
+ "12gfyh139rim49m56lxm36ckdyiiz4n3la3y6ik1aqgrqfk1fxdq"))))
(build-system gnu-build-system)
(arguments
- (list #:tests? #f ;tests require manual intervention
- ;; Avoid "friend declaration specifies default arguments and isn’t
- ;; a definition" errors.
- #:configure-flags #~(list "CXXFLAGS=-fpermissive")))
+ (list #:tests? #f ;tests require manual intervention
+ #:configure-flags
+ #~(list (string-append "--with-freetype-includes="
+ #$(this-package-input "freetype") "/include/freetype2"))))
(native-inputs
- (list pkg-config))
+ (list pkg-config bison flex perl))
(inputs
- (list motif ncurses gdb))
+ (list libxaw libxft freetype motif ncurses gdb))
(synopsis "Graphical front-end for GDB and other debuggers")
(description "GNU DDD, the Data Display Debugger, is a graphical front-end
for command-line debuggers. Many back-end debuggers are supported, notably
diff --git a/gnu/packages/patches/ddd-build.patch b/gnu/packages/patches/ddd-build.patch
new file mode 100644
index 0000000000..d172e47168
--- /dev/null
+++ b/gnu/packages/patches/ddd-build.patch
@@ -0,0 +1,24 @@
+Index: ddd/Makefile.am
+===================================================================
+--- old/ddd/Makefile.am (revision 7508)
++++ new/ddd/Makefile.am (working copy)
+@@ -655,7 +655,7 @@
+ LIBXFT = @XFT_LIBS@ -lfontconfig
+
+ # Freetype2 headers
+-XFTINCLUDE = @XFT_INCLUDE@
++XFTINCLUDE = -I@XFT_INCLUDE@
+
+ # X Miscellaneous Utilities needed for Athena and Motif >= 2.0 (lXmu)
+ LIBXMU = @XMU_LIBS@
+--- old/ddd/Makefile.in (revision 7508)
++++ new/ddd/Makefile.in (working copy)
+@@ -1307,7 +1307,7 @@
+ LIBXFT = @XFT_LIBS@ -lfontconfig
+
+ # Freetype2 headers
+-XFTINCLUDE = @XFT_INCLUDE@
++XFTINCLUDE = -I@XFT_INCLUDE@
+
+ # X Miscellaneous Utilities needed for Athena and Motif >= 2.0 (lXmu)
+ LIBXMU = @XMU_LIBS@
base-commit: 056910ec864cb7cf3225a0c27679d94405db7dcd
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#73137] [PATCH v2] gnu: ddd: Update to 3.4.1.
2024-09-09 6:37 [bug#73137] [PATCH] gnu: ddd: Update to 3.4.1 Andy Tai
@ 2024-09-25 2:26 ` Andy Tai
2024-10-04 15:28 ` bug#73137: " Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Andy Tai @ 2024-09-25 2:26 UTC (permalink / raw)
To: 73137; +Cc: Andy Tai
* gnu/packages/debug.scm (ddd): Update to 3.4.1.
[source](origin): Add new patch to fix build.
[arguments]<#:configure-flags>: Add explicit flag fir freetype
include path.
[native-inputs]: Add bison, flex and perl.
[inputs]: Add freetype, libxaw, and libxft.
* gnu/packages/patches/ddd-build.patch: New file.
* gnu/local.mk: Register new file.
Change-Id: Ic305cc0c7e15d0f0565f2adde514a43497e11f98
---
gnu/local.mk | 1 +
gnu/packages/debug.scm | 18 ++++++++++--------
gnu/packages/patches/ddd-build.patch | 24 ++++++++++++++++++++++++
3 files changed, 35 insertions(+), 8 deletions(-)
create mode 100644 gnu/packages/patches/ddd-build.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 795ff822a4..29631b0a41 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1129,6 +1129,7 @@ dist_patch_DATA = \
%D%/packages/patches/dbus-c++-gcc-compat.patch \
%D%/packages/patches/dbus-c++-threading-mutex.patch \
%D%/packages/patches/dbxfs-remove-sentry-sdk.patch \
+ %D%/packages/patches/ddd-build.patch \
%D%/packages/patches/debops-constants-for-external-program-names.patch \
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
%D%/packages/patches/dee-vapi.patch \
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index b8ddafaba6..526d5d408a 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -52,6 +52,7 @@ (define-module (gnu packages debug)
#:use-module (gnu packages code)
#:use-module (gnu packages compression)
#:use-module (gnu packages flex)
+ #:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gdb)
#:use-module (gnu packages glib)
@@ -1006,23 +1007,24 @@ (define-public seer-gdb
(define-public ddd
(package
(name "ddd")
- (version "3.4.0")
+ (version "3.4.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/ddd/ddd-" version ".tar.gz"))
+ (patches (search-patches "ddd-build.patch"))
(sha256
(base32
- "03sqsfiri5p130cmmzh2wikg0gisql496rvdhr1qaidh1f5bqk2x"))))
+ "12gfyh139rim49m56lxm36ckdyiiz4n3la3y6ik1aqgrqfk1fxdq"))))
(build-system gnu-build-system)
(arguments
- (list #:tests? #f ;tests require manual intervention
- ;; Avoid "friend declaration specifies default arguments and isn’t
- ;; a definition" errors.
- #:configure-flags #~(list "CXXFLAGS=-fpermissive")))
+ (list #:tests? #f ;tests require manual intervention
+ #:configure-flags
+ #~(list (string-append "--with-freetype-includes="
+ #$(this-package-input "freetype") "/include/freetype2"))))
(native-inputs
- (list pkg-config))
+ (list pkg-config bison flex perl))
(inputs
- (list motif ncurses gdb))
+ (list libxaw libxft freetype motif ncurses gdb))
(synopsis "Graphical front-end for GDB and other debuggers")
(description "GNU DDD, the Data Display Debugger, is a graphical front-end
for command-line debuggers. Many back-end debuggers are supported, notably
diff --git a/gnu/packages/patches/ddd-build.patch b/gnu/packages/patches/ddd-build.patch
new file mode 100644
index 0000000000..d172e47168
--- /dev/null
+++ b/gnu/packages/patches/ddd-build.patch
@@ -0,0 +1,24 @@
+Index: ddd/Makefile.am
+===================================================================
+--- old/ddd/Makefile.am (revision 7508)
++++ new/ddd/Makefile.am (working copy)
+@@ -655,7 +655,7 @@
+ LIBXFT = @XFT_LIBS@ -lfontconfig
+
+ # Freetype2 headers
+-XFTINCLUDE = @XFT_INCLUDE@
++XFTINCLUDE = -I@XFT_INCLUDE@
+
+ # X Miscellaneous Utilities needed for Athena and Motif >= 2.0 (lXmu)
+ LIBXMU = @XMU_LIBS@
+--- old/ddd/Makefile.in (revision 7508)
++++ new/ddd/Makefile.in (working copy)
+@@ -1307,7 +1307,7 @@
+ LIBXFT = @XFT_LIBS@ -lfontconfig
+
+ # Freetype2 headers
+-XFTINCLUDE = @XFT_INCLUDE@
++XFTINCLUDE = -I@XFT_INCLUDE@
+
+ # X Miscellaneous Utilities needed for Athena and Motif >= 2.0 (lXmu)
+ LIBXMU = @XMU_LIBS@
base-commit: 3ac69c1a757430d6dfdd37eb948ba1d6967967cc
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#73137: [PATCH v2] gnu: ddd: Update to 3.4.1.
2024-09-25 2:26 ` [bug#73137] [PATCH v2] " Andy Tai
@ 2024-10-04 15:28 ` Ludovic Courtès
0 siblings, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2024-10-04 15:28 UTC (permalink / raw)
To: Andy Tai; +Cc: 73137-done
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
Hi,
Andy Tai <atai@atai.org> skribis:
> * gnu/packages/debug.scm (ddd): Update to 3.4.1.
> [source](origin): Add new patch to fix build.
> [arguments]<#:configure-flags>: Add explicit flag fir freetype
> include path.
> [native-inputs]: Add bison, flex and perl.
> [inputs]: Add freetype, libxaw, and libxft.
> * gnu/packages/patches/ddd-build.patch: New file.
> * gnu/local.mk: Register new file.
>
> Change-Id: Ic305cc0c7e15d0f0565f2adde514a43497e11f98
Applied after adding a comment at the top of the patch (see below), as
suggested by ‘guix lint’.
Thanks,
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 448 bytes --]
diff --git a/gnu/packages/patches/ddd-build.patch b/gnu/packages/patches/ddd-build.patch
index d172e47168..5db2833504 100644
--- a/gnu/packages/patches/ddd-build.patch
+++ b/gnu/packages/patches/ddd-build.patch
@@ -1,5 +1,5 @@
-Index: ddd/Makefile.am
-===================================================================
+Add missing '-I' flag.
+
--- old/ddd/Makefile.am (revision 7508)
+++ new/ddd/Makefile.am (working copy)
@@ -655,7 +655,7 @@
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-04 15:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-09 6:37 [bug#73137] [PATCH] gnu: ddd: Update to 3.4.1 Andy Tai
2024-09-25 2:26 ` [bug#73137] [PATCH v2] " Andy Tai
2024-10-04 15:28 ` bug#73137: " Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.