me
/
guix
Archived
1
0
Fork 0
Code

gnu: sugar: Update to 0.121. 

* gnu/packages/sugar.scm (sugar): Update to 0.121.
[arguments]: Patch LINGUAS file to fix build; remove now obsolete patch to
spawn_command_line_sync.
[propagated-inputs]: Replace libsoup-minimal-2 with libsoup-minimal; replace
webkitgtk-with-libsoup2 with webkitgtk-for-gtk3.

Change-Id: I03be3a414515001851125ae92c51269aa441cf1a
master
Ricardo Wurmus 2024-02-13 10:06:29 +01:00
parent ffca429baa
commit c904b10cc6
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/sugar.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2023, 2024 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -53,7 +53,7 @@
(define-public sugar (define-public sugar
(package (package
(name "sugar") (name "sugar")
(version "0.120") (version "0.121")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -62,7 +62,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0imhaj49n7ain33kmrqk19rzlfr50m84fbc011vgg1010ddp3vdw")))) "1s31sz1j7x82vynd233k7jqqp881bpz7486r78wfz2i84f2n4n06"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
(list (list
@ -79,7 +79,10 @@
(lambda _ (lambda _
(substitute* "autogen.sh" (substitute* "autogen.sh"
(("^\"\\$srcdir/configure" m) (("^\"\\$srcdir/configure" m)
(string-append "#" m))))) (string-append "#" m)))
;; This .po file does not exist
(substitute* "po/LINGUAS"
(("^ig") ""))))
(add-after 'unpack 'fix-references (add-after 'unpack 'fix-references
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "bin/sugar.in" (substitute* "bin/sugar.in"
@ -106,12 +109,6 @@
(dirname (dirname
(search-input-file inputs (search-input-file inputs
"/share/mobile-broadband-provider-info/serviceproviders.xml")))) "/share/mobile-broadband-provider-info/serviceproviders.xml"))))
;; XXX: spawn_command_line_sync is not used correctly here, so
;; we need to patch invocations.
(substitute* '("extensions/cpsection/aboutcomputer/model.py"
"src/jarabe/model/brightness.py")
(("spawn_command_line_sync\\(cmd\\)")
"spawn_command_line_sync(cmd, 0)"))
(substitute* "extensions/cpsection/aboutcomputer/model.py" (substitute* "extensions/cpsection/aboutcomputer/model.py"
(("ethtool") (("ethtool")
(search-input-file inputs "/sbin/ethtool"))) (search-input-file inputs "/sbin/ethtool")))
@ -161,7 +158,7 @@
gstreamer gstreamer
gtk+ gtk+
gtksourceview-3 gtksourceview-3
libsoup-minimal-2 libsoup-minimal
libwnck libwnck
libxklavier libxklavier
network-manager network-manager
@ -175,7 +172,7 @@
telepathy-salut ;for XMPP neighborhood telepathy-salut ;for XMPP neighborhood
;; This is for the UPowerGlib namespace ;; This is for the UPowerGlib namespace
upower upower
webkitgtk-with-libsoup2)) webkitgtk-for-gtk3))
(native-inputs (native-inputs
(list autoconf automake (list autoconf automake
gettext-minimal gettext-minimal