diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-05-16 18:53:45 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-05-16 18:53:45 -0400 |
| commit | 632591818a26065c378b3acafb9b275fbe9ce66a (patch) | |
| tree | b3fa0209fdd73f3bab9aa1388be1cdc19a7305b9 /pkgs/desktops/pantheon | |
| parent | efcdac63fee4280cdc276362199503b6acb75df2 (diff) | |
| download | nixlib-632591818a26065c378b3acafb9b275fbe9ce66a.tar nixlib-632591818a26065c378b3acafb9b275fbe9ce66a.tar.gz nixlib-632591818a26065c378b3acafb9b275fbe9ce66a.tar.bz2 nixlib-632591818a26065c378b3acafb9b275fbe9ce66a.tar.lz nixlib-632591818a26065c378b3acafb9b275fbe9ce66a.tar.xz nixlib-632591818a26065c378b3acafb9b275fbe9ce66a.tar.zst nixlib-632591818a26065c378b3acafb9b275fbe9ce66a.zip | |
pantheon.elementary-photos: 2.6.3 -> 2.6.4
Patch in tree is removed because it's included upstream. https://github.com/elementary/photos/releases/tag/2.6.4
Diffstat (limited to 'pkgs/desktops/pantheon')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-photos/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch | 21 |
2 files changed, 2 insertions, 29 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 493e7a97805b..4ee2aef17601 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "photos"; - version = "2.6.3"; + version = "2.6.4"; name = "elementary-${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "1s0ww5g26wj0gd1drj8gxs74gvg2c9fdj4ixpifj8jh8yafdmrvg"; + sha256 = "17r9658s0pqy6s45ysi3915sm8hpvmsp7cw2jahqvjc61r4qpdc1"; }; passthru = { @@ -66,12 +66,6 @@ stdenv.mkDerivation rec { "-Dplugins=false" ]; - patches = [ - # https://github.com/elementary/photos/pull/505 - # Unrelated line got dropped in https://github.com/elementary/photos/pull/498 - ./fix-missing-line.patch - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch b/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch deleted file mode 100644 index ae859d9dff92..000000000000 --- a/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 88ee69b57f94efa2779595d1544109fed6a3211c Mon Sep 17 00:00:00 2001 -From: Fabio Valentini <decathorpe@gmail.com> -Date: Tue, 16 Apr 2019 16:12:47 +0200 -Subject: [PATCH] photos/PhotoMetadata: fix issue introduced with PR #498 - ---- - src/photos/PhotoMetadata.vala | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala -index f0a4a73b..34dcbb55 100644 ---- a/src/photos/PhotoMetadata.vala -+++ b/src/photos/PhotoMetadata.vala -@@ -197,6 +197,7 @@ public class PhotoMetadata : MediaMetadata { - #else - exiv2.from_app1_segment (buffer, length); - #endif -+ exif = Exif.Data.new_from_data (buffer, length); - source_name = "<app1 segment %d bytes>".printf (length); - } - |