Unverified Commit 451c1c0e authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #266341 from 6t8k/exiv2_0.28.0-0.28.1

exiv2: 0.28.0 -> 0.28.1
parents f3565a2c dd14fdd6
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
{ mkDerivation, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
{ mkDerivation, config, lib, fetchpatch, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook

# For `digitaglinktree`
, perl, sqlite
@@ -67,6 +67,14 @@ mkDerivation rec {
    hash = "sha256-BQPANORF/0JPGKZxXAp6eb5KXgyCs+vEYaIc7DdFpbM=";
  };

  # Fix build against exiv2 0.28.1
  patches = [
    (fetchpatch {
      url = "https://invent.kde.org/graphics/digikam/-/commit/f5ea91a7f6c1926815ec68f3e0176d6c15b83051.patch";
      hash = "sha256-5g2NaKKNKVfgW3dTO/IP/H/nZ0YAIOmdPAumy3NEaNg=";
    })
  ];

  nativeBuildInputs = [
    cmake
    doxygen
+9 −0
Original line number Diff line number Diff line
{ mkDerivation
, fetchpatch
, fetchurl
, lib
, extra-cmake-modules
@@ -25,6 +26,14 @@ mkDerivation rec {
    hash = "sha256-NWtOIHJXtc8PlltYbbp2YwDf/3QI3MdHNDX7WVQMig4=";
  };

  # Fix build against exiv2 0.28.1
  patches = [
    (fetchpatch {
      url = "https://invent.kde.org/graphics/kphotoalbum/-/commit/1ceb1ae37f3f95aa290b0846969af4b26f616760.patch";
      hash = "sha256-SfBJHyJZcysvemc/F09GPczBjcofxGomgjJ814PSU+c=";
    })
  ];

  # not sure if we really need phonon when we have vlc, but on KDE it's bound to
  # be on the system anyway, so there is no real harm including it
  buildInputs = [ exiv2 phonon libvlc ];
+6 −1
Original line number Diff line number Diff line
@@ -30,8 +30,13 @@ stdenv.mkDerivation rec {
    hash = "sha256-kVf9+zI9rtEMmS0N4qrN673T/1fnqfcV3hQPnMXMLas=";
  };

  postPatch = ''
    # exiv2 0.28.1
    substituteInPlace CMakeLists.txt \
      --replace "exiv2lib" "exiv2"
  ''
  # error: no member named 'setlocale' in namespace 'std'; did you mean simply 'setlocale'?
  postPatch = lib.optionalString stdenv.isDarwin ''
  + lib.optionalString stdenv.isDarwin ''
    substituteInPlace cplusplus/main.cpp \
      --replace "std::setlocale" "setlocale"
  '';
+11 −4
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, doxygen
, gettext
@@ -19,7 +20,7 @@

stdenv.mkDerivation rec {
  pname = "exiv2";
  version = "0.28.0";
  version = "0.28.1";

  outputs = [ "out" "lib" "dev" "doc" "man" ];

@@ -27,9 +28,16 @@ stdenv.mkDerivation rec {
    owner = "exiv2";
    repo = "exiv2";
    rev = "v${version}";
    hash = "sha256-nEoLJWxSJmAonCbW/iZKjLrKMj09mwEaSUXUcUu8GxU=";
    hash = "sha256-Jim8vYWyCa16LAJ1GuP8cCzhXIc2ouo6hVsHg3UQbdg=";
  };

  patches = [
    (fetchpatch {
      url = "https://github.com/Exiv2/exiv2/commit/c351c7cce317571934abf693055779a59df30d6e.patch";
      hash = "sha256-fWJT4IUBrAELl6ku0M1iTzGFX74le8Z0UzTJLU/gYls=";
    })
  ];

  nativeBuildInputs = [
    cmake
    doxygen
@@ -67,8 +75,7 @@ stdenv.mkDerivation rec {
    "doc"
  ];

  # https://github.com/Exiv2/exiv2/issues/2762
  doCheck = lib.versionOlder brotli.version "1.1.0";
  doCheck = true;

  preCheck = ''
    patchShebangs ../test/