Am Sonntag, dem 23.04.2023 um 09:07 +0200 schrieb Andreas Enge:
> Hello Liliana,
>
> Am Sun, Apr 23, 2023 at 01:45:19AM +0200 schrieb Liliana Marie
> Prikler:
> > as with the recent update to Evolution, this is an update to get a
> > package into a working state again.
>
> gfeeds has python-magic as input, which fails on the soon to be
> merged core-updates. It would be interesting if you could have a look
> at this package. Thanks!
Patch is attached.
Cheers
From 7c2b2abd1b6168941a102ac30581bb607c841bd8 Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler
Date: Sun, 23 Apr 2023 15:07:39 +0200
Subject: [PATCH core-updates] gnu: python-magic: Update to 0.4.27.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* gnu/packages/patches/python-magic-python-bytecode.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/python-xyz.scm (python-magic): Update to 0.4.27.
[source]: Remove field.
[#:phases]: Do not invoke ‘tests.py’.
---
gnu/local.mk | 1 -
.../python-magic-python-bytecode.patch| 19 ---
gnu/packages/python-xyz.scm | 6 ++
3 files changed, 2 insertions(+), 24 deletions(-)
delete mode 100644 gnu/packages/patches/python-magic-python-bytecode.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index a2b7defe30..fcb3acd212 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1774,7 +1774,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-pyflakes-test-location.patch \
%D%/packages/patches/python-flint-includes.patch \
%D%/packages/patches/python-libxml2-utf8.patch \
- %D%/packages/patches/python-magic-python-bytecode.patch \
%D%/packages/patches/python-memcached-syntax-warnings.patch \
%D%/packages/patches/python-mox3-python3.6-compat.patch \
%D%/packages/patches/python-parso-unit-tests-in-3.10.patch\
diff --git a/gnu/packages/patches/python-magic-python-bytecode.patch b/gnu/packages/patches/python-magic-python-bytecode.patch
deleted file mode 100644
index 997fb4ee5a..00
--- a/gnu/packages/patches/python-magic-python-bytecode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-File 5.41 changed the MIME type of Python bytecode; adjust accordingly.
-
-Taken from upstream:
-
- https://github.com/ahupp/python-magic/commit/0ae7e7ceac0e80e03adc75c858bb378c0427331a
-
-diff --git a/test/test.py b/test/test.py
-index 0c4621c..e443b84 100755
a/test/test.py
-+++ b/test/test.py
-@@ -90,7 +90,7 @@ def test_mime_types(self):
- try:
- m = magic.Magic(mime=True)
- self.assert_values(m, {
--'magic._pyc_': ('application/octet-stream', 'text/x-bytecode.python'),
-+'magic._pyc_': ('application/octet-stream', 'text/x-bytecode.python', 'application/x-bytecode.python'),
- 'test.pdf': 'application/pdf',
- 'test.gz': ('application/gzip', 'application/x-gzip'),
- 'test.snappy.parquet': 'application/octet-stream',
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c623ce3135..685e1df38f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -16863,17 +16863,16 @@ (define-public python-textual
(define-public python-magic
(package
(name "python-magic")
-(version "0.4.24")
+(version "0.4.27")
(home-page "https://github.com/ahupp/python-magic;)
(source
(origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
- (patches (search-patches "python-magic-python-bytecode.patch"))
(sha256
(base32
- "17jalhjbfd600lzfz296m0nvgp6c7vx1mgz82jbzn8hgdzknf4w0"
+ "1x11kfn4g244fia9a7y4ly8dqv5zsxfg3l5azc54dl6gkp2bk7vx"
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@@ -16895,7 +16894,6 @@ (define-public python-magic
(setenv "LC_ALL" "en_US.UTF-8")
(if tests?
(with-directory-excursion "test"
-(invoke "python" "./test.py")
(invoke "python" "./libmagic_test.py"))
(format #t "test suite not run~%")))
(native-inputs
--
2.39.2
