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