Sun May 24 06:50:14 2015 UTC ()
Fix lambda used in tags reduce


(kefren)
diff -r1.70 -r1.71 pkgsrc/graphics/f-spot/Makefile
diff -r1.9 -r1.10 pkgsrc/graphics/f-spot/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/f-spot/patches/patch-FlickrRemote.cs
cvs diff -r1.70 -r1.71 pkgsrc/graphics/f-spot/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/f-spot/Attic/Makefile 2015/05/23 10:33:01 1.70
+++ pkgsrc/graphics/f-spot/Attic/Makefile 2015/05/24 06:50:14 1.71
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.70 2015/05/23 10:33:01 kefren Exp $ 1# $NetBSD: Makefile,v 1.71 2015/05/24 06:50:14 kefren Exp $
2# 2#
3 3
4DISTNAME= f-spot-0.8.2 4DISTNAME= f-spot-0.8.2
5PKGREVISION= 30 5PKGREVISION= 31
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/f-spot/0.8/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/f-spot/0.8/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://f-spot.org/ 11HOMEPAGE= http://f-spot.org/
12COMMENT= Full-featured personal photo management application 12COMMENT= Full-featured personal photo management application
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= gmake intltool pkg-config bash:run msgfmt 16USE_TOOLS+= gmake intltool pkg-config bash:run msgfmt
17 17
18MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
cvs diff -r1.9 -r1.10 pkgsrc/graphics/f-spot/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/f-spot/Attic/distinfo 2015/05/23 10:33:01 1.9
+++ pkgsrc/graphics/f-spot/Attic/distinfo 2015/05/24 06:50:14 1.10
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.9 2015/05/23 10:33:01 kefren Exp $ 1$NetBSD: distinfo,v 1.10 2015/05/24 06:50:14 kefren Exp $
2 2
3SHA1 (f-spot-0.8.2.tar.bz2) = 258e30a11ac24f963a47ead19c3d14bf755816e5 3SHA1 (f-spot-0.8.2.tar.bz2) = 258e30a11ac24f963a47ead19c3d14bf755816e5
4RMD160 (f-spot-0.8.2.tar.bz2) = 658f437cb336fc29a718cf021ba54ee62dbee757 4RMD160 (f-spot-0.8.2.tar.bz2) = 658f437cb336fc29a718cf021ba54ee62dbee757
5Size (f-spot-0.8.2.tar.bz2) = 3222712 bytes 5Size (f-spot-0.8.2.tar.bz2) = 3222712 bytes
6SHA1 (patch-FlickrExport.cs) = 15610c7f0e0d321d8acf4282cb04953e62180c2c 6SHA1 (patch-FlickrExport.cs) = 15610c7f0e0d321d8acf4282cb04953e62180c2c
7SHA1 (patch-FlickrRemote.cs) = 63b3e8c6e57ca2c02a38c00fc2f0dcaf69825779 7SHA1 (patch-FlickrRemote.cs) = a77d7306a4ac149891d73e880ff93253584c9a29
8SHA1 (patch-FolderTreeView.cs) = 0e5804189b8c11caafe0bbcae8faa9a24fa4d5a5 8SHA1 (patch-FolderTreeView.cs) = 0e5804189b8c11caafe0bbcae8faa9a24fa4d5a5
9SHA1 (patch-GdkImageLoader.cs) = 945f8349af0a5cbbfd97cf73641eae268a8aed05 9SHA1 (patch-GdkImageLoader.cs) = 945f8349af0a5cbbfd97cf73641eae268a8aed05
10SHA1 (patch-GroupSelector.cs) = bed9b5e8737f3079037bc0e68898ae765808c01e 10SHA1 (patch-GroupSelector.cs) = bed9b5e8737f3079037bc0e68898ae765808c01e
11SHA1 (patch-Makefile_in) = 313c3ad5fb9859a2891c38d49776347747949162 11SHA1 (patch-Makefile_in) = 313c3ad5fb9859a2891c38d49776347747949162
cvs diff -r1.1 -r1.2 pkgsrc/graphics/f-spot/patches/Attic/patch-FlickrRemote.cs (expand / switch to unified diff)

--- pkgsrc/graphics/f-spot/patches/Attic/patch-FlickrRemote.cs 2015/05/23 10:33:01 1.1
+++ pkgsrc/graphics/f-spot/patches/Attic/patch-FlickrRemote.cs 2015/05/24 06:50:14 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-FlickrRemote.cs,v 1.1 2015/05/23 10:33:01 kefren Exp $ 1$NetBSD: patch-FlickrRemote.cs,v 1.2 2015/05/24 06:50:14 kefren Exp $
2 2
3Make it compile with newer flickrnet 3Make it compile with newer flickrnet
4 4
5--- src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs.orig 2010-12-19 15:34:42.000000000 +0200 5--- src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs.orig 2010-12-19 15:34:42.000000000 +0200
6+++ src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs 2015-05-23 13:25:26.000000000 +0300 6+++ src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs 2015-05-23 13:25:26.000000000 +0300
7@@ -11,6 +11,7 @@ 7@@ -11,6 +11,7 @@
8 */ 8 */
9 using System; 9 using System;
10 using System.IO; 10 using System.IO;
11+using System.Linq; 11+using System.Linq;
12 using System.Text; 12 using System.Text;
13 using System.Collections; 13 using System.Collections;
14 using FlickrNet; 14 using FlickrNet;
@@ -34,27 +34,27 @@ Make it compile with newer flickrnet @@ -34,27 +34,27 @@ Make it compile with newer flickrnet
34 licenses = flickr.PhotosLicensesGetInfo(); 34 licenses = flickr.PhotosLicensesGetInfo();
35 } catch (FlickrNet.FlickrApiException e ) { 35 } catch (FlickrNet.FlickrApiException e ) {
36- Log.Error (e.Code + ": " + e.Verbose ); 36- Log.Error (e.Code + ": " + e.Verbose );
37+ Log.Error (e.Code + ": " + e.Message ); 37+ Log.Error (e.Code + ": " + e.Message );
38 return null; 38 return null;
39 } 39 }
40 } 40 }
41- return licenses.LicenseCollection; 41- return licenses.LicenseCollection;
42+ return licenses; 42+ return licenses;
43 } 43 }
44  44
45 public ArrayList Search (string[] tags, int licenseId) 45 public ArrayList Search (string[] tags, int licenseId)
46 { 46 {
47+ var options = new PhotoSearchOptions { Tags = tags.Aggregate((a, b) => a += b + " ") }; 47+ var options = new PhotoSearchOptions { Tags = tags.Aggregate((a, b) => a + " " + b) };
48 ArrayList photos_url = new ArrayList (); 48 ArrayList photos_url = new ArrayList ();
49 // Photos photos = flickr.PhotosSearchText (tags, licenseId); 49 // Photos photos = flickr.PhotosSearchText (tags, licenseId);
50- Photos photos = flickr.PhotosSearch (tags); 50- Photos photos = flickr.PhotosSearch (tags);
51+ PhotoCollection photos = flickr.PhotosSearch (options); 51+ PhotoCollection photos = flickr.PhotosSearch (options);
52  52
53 if (photos != null) { 53 if (photos != null) {
54- foreach (FlickrNet.Photo photo in photos.PhotoCollection) { 54- foreach (FlickrNet.Photo photo in photos.PhotoCollection) {
55+ foreach (FlickrNet.Photo photo in photos) { 55+ foreach (FlickrNet.Photo photo in photos) {
56 photos_url.Add (photo.ThumbnailUrl); 56 photos_url.Add (photo.ThumbnailUrl);
57 } 57 }
58 } 58 }
59@@ -93,11 +95,14 @@ 59@@ -93,11 +95,14 @@
60  60