git.iko.soy/typeable/nixpkgs
on master help sign in
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

commit632591818a26065c378b3acafb9b275fbe9ce66a authorworldofpeace <worldofpeace@protonmail.ch> dateThu 16 May 2019, 18:53 (8 years ago) parentefcdac6
2 files changed+2−29
pkgs/desktops/pantheon/apps/elementary-photos/default.nix+2−8 pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch−21
pkgs/desktops/pantheon/apps/elementary-photos/default.nix+2−8
@@ -5,7 +5,7 @@
55
66stdenv.mkDerivation rec {
77 pname = "photos";
8− version = "2.6.3";
8+ version = "2.6.4";
99
1010 name = "elementary-${pname}-${version}";
1111
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 owner = "elementary";
1414 repo = pname;
1515 rev = version;
16− sha256 = "1s0ww5g26wj0gd1drj8gxs74gvg2c9fdj4ixpifj8jh8yafdmrvg";
16+ sha256 = "17r9658s0pqy6s45ysi3915sm8hpvmsp7cw2jahqvjc61r4qpdc1";
1717 };
1818
1919 passthru = {
@@ -66,12 +66,6 @@ stdenv.mkDerivation rec {
6666 "-Dplugins=false"
6767 ];
6868
69− patches = [
70− # https://github.com/elementary/photos/pull/505
71− # Unrelated line got dropped in https://github.com/elementary/photos/pull/498
72− ./fix-missing-line.patch
73− ];
74−
7569 postPatch = ''
7670 chmod +x meson/post_install.py
7771 patchShebangs meson/post_install.py
pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patchdeleted−21
@@ -1,21 +0,0 @@
1−From 88ee69b57f94efa2779595d1544109fed6a3211c Mon Sep 17 00:00:00 2001
2−From: Fabio Valentini <decathorpe@gmail.com>
3−Date: Tue, 16 Apr 2019 16:12:47 +0200
4−Subject: [PATCH] photos/PhotoMetadata: fix issue introduced with PR #498
5−
6−---
7− src/photos/PhotoMetadata.vala | 1 +
8− 1 file changed, 1 insertion(+)
9−
10−diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
11−index f0a4a73b..34dcbb55 100644
12−--- a/src/photos/PhotoMetadata.vala
13−+++ b/src/photos/PhotoMetadata.vala
14−@@ -197,6 +197,7 @@ public class PhotoMetadata : MediaMetadata {
15− #else
16− exiv2.from_app1_segment (buffer, length);
17− #endif
18−+ exif = Exif.Data.new_from_data (buffer, length);
19− source_name = "<app1 segment %d bytes>".printf (length);
20− }
21−