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

gnu: gnome-vfs: Expect 'test-async-cancel' failure, and clean up. 

* gnu/packages/gnome.scm (gnome-vfs)[arguments]: Add
  "XFAIL_TESTS=test-async-cancel" to make flags.  Remove ignored and
  undocumented 'DISABLE_DEPRECATED_CFLAGS' configure flag.  Simplify
  'ignore-deprecations' phase and return #t.  Reformat to fit within
  80 columns.
This commit is contained in:
Mark H Weaver 2015-04-17 03:02:41 -04:00
parent 4b9b3cbbc4
commit 9e12bc3493
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnu/packages/gnome.scm
View File

@ -880,22 +880,22 @@ designed to be accessed through the MIME functions in GnomeVFS.")
(version-major+minor version) "/" (version-major+minor version) "/"
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2")))) (base32
"1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; The programmer kindly gives us a hook to turn off deprecation warnings ... `(;; XXX The 'test-async-cancel' test often fails.
`(#:configure-flags '("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") #:make-flags '("XFAIL_TESTS=test-async-cancel")
;; ... which they then completly ignore !!
#:phases #:phases
(alist-cons-before (alist-cons-before
'configure 'ignore-deprecations 'configure 'ignore-deprecations
(lambda _ (lambda _
(begin (substitute* '("libgnomevfs/Makefile.in"
(substitute* "libgnomevfs/Makefile.in" "daemon/Makefile.in")
(("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS")) (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))
(substitute* "daemon/Makefile.in" #t)
(("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS")))) %standard-phases)))
%standard-phases)))
(inputs `(("glib" ,glib) (inputs `(("glib" ,glib)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("dbus-glib" ,dbus-glib) ("dbus-glib" ,dbus-glib)
@ -909,9 +909,10 @@ designed to be accessed through the MIME functions in GnomeVFS.")
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "https://developer.gnome.org/gnome-vfs/") (home-page "https://developer.gnome.org/gnome-vfs/")
(synopsis "Access files and folders in GNOME applications") (synopsis "Access files and folders in GNOME applications")
(description "GnomeVFS is the core library used to access files and (description
folders in GNOME applications. It provides a file system abstraction which "GnomeVFS is the core library used to access files and folders in GNOME
allows applications to access local and remote files with a single consistent API.") applications. It provides a file system abstraction which allows applications
to access local and remote files with a single consistent API.")
(license license:lgpl2.0+))) (license license:lgpl2.0+)))