[bug#67260] [PATCH emacs-team v11 0/7] You thought it was term/internal.el, but it was me, Dio!

[Andrew Tropin]

On 2024-03-07 18:52, Liliana Marie Prikler wrote:

> Am Donnerstag, dem 07.03.2024 um 11:55 +0300 schrieb Andrew Tropin:
>> Hi Liliana! 
>> 
>> guix time-machine --branch=emacs-team -- shell emacs-pgtk emacs-magit
>> --pure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q
>> 
>> fails with:
>> 
>> --8<---------------cut here---------------start------------->8---
>> [...]
>> --8<---------------cut here---------------end--------------->8---
> I already sent you a patch for that.  Attaching it again.
>
>
> From 19fc252ab7e86ad1443a8d16f68467c61bf23179 Mon Sep 17 00:00:00 2001
> Message-ID: 
> <19fc252ab7e86ad1443a8d16f68467c61bf23179.1709582330.git.liliana.prikler@gmail.com>
> From: Liliana Marie Prikler <liliana.prikler@gmail.com>
> Date: Mon, 4 Mar 2024 20:54:49 +0100
> Subject: [PATCH] aux-files: comp-integrity: Adjust for emacs-pgtk.
>
> * gnu/packages/aux-files/emacs/comp-integrity.el (x-dnd-init-frame): Require
> x-dnd.
> (x-handle-no-bitmap-icon): Only test this if it's bound.
> ---
>  gnu/packages/aux-files/emacs/comp-integrity.el | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/aux-files/emacs/comp-integrity.el 
> b/gnu/packages/aux-files/emacs/comp-integrity.el
> index 9692d9bf97..191e2ddb98 100644
> --- a/gnu/packages/aux-files/emacs/comp-integrity.el
> +++ b/gnu/packages/aux-files/emacs/comp-integrity.el
> @@ -125,5 +125,6 @@
>  (expect-native emacs-version)
>  (expect-native define-widget)
>  (expect-native window-right)
> -(expect-native x-dnd-init-frame)
> -(expect-native x-handle-no-bitmap-icon)
> +(expect-native x-dnd-init-frame x-dnd)
> +(and (boundp 'x-handle-no-bitmap-icon)
> +     (expect-native x-handle-no-bitmap-icon))
>
> base-commit: 3d4fc910f73220f47e5f2459853333a7c83c5d1d
> prerequisite-patch-id: 96ae24a3419fccea142d2726b11ff20e798bfbd0
> prerequisite-patch-id: e908853224bffffa285088dc6e31abaf12c12e02

Yep, with this patch it seems to build correctly.

-- 
Best regards,
Andrew Tropin

signature.asc
Description: PGP signature