gnu: dee: Remove patch-docbook-xml phase.

* gnu/packages/gnome.scm (dee) [arguments]: Remove patch-docbook-xml
phase.  Use gexps.
[native-inputs]: Remove labels.  Add libxml2.
[inputs]: Remove labels.

gnu/packages/gnome.scm

@@ -627,31 +627,22 @@ of writing test cases for asynchronous interactions.")
     (build-system glib-or-gtk-build-system)
     (outputs '("out" "doc"))
     (arguments
-     `(#:configure-flags
+     (list #:configure-flags
-       (list
+           #~(list "--disable-maintainer-flags"
-        "--disable-maintainer-flags"
                    (string-append "--with-pygi-overrides-dir="
-                       (assoc-ref %outputs "out")
+                                  #$output "/lib/python"
-                       "/lib/python"
+                                  #$(version-major+minor
-                       ,(version-major+minor
                                      (package-version python))
                                   "/site-packages/gi/overrides")
                    (string-append "--with-html-dir="
-                       (assoc-ref %outputs "doc")
+                                  #$output "/share/gtk-doc/html"))
-                       "/share/gtk-doc/html"))
            #:phases
-       (modify-phases %standard-phases
+           #~(modify-phases %standard-phases
-         (add-after 'unpack 'patch-docbook-xml
+               (add-after 'unpack 'disable-failing-tests
-           (lambda* (#:key inputs #:allow-other-keys)
-             (with-directory-excursion "doc/reference/dee-1.0"
-               (substitute* "dee-1.0-docs.sgml"
-                 (("http://www.oasis-open.org/docbook/xml/4.3/")
-                  (string-append (assoc-ref inputs "docbook-xml")
-                                 "/xml/dtd/docbook/"))))))
-         (add-after 'patch-docbook-xml 'disable-failing-tests
                  (lambda _
                    (substitute* "tests/test-icu.c"
-               (("g_test_add \\(DOMAIN\"/Default/AsciiFolder\", Fixture, 0,")
+                     (("g_test_add \\(DOMAIN\"/Default/AsciiFolder\",\
+ Fixture, 0,")
                       "")
                      (("setup, test_ascii_folder, teardown\\);")
                       ""))))
@@ -662,21 +653,20 @@ of writing test cases for asynchronous interactions.")
                    ;; For missing '/etc/machine-id'.
                    (setenv "DBUS_FATAL_WARNINGS" "0"))))))
     (native-inputs
-     `(("dbus" ,dbus)
+     (list dbus
-       ("dbus-test-runner" ,dbus-test-runner)
+           dbus-test-runner
-       ("docbook-xml" ,docbook-xml-4.3)
+           docbook-xml-4.3
-       ("gobject-introspection" ,gobject-introspection)
+           gobject-introspection
-       ("gtk-doc" ,gtk-doc/stable)
+           gtk-doc/stable
            ;; Would only be required by configure flag "--enable-extended-tests".
-       ;("gtx" ,gtx)
+           ;;gtx
-       ("pkg-config" ,pkg-config)
+           libxml2                      ;for XML_CATALOG_FILES
-       ("pygobject" ,python-pygobject)
+           pkg-config
-       ("python" ,python-wrapper)
+           python-pygobject
-       ("vala" ,vala-0.52)))
+           python-wrapper
-    (inputs
+           vala-0.52))
-     `(("icu" ,icu4c)))
+    (inputs (list icu4c))
-    (propagated-inputs
+    (propagated-inputs (list glib))
-     (list glib))
     (synopsis "Model to synchronize multiple instances over DBus")
     (description "Dee is a library that uses DBus to provide objects allowing
 you to create Model-View-Controller type programs across DBus.  It also consists