6 files changed, 38 insertions(+), 14 deletions(-)

M gnu/packages/compression.scm
M gnu/packages/django.scm
M gnu/packages/fonts.scm
M gnu/packages/gnome.scm
M gnu/packages/python-compression.scm
M gnu/packages/video.scm

@@ 71,7 71,6 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system meson)
-  #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)


@@ 2428,19 2427,6 @@ The specification of the Brotli Compressed Data Format is defined in RFC 7932.")
 (define-public google-brotli
   (deprecated-package "google-brotli" brotli))
 
-(define-public python-brotli
-  (package
-    (inherit brotli)
-    (name "python-brotli")
-    (build-system python-build-system)
-    (arguments '())
-    (synopsis "Python interface to Brotli")
-    (description "This package provides a Python interface to the @code{brotli}
-package, an implementation of the Brotli lossless compression algorithm.")))
-
-(define-public python-google-brotli
-  (deprecated-package "python-google-brotli" python-brotli))
-
 (define-public java-brotli
   (package
     (inherit brotli)

@@ 52,6 52,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-check)
+  #:use-module (gnu packages python-compression)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)

@@ 109,6 109,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-compression)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages xorg))

@@ 198,6 198,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
+  #:use-module (gnu packages python-compression)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)

@@ 34,6 34,7 @@
   #:use-module (guix utils)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix gexp)
   #:use-module (guix build-system cargo)
   #:use-module (guix build-system gnu)


@@ 150,6 151,39 @@ Python-Blosc2 also reproduces the API of Python-Blosc and is meant to be able
 to access its data, so it can be used as a drop-in replacement.")
     (license license:bsd-3)))
 
+(define-public python-brotli
+  (package
+    (name "python-brotli")
+    (version "1.0.9")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/google/brotli")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1fikasxf7r2dwlk8mv8w7nmjkn0jw5ic31ky3mvpkdzwgd4xfndl"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+           ;; Cherry-picked from upstream since the latest release
+           ;; https://github.com/google/brotli/commit/09b0992b6acb7faa6fd3b23f9bc036ea117230fc
+           (substitute* (find-files "scripts" "^lib.*pc\\.in")
+             (("-R\\$\\{libdir\\} ") ""))))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-pytest
+           python-setuptools))
+    (home-page "https://github.com/google/brotli")
+    (synopsis "Python interface to Brotli")
+    (description "This package provides a Python interface to the @code{brotli}
+package, an implementation of the Brotli lossless compression algorithm.")
+    (license license:expat)))
+
+(define-public python-google-brotli
+  (deprecated-package "python-google-brotli" python-brotli))
+
 (define-public python-multivolumefile
   (package
     (name "python-multivolumefile")

@@ 203,6 203,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-check)
+  #:use-module (gnu packages python-compression)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)