[arch-commits] Commit in f-spot/trunk (PKGBUILD flickrnet-3.0.patch)
Ionut Biru
ibiru at archlinux.org
Tue Nov 29 08:13:48 UTC 2011
Date: Tuesday, November 29, 2011 @ 03:13:48
Author: ibiru
Revision: 143779
flickrnet 3.0 api support
Added:
f-spot/trunk/flickrnet-3.0.patch
Modified:
f-spot/trunk/PKGBUILD
---------------------+
PKGBUILD | 14 ++++--
flickrnet-3.0.patch | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 125 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-11-29 08:03:13 UTC (rev 143778)
+++ PKGBUILD 2011-11-29 08:13:48 UTC (rev 143779)
@@ -5,7 +5,7 @@
pkgname=f-spot
pkgver=0.8.2
-pkgrel=2
+pkgrel=3
pkgdesc="A personal photo management program for GNOME"
url="http://www.gnome.org/projects/f-spot/"
arch=(i686 x86_64)
@@ -15,9 +15,11 @@
options=('!libtool')
install=$pkgname.install
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
- mono-2.8.patch)
+ mono-2.8.patch
+ flickrnet-3.0.patch)
sha256sums=('24448d3431a95a9faa0aa975554414eb638f918811507177e9d69d11d417873a'
- '4e7d2f1909870b842bbbe087f4381f325d5281d2deae0d32ba5713ee66d52b65')
+ '4e7d2f1909870b842bbbe087f4381f325d5281d2deae0d32ba5713ee66d52b65'
+ 'e8e4470c7cd29c000a9505bcd85cb25641890f66e568edb33d495e8e38fc92a5')
build() {
export MONO_SHARED_DIR="${srcdir}/.wabi"
@@ -25,11 +27,17 @@
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/mono-2.8.patch"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=665063
+ patch -Np1 -i "${srcdir}/flickrnet-3.0.patch"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--disable-static --disable-scrollkeeper --disable-schemas-install --enable-release \
--with-vendor-build-id=ArchLinux
make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR=${pkgdir} install
install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
Added: flickrnet-3.0.patch
===================================================================
--- flickrnet-3.0.patch (rev 0)
+++ flickrnet-3.0.patch 2011-11-29 08:13:48 UTC (rev 143779)
@@ -0,0 +1,114 @@
+diff -Naur f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs
+--- f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs 2010-12-19 14:34:42.000000000 +0100
++++ f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs 2011-11-28 14:23:08.000000000 +0100
+@@ -124,9 +124,9 @@
+ do_export_flickr.Sensitive = true;
+ auth_flickr.Sensitive = true;
+ auth_label.Text = System.String.Format (Catalog.GetString ("Welcome {0} you are connected to {1}"),
+- auth.User.Username,
++ auth.User.UserName,
+ current_service.Name);
+- auth_flickr.Label = String.Format (Catalog.GetString ("Sign in as a different user"), auth.User.Username);
++ auth_flickr.Label = String.Format (Catalog.GetString ("Sign in as a different user"), auth.User.UserName);
+ used_bandwidth.Visible = !fr.Connection.PeopleGetUploadStatus().IsPro &&
+ fr.Connection.PeopleGetUploadStatus().BandwidthMax > 0;
+ if (used_bandwidth.Visible) {
+@@ -326,7 +326,7 @@
+ progress_dialog.ProgressText = String.Format (Catalog.GetString ("Waiting for response {0} of {1}"),
+ photo_index, selection.Count);
+ }
+- progress_dialog.Fraction = (photo_index - 1.0 + (args.Bytes / (double) info.Length)) / (double) selection.Count;
++ progress_dialog.Fraction = (photo_index - 1.0 + (args.BytesSent / (double) info.Length)) / (double) selection.Count;
+ }
+
+ private class DateComparer : IComparer
+@@ -370,7 +370,7 @@
+ App.Instance.Database.Exports.Create ((photo as FSpot.Photo).Id,
+ (photo as FSpot.Photo).DefaultVersionId,
+ ExportStore.FlickrExportType,
+- auth.User.UserId + ":" + auth.User.Username + ":" + current_service.Name + ":" + id);
++ auth.User.UserId + ":" + auth.User.UserName + ":" + current_service.Name + ":" + id);
+
+ } catch (System.Exception e) {
+ progress_dialog.Message = String.Format (Catalog.GetString ("Error Uploading To {0}: {1}"),
+@@ -393,7 +393,7 @@
+ if (open && ids.Count != 0) {
+ string view_url;
+ if (current_service.Name == "Zooomr.com")
+- view_url = string.Format ("http://www.{0}/photos/{1}/", current_service.Name, auth.User.Username);
++ view_url = string.Format ("http://www.{0}/photos/{1}/", current_service.Name, auth.User.UserName);
+ else {
+ view_url = string.Format ("http://www.{0}/tools/uploader_edit.gne?ids", current_service.Name);
+ bool first = true;
+diff -Naur f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs
+--- f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs 2010-12-19 14:34:42.000000000 +0100
++++ f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs 2011-11-28 15:42:01.000000000 +0100
+@@ -22,7 +22,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 +62,30 @@
+ 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.OriginalMessage );
+ return null;
+ }
+ }
+- return licenses.LicenseCollection;
++ return licenses;
+ }
+
+ public ArrayList Search (string[] tags, int licenseId)
+ {
+ ArrayList photos_url = new ArrayList ();
+ // Photos photos = flickr.PhotosSearchText (tags, licenseId);
+- Photos photos = flickr.PhotosSearch (tags);
++ PhotoSearchOptions options = new PhotoSearchOptions ();
++ options.Tags = string.Join(",", 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);
+ }
+ }
+@@ -94,10 +96,12 @@
+ public ArrayList Search (string tags, int licenseId)
+ {
+ ArrayList photos_url = new ArrayList ();
+- Photos photos = flickr.PhotosSearchText (tags, licenseId);
++ PhotoSearchOptions options = new PhotoSearchOptions ();
++ options.Tags = 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);
+ }
+ }
+@@ -126,7 +130,7 @@
+
+ return auth;
+ } catch (FlickrNet.FlickrApiException ex) {
+- Log.Error ("Problems logging in to Flickr - " + ex.Verbose);
++ Log.Error ("Problems logging in to Flickr - " + ex.OriginalMessage);
+ return null;
+ }
+ }
More information about the arch-commits
mailing list