nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: gnome: Version splitting and line wrapping. 

* gnu/packages/gnome.scm (orbit2): Wrape code to 80 characters.  Use
  string-split/string-join to get version major/minor numbers.
  (libbonoboui): Likewise.
master
Eric Bavier 2014-07-02 13:47:23 -05:00
parent 221ed17a58
commit 5becd02510
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gnu/packages/gnome.scm
View File

@ -694,24 +694,25 @@ featuring mature C, C++ and Python bindings.")
(version "2.32.1") (version "2.32.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "mirror://gnome/sources/" name "/"
"mirror://gnome/sources/" name "/" (string-take version 4) "/" name "-" (string-join (take (string-split version #\.) 2)
version ".")
".tar.bz2")) "/" name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i")))) (base32 "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; The programmer kindly gives us a hook to turn off deprecation warnings ... ;; The programmer kindly gives us a hook to turn off deprecation warnings ...
`(#:configure-flags '("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") `(#:configure-flags
;; ... which they then completly ignore !! '("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS")
#:phases ;; ... which they then completly ignore !!
(alist-cons-before #:phases
'configure 'ignore-deprecations (alist-cons-before
(lambda _ 'configure 'ignore-deprecations
(substitute* "activation-server/Makefile.in" (lambda _
(("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))) (substitute* "activation-server/Makefile.in"
%standard-phases))) (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS")))
%standard-phases)))
(inputs `(("popt" ,popt) (inputs `(("popt" ,popt)
("libxml2" ,libxml2))) ("libxml2" ,libxml2)))
;; The following are Required by the .pc file ;; The following are Required by the .pc file
@ -1063,9 +1064,9 @@ widgets built in the loading process.")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"mirror://gnome/sources/" name "/" (string-take version 3) "/" name "-" "mirror://gnome/sources/" name "/"
version (string-join (take (string-split version #\.) 2) ".")
".tar.bz2")) "/" name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs")))) "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs"))))