gnu: Remove emacs-xwidgets and its variants.

* gnu/packages/emacs.scm (emacs-xwidgets, emacs-pgtk-xwidgets)
(emacs-next-pgtk-xwidgets): Remove variable.

Fixes: guix/guix#6731 (emacs-xwidgets fails to build)

gnu/packages/aux-files/emacs/comp-integrity.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: t; -*-
 (require 'ert)
 
 (eval-when-compile

gnu/packages/emacs.scm

@@ -386,6 +386,7 @@
                   (lambda ()
                     (display
                      (string-append
+                      ";; -*- lexical-binding: t; -*-\n"
                       "(setq find-function-C-source-directory \"" dest "\")\n\n"
                       "(provide 'guix-emacs-c-source)")))))))
           (add-after 'install 'install-site-start
@@ -412,6 +413,7 @@
                   (lambda ()
                     (display
                      (string-append
+                      ";; -*- lexical-binding: t; -*-\n"
                       "(when (require 'guix-emacs nil t)\n"
                       "  (guix-emacs-autoload-packages 'no-reload)\n"
                       "  (advice-add 'package-load-all-descriptors"
@@ -629,6 +631,8 @@ editor (console only)")
                libx11
                libxft
                libxpm
+               libxrender
+               libxt
                libwebp
                pango
                poppler)))))
@@ -644,32 +648,6 @@ editor (console only)")
     (description "This Emacs build implements graphical UI purely in terms
 of GTK.")))
 
-(define-public emacs-xwidgets
-  (package/inherit emacs
-    (name "emacs-xwidgets")
-    (synopsis "The extensible, customizable, self-documenting text
-editor (with xwidgets support)")
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:configure-flags flags #~'())
-        #~(cons "--with-xwidgets" #$flags))))
-    (inputs
-     (modify-inputs inputs
-       (prepend webkitgtk-with-libsoup2 libxcomposite)))))
-
-(define-public emacs-pgtk-xwidgets
-  (package
-    (inherit emacs-pgtk)
-    (name "emacs-pgtk-xwidgets")
-    (synopsis "Emacs text editor with @code{xwidgets} and @code{pgtk} support")
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:configure-flags flags #~'())
-        #~(cons "--with-xwidgets" #$flags))))
-    (inputs
-     (modify-inputs inputs
-       (prepend gsettings-desktop-schemas webkitgtk-with-libsoup2)))))
-
 (define-public emacs-lucid
   (package/inherit emacs-no-x
     (name "emacs-lucid")
@@ -727,8 +705,8 @@ editor (with wide ints)" )
         #~(cons "--with-wide-int" #$flags))))))
 
 (define-public emacs-next-minimal
-  (let ((commit "509228fc6c026921c67459f21164e0325efc583b")
-        (revision "2"))
+  (let ((commit "55c752d631bcadd53e78b0798b813f50f90aefa9")
+        (revision "3"))
   (package
     (inherit emacs-minimal)
     (name "emacs-next-minimal")
@@ -742,7 +720,7 @@ editor (with wide ints)" )
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "04aalyrx5jysk5fhlka98fhfx23sy99zp8j16i0ils20sflyig6n"))
+        (base32 "06z8hrz3490ja50vh073hi0ff69plhmn1g1p51gsiic3fvyc4dkz"))
        (patches
         (search-patches "emacs-next-disable-jit-compilation.patch"
                         "emacs-next-exec-path.patch"
@@ -774,7 +752,6 @@ editor (with wide ints)" )
 
 (define-public emacs-next (emacs->emacs-next emacs))
 (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))
-(define-public emacs-next-pgtk-xwidgets (emacs->emacs-next emacs-pgtk-xwidgets))
 (define-deprecated-package emacs-next-tree-sitter
   emacs-next)
 

guix/build/emacs-build-system.scm

@@ -182,7 +182,7 @@ locations in the store in '.el' files."
            ;; of generation -pkg.el will fail.
            (condition-case
             nil
-            (let ((version (lm-version)))
+            (let ((version (or (lm-header "package-version") (lm-version))))
               ;; raises an error if version is invalid
               (and (version-to-list version) version))
             (error "0.0.0"))