amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Remove python-libxml2 workaround.

Browse source 
* gnu/packages/xml.scm (python-libxml2)[source]: New field.
(python-libxml2/fixed): Remove variable.
* gnu/packages/glib.scm (itstool/fixed): Remove variable.
* gnu/packages/gnome.scm (gnumeric)[native-inputs]: Replace ITSTOOL/FIXED with ITSTOOL.
(yelp-tools/fixed): Remove variable.
* gnu/packages/mate.scm (mate-applets, mate-utils)[native-inputs]: Replace
YELP-TOOLS/FIXED with YELP-TOOLS.
This commit is contained in:
Marius Bakke 2019-12-04 23:33:09 +01:00
parent 9092e3e936
commit 785fcb62fe
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
4 changed files with 7 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/xml.scm
View file

@ -166,9 +166,12 @@ project (but it is usable outside of the Gnome platform).")
(license license:x11)))
(define-public python-libxml2
;; TODO: Merge with 'python-libxml2/fixed' on the next rebuild cycle.
(package/inherit libxml2
(name "python-libxml2")
(source (origin
(inherit (package-source libxml2))
(patches (cons (search-patch "python-libxml2-utf8.patch")
(origin-patches (package-source libxml2))))))
(build-system python-build-system)
(outputs '("out"))
(arguments
@ -194,18 +197,6 @@ project (but it is usable outside of the Gnome platform).")
(inputs `(("libxml2" ,libxml2)))
(synopsis "Python bindings for the libxml2 library")))
(define-public python-libxml2/fixed
;; This variant fixes a crash when processing UTF-8 sequences:
;; <https://bugs.gnu.org/37468>
;; TODO: Merge with 'python-libxml2' on the next rebuild cycle.
(package/inherit
python-libxml2
(version (string-append (package-version python-libxml2) "-1"))
(source (origin
(inherit (package-source libxml2))
(patches (cons (search-patch "python-libxml2-utf8.patch")
(origin-patches (package-source libxml2))))))))
(define-public python2-libxml2
(package-with-python2 python-libxml2))