 @@ -1,74 +1,74 @@
-# $NetBSD: Makefile,v 1.70 2015/05/23 10:33:01 kefren Exp $
+# $NetBSD: Makefile,v 1.71 2015/05/24 06:50:14 kefren Exp $
+#
 DISTNAME=	f-spot-0.8.2
-PKGREVISION=	30
+PKGREVISION=	31
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/f-spot/0.8/}
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://f-spot.org/
 COMMENT=	Full-featured personal photo management application
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake intltool pkg-config bash:run msgfmt
 MAKE_JOBS_SAFE=	no
 #.include "../../mk/bsd.prefs.mk"
 #.for platform in ${LP64PLATFORMS}
 #.  if ${MACHINE_PLATFORM:M${platform}}
 #CONFIGURE_ENV+=	EXTRACSDEFINES=-define:LONG_IS_64BITS
 #.  endif
 #.endfor
 PKGCONFIG_OVERRIDE+=	f-spot.pc.in
 REPLACE_BASH+=	icon-theme-installer
 REPLACE_BASH+=	src/Clients/MainApp/f-spot.in
 REPLACE_BASH+=	tools/f-spot-import
 SUBST_CLASSES+=			fix-x11
 SUBST_STAGE.fix-x11=		post-patch
 SUBST_MESSAGE.fix-x11=		Fixing libX11 references
 SUBST_FILES.fix-x11=		src/Core/FSpot.Utils/FSpot.Utils.dll.config.in
 SUBST_FILES.fix-x11+=		src/Core/FSpot.Utils/FSpot.Utils.dll.config
 SUBST_FILES.fix-x11+=		build/DllMapVerifier.cs
 SUBST_FILES.fix-x11+=		lib/Hyena/build/DllMapVerifier.cs
 SUBST_SED.fix-x11=		-e 's,libX11.so.6,${X11BASE}/lib/libX11.so,'
 SUBST_CLASSES+=		fix-mcs
 SUBST_STAGE.fix-mcs=	post-patch
 SUBST_MESSAGE.fix-mcs=	Fix compiler name
 SUBST_FILES.fix-mcs=	configure
 SUBST_SED.fix-mcs=	-e 's,gmcs,mcs,'
 GCONF_SCHEMAS=	f-spot.schemas
 .include "../../devel/GConf/schemas.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/flickrnet/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"
 .include "../../devel/mono-addins/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gnome-sharp/buildlink3.mk"
 .include "../../x11/gnome-desktop-sharp/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
 .include "../../security/gnome-keyring-sharp/buildlink3.mk"
 .include "../../sysutils/ndesk-dbus/buildlink3.mk"
 .include "../../sysutils/ndesk-dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2015/05/23 10:33:01 kefren Exp $
+$NetBSD: distinfo,v 1.10 2015/05/24 06:50:14 kefren Exp $
 SHA1 (f-spot-0.8.2.tar.bz2) = 258e30a11ac24f963a47ead19c3d14bf755816e5
 RMD160 (f-spot-0.8.2.tar.bz2) = 658f437cb336fc29a718cf021ba54ee62dbee757
 Size (f-spot-0.8.2.tar.bz2) = 3222712 bytes
 SHA1 (patch-FlickrExport.cs) = 15610c7f0e0d321d8acf4282cb04953e62180c2c
-SHA1 (patch-FlickrRemote.cs) = 63b3e8c6e57ca2c02a38c00fc2f0dcaf69825779
+SHA1 (patch-FlickrRemote.cs) = a77d7306a4ac149891d73e880ff93253584c9a29
 SHA1 (patch-FolderTreeView.cs) = 0e5804189b8c11caafe0bbcae8faa9a24fa4d5a5
 SHA1 (patch-GdkImageLoader.cs) = 945f8349af0a5cbbfd97cf73641eae268a8aed05
 SHA1 (patch-GroupSelector.cs) = bed9b5e8737f3079037bc0e68898ae765808c01e
 SHA1 (patch-Makefile_in) = 313c3ad5fb9859a2891c38d49776347747949162

 @@ -1,84 +1,84 @@
-$NetBSD: patch-FlickrRemote.cs,v 1.1 2015/05/23 10:33:01 kefren Exp $
+$NetBSD: patch-FlickrRemote.cs,v 1.2 2015/05/24 06:50:14 kefren Exp $
 Make it compile with newer flickrnet
 --- src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs.orig	2010-12-19 15:34:42.000000000 +0200
 +++ src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs	2015-05-23 13:25:26.000000000 +0300
 @@ -11,6 +11,7 @@
   */
  using System;
  using System.IO;
 +using System.Linq;
  using System.Text;
  using System.Collections;
  using FlickrNet;
 @@ -22,7 +23,7 @@
  namespace FSpot.Exporters.Flickr {
  public class FlickrRemote {
 -	public static Licenses    licenses;
 +	public static LicenseCollection    licenses;
  	private string            frob;
  	private string            token;
  	private Auth              auth;
 @@ -62,28 +63,29 @@
  		get { return flickr; }
+ 	}
 -	public License[] GetLicenses ()
 +	public LicenseCollection GetLicenses ()
+ 	{
  		// Licenses won't change normally in a user session
  		if (licenses == null) {
  			try {
  				licenses = flickr.PhotosLicensesGetInfo();
  			} catch (FlickrNet.FlickrApiException e ) {
 -				Log.Error (e.Code + ": " + e.Verbose );
 +				Log.Error (e.Code + ": " + e.Message );
  				return null;
+ 			}
+ 		}
 -		return licenses.LicenseCollection;
 +		return licenses;
+ 	}
  	public ArrayList Search (string[] tags, int licenseId)
+ 	{
-+		var options = new PhotoSearchOptions { Tags = tags.Aggregate((a, b) => a += b + " ") };
++		var options = new PhotoSearchOptions { Tags = tags.Aggregate((a, b) => a + " " + b) };
  		ArrayList photos_url = new ArrayList ();
  		// Photos photos = flickr.PhotosSearchText (tags, licenseId);
 -		Photos photos = flickr.PhotosSearch (tags);
 +		PhotoCollection photos = flickr.PhotosSearch (options);
  		if (photos != null) {
 -			foreach (FlickrNet.Photo photo in photos.PhotoCollection) {
 +			foreach (FlickrNet.Photo photo in photos) {
  				photos_url.Add (photo.ThumbnailUrl);
+ 			}
+ 		}
 @@ -93,11 +95,14 @@
  	public ArrayList Search (string tags, int licenseId)
+ 	{
 +		var options = new PhotoSearchOptions{Tags = tags};
  		ArrayList photos_url = new ArrayList ();
 -		Photos photos = flickr.PhotosSearchText (tags, licenseId);
 +		// XXX: ignore license, probably should also set
 +		// options.licenses
 +		PhotoCollection photos = flickr.PhotosSearch (options);
  		if (photos != null) {
 -			foreach (FlickrNet.Photo photo in photos.PhotoCollection) {
 +			foreach (FlickrNet.Photo photo in photos) {
  				photos_url.Add (photo.ThumbnailUrl);
+ 			}
+ 		}
 @@ -126,7 +131,7 @@
  				return auth;
  			} catch (FlickrNet.FlickrApiException ex) {
 -				Log.Error ("Problems logging in to Flickr - " + ex.Verbose);
 +				Log.Error ("Problems logging in to Flickr - " + ex.Message);
  				return null;
+ 			}
+ 		}