From patchwork Mon Sep 9 06:37:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 67795 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3574B27BBEA; Mon, 9 Sep 2024 07:38:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D69D627BBE2 for ; Mon, 9 Sep 2024 07:38:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snY2D-0003Eu-IJ; Mon, 09 Sep 2024 02:38:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snY2C-0003El-1C for guix-patches@gnu.org; Mon, 09 Sep 2024 02:38:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snY2B-0005lp-LJ for guix-patches@gnu.org; Mon, 09 Sep 2024 02:37:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=mbD4IJY5WrPVnNt9h3SDwK3CZ+0mepcfoZRylYLfPAw=; b=AHMLOLrhOZXjyYTKjiLAiVXiKWkL4mR+3G0ogYvC/j9BFYc0xlKfYkV3a1WL4tzxG9Ep3zaC7fM005GHZbhaTd7BKcf4xzhsN5DtqvKlnY5NUzt9Y9oOX+v2Ojof8IllYb7qwipOOf50dONwNHpOChV9SuPcTLKyIzYKsIfyXr3/mMKOrnYCD2KMMcGZp3HZBoPjTEarmbfQD3PiGvyf2LRW4eHNjmGe6TfI9PzsmursYweBcJoZktMWypxipcfsFzY0R86a9LD4kWHJSxknAC1QHDRPoN6213vUWN5DOPjEEr6okh7P93h+3rpKMBSnYhIUtShcDKViVzeCUawK1g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snY2E-0000ri-Cz for guix-patches@gnu.org; Mon, 09 Sep 2024 02:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73137] [PATCH] gnu: ddd: Update to 3.4.1. Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Sep 2024 06:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73137@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17258638773310 (code B ref -1); Mon, 09 Sep 2024 06:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Sep 2024 06:37:57 +0000 Received: from localhost ([127.0.0.1]:60551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snY28-0000rK-JD for submit@debbugs.gnu.org; Mon, 09 Sep 2024 02:37:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:52234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snY26-0000rB-Hj for submit@debbugs.gnu.org; Mon, 09 Sep 2024 02:37:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snY22-0003EM-3y for guix-patches@gnu.org; Mon, 09 Sep 2024 02:37:50 -0400 Received: from mail-ot1-x329.google.com ([2607:f8b0:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snY1x-0005jq-BT for guix-patches@gnu.org; Mon, 09 Sep 2024 02:37:48 -0400 Received: by mail-ot1-x329.google.com with SMTP id 46e09a7af769-7094641d4e6so1882489a34.3 for ; Sun, 08 Sep 2024 23:37:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725863864; x=1726468664; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=mbD4IJY5WrPVnNt9h3SDwK3CZ+0mepcfoZRylYLfPAw=; b=gOpNu3cIzGDtpRAC4ijhZjSQ/rOQu+xy4J9KMpONWChkx399XNcgE45etxR8bW9q1f g7PZY6nhWtTqTK0sRk0FgHSxBtyO3IBZhli+LAaQsLGJZTrOL8tyVqNpg+KC7QJVHAUC MTuw+zrIQWmpYFt289W3/vdlBV2f/8Gj5og/R83MyWvwEo1oEyqo9SaDLBvr7DeiuC1N PKbfWedo72A/PEGaZYAwcmgLMBHGQoSu6ReEEPFqjh5g+INeamVMSycsQAkm1ARa7/5z jy7vxUVQ5GHNKk4tygWcI8RgefqrfFhd/Bn43wvSCw2jtX+yPZMHDyGaX4hoX7ghcoUp dpWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725863864; x=1726468664; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mbD4IJY5WrPVnNt9h3SDwK3CZ+0mepcfoZRylYLfPAw=; b=MZrakrgFe5hrmQHXwNUCj5VdN4CrbKzVHVydix3baVg1IkSjP9ssQLLRu7mB83M6Dv 5DNESmkGrR00Enqijn941KSjMojOfMXyRl01dfdMJXsJ/encNIrLj6kBB//gnkIiZHva 1pLSwgWHpoPfacmKgD/ztZAN/xbK7F2x+4P/dCNpKTbMg1w45GANZYKqTuZ1BTq3mQ+N 8rYxgF8Yc9H6asSJvVi++/DjERqSVeEC7pTb109bTpzdB1/fqy87S+C5t4UpabQxVfdr TzHm/c7EVtib91oRgs94dJHVsIhgU7JjdqppsOHylndFzBIvfnlZclv5Jbu18pov43z4 QCQw== X-Gm-Message-State: AOJu0YywfC59/WNR1skZ9Np+7KCP96KfalPvhPpgXGinvOqDwIoCIzGK TYwCfbVLygyRVopJucFnSy2j9K71ClSSwblrAllS5I/OBaQTB8ShTJ86WQ== X-Google-Smtp-Source: AGHT+IEGLkgwEMZgS/NwD7l1NjlASLpZ2q6fVe7/8j510bjjrkZhiqJZaEj750QgoInRuxwcUYsDAA== X-Received: by 2002:a05:6359:7c1f:b0:1b5:ffce:b2a0 with SMTP id e5c5f4694b2df-1b8385b2c19mr1344141455d.6.1725863863423; Sun, 08 Sep 2024 23:37:43 -0700 (PDT) Received: from DEskMiniX300.. ([38.84.157.61]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-718e5991652sm2877140b3a.217.2024.09.08.23.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Sep 2024 23:37:42 -0700 (PDT) From: Andy Tai Date: Sun, 8 Sep 2024 23:37:40 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::329; envelope-from=lichengtai@gmail.com; helo=mail-ot1-x329.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 base-commit: 056910ec864cb7cf3225a0c27679d94405db7dcd 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@