gnu: libappindicator: Update to 12.10.1-0-298.

* gnu/packages/freedesktop.scm (libappindicator): Update to 12.10.1-0-298.
[source]: Fetch from bazaar and remove snippet.
[native-inputs]: Add autoconf, automake, at-spi2-core, gnome-common,
gobject-introspection, gtk-doc, libtool, vala and which.
[inputs]: Delete libindicator, python-2, python2-pygtk, python2-pygobject-2
and vala.
[phases]{fix-paths}: Only patch tests/Makefile.in.  Use search-input-file.

gnu/packages/freedesktop.scm

@@ -27,7 +27,7 @@
 ;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -46,12 +46,13 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages freedesktop)
-  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix bzr-download)
-  #:use-module (guix utils)
-  #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
@@ -2172,80 +2173,61 @@ (define-public libindicator
     (license license:gpl3)))
 
 (define-public libappindicator
+  ;; Use the latest commit as the latest official release from 2012 uses
+  ;; Python 2.
+  (let ((revision "0")
+        ;; Corresponds to the 12.10.1+20.10.20200706.1-0ubuntu1 tag.
+        (bazaar-revision "298"))
     (package
       (name "libappindicator")
-    (version "12.10.0")
+      (version (string-append "12.10.1-" revision "-" bazaar-revision))
-    (source
+      (source (origin
-     (origin
+                (method bzr-fetch)
-       (method url-fetch)
+                (uri (bzr-reference
-       (uri (string-append
+                      (url "lp:libappindicator")
-             "https://launchpad.net/libappindicator/"
+                      (revision bazaar-revision)))
-             (version-major+minor version) "/" version
+                (file-name (string-append name "-" version "-checkout"))
-             "/+download/libappindicator-" version ".tar.gz"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           ;; Fix 'multiple definitions' error from GCC 10
-           (substitute* "bindings/python/appindicatormodule.c"
-             (("^#include <pygobject.h>" all)
-              (string-append "#define NO_IMPORT_PYGOBJECT\n" all)))))
                 (sha256
                  (base32
-         "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m"))))
+                  "0jkc1xdsa7r71vrr2l7wgkarvzvwrpwn0m8m4ipaqlzfa5d45n3a"))))
       (build-system gnu-build-system)
       (native-inputs
-     `(("dbus-test-runner" ,dbus-test-runner)
+       (list autoconf
-       ("glib:bin" ,glib "bin")
+             automake
-       ("gobject-introspection" ,gobject-introspection)
+             at-spi2-core
-       ("pkg-config" ,pkg-config)
+             dbus-test-runner
-       ("xvfb" ,xorg-server-for-tests)))
+             `(,glib "bin")
+             gnome-common
+             gobject-introspection
+             gtk-doc
+             libtool
+             pkg-config
+             vala
+             which
+             xorg-server-for-tests))
       (inputs
-     `(("dbus-glib" ,dbus-glib)
+       (list dbus-glib))
-       ("libindicator" ,libindicator)
-       ("python@2" ,python-2)
-       ("python2-pygtk" ,python2-pygtk)
-       ("python2-pygobject-2" ,python2-pygobject-2)
-       ;; ("mono" ,mono) ; requires non-packaged gapi
-       ("vala" ,vala)))
       (propagated-inputs
        (list gtk+ libdbusmenu))
       (arguments
-     ;; FIXME: do not hardcode gtk version
        `(#:configure-flags '("--with-gtk=3")
          #:make-flags '("CFLAGS=-Wno-error")
          #:tests? #f ; One test does not pass (it succeeds when it should fail).
          #:phases
          (modify-phases %standard-phases
            (add-before 'configure 'fix-paths
-           (lambda* (#:key inputs #:allow-other-keys)
+             (lambda* (#:key native-inputs inputs #:allow-other-keys)
-             (substitute* "docs/reference/Makefile.in"
-               (("/bin/sh") (which "sh")))
                (substitute* "tests/Makefile.in"
                  (("/bin/sh") (which "sh"))
-               (("#!/bin/bash") (string-append "#!" (which "bash")))
+                 (("/bin/bash") (which "bash"))
-               (("/usr") (string-append (assoc-ref inputs "dbus-test-runner"))))
+                 (("/usr/(share/dbus-test-runner/session.conf)" _ tail)
-             (substitute* "bindings/python/Makefile.in"
+                  (search-input-file (or native-inputs inputs) tail))))))))
-               (("-lappindicator") "-lappindicator3"))
-             #t))
-         (add-after 'unpack 'fix-codegen-path
-           (lambda _
-             (substitute* "configure"
-               (("PYGTK_CODEGEN=.*") "PYGTK_CODEGEN=pygtk-codegen-2.0\n"))
-             #t))
-         (add-after 'build 'build-bindings
-           (lambda _
-             (invoke "make" "-C" "bindings/python")
-             #t))
-         (add-after 'install 'install-bindings
-           (lambda _
-             (invoke "make" "-C" "bindings/python" "install")
-             #t)))))
       (home-page "https://launchpad.net/libappindicator")
       (synopsis "Allow applications to export a menu into the Unity menu bar")
       (description "A library to allow applications to export a menu, originally
 into the Unity menu bar.  Based on KSNI, it also works in KDE and will
 fallback to generic Systray support if none of those are available.")
-    (license license:lgpl2.1+)))
+      (license license:lgpl2.1+))))
 
 (define-public libportal
   (package