ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

pantheon.elementary-photos: 2.6.3 -> 2.6.4

Browse Source 
Patch in tree is removed because it's included upstream.

https://github.com/elementary/photos/releases/tag/2.6.4
This commit is contained in:
worldofpeace 2019-05-16 18:53:45 -04:00
parent efcdac63fe
commit 632591818a
2 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/desktops/pantheon/apps/elementary-photos/default.nix
View File

@ -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

21
pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch
View File

@ -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);
}