Commit 1715ced3 authored by Robert Schütz's avatar Robert Schütz Committed by Robert Schütz
Browse files

python310Packages.mat2: 0.13.2 -> 0.13.3 

Diff: https://0xacab.org/jvoisin/mat2/-/compare/0.13.2...0.13.3

Changelog: https://0xacab.org/jvoisin/mat2/-/blob/0.13.3/CHANGELOG.md
parent a62f3d6c

pkgs/development/python-modules/mat2/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -23,16 +23,18 @@ 


buildPythonPackage rec {

  pname = "mat2";

  version = "0.13.2";

  version = "0.13.3";



  disabled = pythonOlder "3.5";



  format = "setuptools";



  src = fetchFromGitLab {

    domain = "0xacab.org";

    owner = "jvoisin";

    repo = "mat2";

    rev = version;

    hash = "sha256-gZl2VH7qCmjrM/UrXPief8hCQKkBHdjG8w0MQvkZ7wk=";

    hash = "sha256-x3vGltGuFjI435lEXZU3p4eQcgRm0Oodqd6pTWO7ZX8=";

  };



  patches = [
@@ -56,6 +58,7 @@ buildPythonPackage rec { 
  ];



  postPatch = ''

    rm pyproject.toml

    substituteInPlace dolphin/mat2.desktop \

      --replace "@mat2@" "$out/bin/mat2" \

      --replace "@mat2svg@" "$out/share/icons/hicolor/scalable/apps/mat2.svg"

pkgs/development/python-modules/mat2/paths.patch

+6 −6
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ index 41c8de4..11df258 100644 
+Exec=@kdialog@ --yesno  "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U

+Exec[de]=@kdialog@ --yesno  "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U

diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py

index cdfce3d..1e83520 100644

index 2b91ac2..5fcf6e5 100644

--- a/libmat2/exiftool.py

+++ b/libmat2/exiftool.py

@@ -1,8 +1,6 @@
@@ -23,13 +23,13 @@ index cdfce3d..1e83520 100644 
 import os

-import shutil

 import subprocess

 from typing import Union

 from typing import Union, Set, Dict

 

@@ -67,14 +65,5 @@ class ExiftoolParser(abstract.AbstractParser):

             return False

         return True

 

-@functools.lru_cache

-@functools.lru_cache(maxsize=None)

 def _get_exiftool_path() -> str:  # pragma: no cover

-    which_path = shutil.which('exiftool')

-    if which_path:
@@ -42,7 +42,7 @@ index cdfce3d..1e83520 100644 
-    raise RuntimeError("Unable to find exiftool")

+    return '@exiftool@'

diff --git a/libmat2/video.py b/libmat2/video.py

index 4d33aa4..6388664 100644

index 39059c5..82fe1e7 100644

--- a/libmat2/video.py

+++ b/libmat2/video.py

@@ -1,6 +1,4 @@
@@ -51,12 +51,12 @@ index 4d33aa4..6388664 100644 
-import shutil

 import logging

 

 from typing import Union

 from typing import Union, Dict

@@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser):

     }

 

 

-@functools.lru_cache()

-@functools.lru_cache(maxsize=None)

 def _get_ffmpeg_path() -> str:  # pragma: no cover

-    which_path = shutil.which('ffmpeg')

-    if which_path: