Date: Tuesday, November 29, 2011 @ 03:49:53
Author: ibiru
Revision: 143780
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
f-spot/repos/extra-i686/PKGBUILD
(from rev 143779, f-spot/trunk/PKGBUILD)
f-spot/repos/extra-i686/f-spot.install
(from rev 143779, f-spot/trunk/f-spot.install)
f-spot/repos/extra-i686/flickrnet-3.0.patch
(from rev 143779, f-spot/trunk/flickrnet-3.0.patch)
f-spot/repos/extra-i686/mono-2.8.patch
(from rev 143779, f-spot/trunk/mono-2.8.patch)
f-spot/repos/extra-x86_64/PKGBUILD
(from rev 143779, f-spot/trunk/PKGBUILD)
f-spot/repos/extra-x86_64/f-spot.install
(from rev 143779, f-spot/trunk/f-spot.install)
f-spot/repos/extra-x86_64/flickrnet-3.0.patch
(from rev 143779, f-spot/trunk/flickrnet-3.0.patch)
f-spot/repos/extra-x86_64/mono-2.8.patch
(from rev 143779, f-spot/trunk/mono-2.8.patch)
Deleted:
f-spot/repos/extra-i686/PKGBUILD
f-spot/repos/extra-i686/f-spot.install
f-spot/repos/extra-i686/mono-2.8.patch
f-spot/repos/extra-x86_64/PKGBUILD
f-spot/repos/extra-x86_64/f-spot.install
f-spot/repos/extra-x86_64/mono-2.8.patch
----------------------------------+
extra-i686/PKGBUILD | 86 +++++++++++++++------------
extra-i686/f-spot.install | 48 +++++++--------
extra-i686/flickrnet-3.0.patch | 114 +++++++++++++++++++++++++++++++++++++
extra-i686/mono-2.8.patch | 44 +++++++-------
extra-x86_64/PKGBUILD | 86 +++++++++++++++------------
extra-x86_64/f-spot.install | 48 +++++++--------
extra-x86_64/flickrnet-3.0.patch | 114 +++++++++++++++++++++++++++++++++++++
extra-x86_64/mono-2.8.patch | 44 +++++++-------
8 files changed, 414 insertions(+), 170 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-11-29 08:13:48 UTC (rev 143779)
+++ extra-i686/PKGBUILD 2011-11-29 08:49:53 UTC (rev 143780)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <[email protected]>
-# Contributor: Kritoke <[email protected]>
-# Contributor: György Balló <[email protected]>
-
-pkgname=f-spot
-pkgver=0.8.2
-pkgrel=2
-pkgdesc="A personal photo management program for GNOME"
-url="http://www.gnome.org/projects/f-spot/";
-arch=(i686 x86_64)
-license=('GPL')
-depends=('mono-addins' 'gnome-sharp' 'ndesk-dbus-glib' 'lcms'
'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 'desktop-file-utils'
'hicolor-icon-theme' 'xdg-utils' 'libunique')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-screensaver')
-options=('!libtool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
- mono-2.8.patch)
-sha256sums=('24448d3431a95a9faa0aa975554414eb638f918811507177e9d69d11d417873a'
- '4e7d2f1909870b842bbbe087f4381f325d5281d2deae0d32ba5713ee66d52b65')
-
-build() {
- export MONO_SHARED_DIR="${srcdir}/.wabi"
- mkdir -p "${MONO_SHARED_DIR}"
-
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/mono-2.8.patch"
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-static --disable-scrollkeeper
--disable-schemas-install --enable-release \
- --with-vendor-build-id=ArchLinux
- make
- make DESTDIR=${pkgdir} install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas"
--domain f-spot ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
-
Copied: f-spot/repos/extra-i686/PKGBUILD (from rev 143779,
f-spot/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-29 08:49:53 UTC (rev 143780)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan de Groot <[email protected]>
+# Contributor: Kritoke <[email protected]>
+# Contributor: György Balló <[email protected]>
+
+pkgname=f-spot
+pkgver=0.8.2
+pkgrel=3
+pkgdesc="A personal photo management program for GNOME"
+url="http://www.gnome.org/projects/f-spot/";
+arch=(i686 x86_64)
+license=('GPL')
+depends=('mono-addins' 'gnome-sharp' 'ndesk-dbus-glib' 'lcms'
'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 'desktop-file-utils'
'hicolor-icon-theme' 'xdg-utils' 'libunique')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-screensaver')
+options=('!libtool')
+install=$pkgname.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+ mono-2.8.patch
+ flickrnet-3.0.patch)
+sha256sums=('24448d3431a95a9faa0aa975554414eb638f918811507177e9d69d11d417873a'
+ '4e7d2f1909870b842bbbe087f4381f325d5281d2deae0d32ba5713ee66d52b65'
+ 'e8e4470c7cd29c000a9505bcd85cb25641890f66e568edb33d495e8e38fc92a5')
+
+build() {
+ export MONO_SHARED_DIR="${srcdir}/.wabi"
+ mkdir -p "${MONO_SHARED_DIR}"
+
+ 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"
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas"
--domain f-spot ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+ rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
+
Deleted: extra-i686/f-spot.install
===================================================================
--- extra-i686/f-spot.install 2011-11-29 08:13:48 UTC (rev 143779)
+++ extra-i686/f-spot.install 2011-11-29 08:49:53 UTC (rev 143780)
@@ -1,24 +0,0 @@
-pkgname=f-spot
-
-post_install() {
- gconfpkg --install $pkgname
- update-desktop-database -q
- xdg-icon-resource forceupdate
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
- update-desktop-database -q
- xdg-icon-resource forceupdate
-}
Copied: f-spot/repos/extra-i686/f-spot.install (from rev 143779,
f-spot/trunk/f-spot.install)
===================================================================
--- extra-i686/f-spot.install (rev 0)
+++ extra-i686/f-spot.install 2011-11-29 08:49:53 UTC (rev 143780)
@@ -0,0 +1,24 @@
+pkgname=f-spot
+
+post_install() {
+ gconfpkg --install $pkgname
+ update-desktop-database -q
+ xdg-icon-resource forceupdate
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ gconfpkg --uninstall $pkgname
+}
+
+post_remove() {
+ update-desktop-database -q
+ xdg-icon-resource forceupdate
+}
Copied: f-spot/repos/extra-i686/flickrnet-3.0.patch (from rev 143779,
f-spot/trunk/flickrnet-3.0.patch)
===================================================================
--- extra-i686/flickrnet-3.0.patch (rev 0)
+++ extra-i686/flickrnet-3.0.patch 2011-11-29 08:49:53 UTC (rev 143780)
@@ -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;
+ }
+ }
Deleted: extra-i686/mono-2.8.patch
===================================================================
--- extra-i686/mono-2.8.patch 2011-11-29 08:13:48 UTC (rev 143779)
+++ extra-i686/mono-2.8.patch 2011-11-29 08:49:53 UTC (rev 143780)
@@ -1,22 +0,0 @@
-From 9d6e8052b188c2b1cb310ef05842da74a730a39f Mon Sep 17 00:00:00 2001
-From: Marek Habersack <[email protected]>
-Date: Wed, 15 Sep 2010 21:21:52 +0000
-Subject: PixbufLoader from gtk-sharp/master does not have a Close () overload
which takes a boolean parameter
-
-https://bugzilla.gnome.org/show_bug.cgi?id=629224
----
-diff --git a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
-index 2eea50e..9c9c07a 100644
---- a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
-+++ b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
-@@ -132,7 +132,7 @@ namespace FSpot.Loaders {
- public new bool Close ()
- {
- lock (sync_handle) {
-- return base.Close (true);
-+ return base.Close ();
- }
- }
- #endregion
---
-cgit v0.8.3.1
Copied: f-spot/repos/extra-i686/mono-2.8.patch (from rev 143779,
f-spot/trunk/mono-2.8.patch)
===================================================================
--- extra-i686/mono-2.8.patch (rev 0)
+++ extra-i686/mono-2.8.patch 2011-11-29 08:49:53 UTC (rev 143780)
@@ -0,0 +1,22 @@
+From 9d6e8052b188c2b1cb310ef05842da74a730a39f Mon Sep 17 00:00:00 2001
+From: Marek Habersack <[email protected]>
+Date: Wed, 15 Sep 2010 21:21:52 +0000
+Subject: PixbufLoader from gtk-sharp/master does not have a Close () overload
which takes a boolean parameter
+
+https://bugzilla.gnome.org/show_bug.cgi?id=629224
+---
+diff --git a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
+index 2eea50e..9c9c07a 100644
+--- a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
++++ b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
+@@ -132,7 +132,7 @@ namespace FSpot.Loaders {
+ public new bool Close ()
+ {
+ lock (sync_handle) {
+- return base.Close (true);
++ return base.Close ();
+ }
+ }
+ #endregion
+--
+cgit v0.8.3.1
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-11-29 08:13:48 UTC (rev 143779)
+++ extra-x86_64/PKGBUILD 2011-11-29 08:49:53 UTC (rev 143780)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <[email protected]>
-# Contributor: Kritoke <[email protected]>
-# Contributor: György Balló <[email protected]>
-
-pkgname=f-spot
-pkgver=0.8.2
-pkgrel=2
-pkgdesc="A personal photo management program for GNOME"
-url="http://www.gnome.org/projects/f-spot/";
-arch=(i686 x86_64)
-license=('GPL')
-depends=('mono-addins' 'gnome-sharp' 'ndesk-dbus-glib' 'lcms'
'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 'desktop-file-utils'
'hicolor-icon-theme' 'xdg-utils' 'libunique')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-screensaver')
-options=('!libtool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
- mono-2.8.patch)
-sha256sums=('24448d3431a95a9faa0aa975554414eb638f918811507177e9d69d11d417873a'
- '4e7d2f1909870b842bbbe087f4381f325d5281d2deae0d32ba5713ee66d52b65')
-
-build() {
- export MONO_SHARED_DIR="${srcdir}/.wabi"
- mkdir -p "${MONO_SHARED_DIR}"
-
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/mono-2.8.patch"
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-static --disable-scrollkeeper
--disable-schemas-install --enable-release \
- --with-vendor-build-id=ArchLinux
- make
- make DESTDIR=${pkgdir} install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas"
--domain f-spot ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
-
Copied: f-spot/repos/extra-x86_64/PKGBUILD (from rev 143779,
f-spot/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-11-29 08:49:53 UTC (rev 143780)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan de Groot <[email protected]>
+# Contributor: Kritoke <[email protected]>
+# Contributor: György Balló <[email protected]>
+
+pkgname=f-spot
+pkgver=0.8.2
+pkgrel=3
+pkgdesc="A personal photo management program for GNOME"
+url="http://www.gnome.org/projects/f-spot/";
+arch=(i686 x86_64)
+license=('GPL')
+depends=('mono-addins' 'gnome-sharp' 'ndesk-dbus-glib' 'lcms'
'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 'desktop-file-utils'
'hicolor-icon-theme' 'xdg-utils' 'libunique')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-screensaver')
+options=('!libtool')
+install=$pkgname.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+ mono-2.8.patch
+ flickrnet-3.0.patch)
+sha256sums=('24448d3431a95a9faa0aa975554414eb638f918811507177e9d69d11d417873a'
+ '4e7d2f1909870b842bbbe087f4381f325d5281d2deae0d32ba5713ee66d52b65'
+ 'e8e4470c7cd29c000a9505bcd85cb25641890f66e568edb33d495e8e38fc92a5')
+
+build() {
+ export MONO_SHARED_DIR="${srcdir}/.wabi"
+ mkdir -p "${MONO_SHARED_DIR}"
+
+ 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"
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas"
--domain f-spot ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+ rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
+
Deleted: extra-x86_64/f-spot.install
===================================================================
--- extra-x86_64/f-spot.install 2011-11-29 08:13:48 UTC (rev 143779)
+++ extra-x86_64/f-spot.install 2011-11-29 08:49:53 UTC (rev 143780)
@@ -1,24 +0,0 @@
-pkgname=f-spot
-
-post_install() {
- gconfpkg --install $pkgname
- update-desktop-database -q
- xdg-icon-resource forceupdate
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
- update-desktop-database -q
- xdg-icon-resource forceupdate
-}
Copied: f-spot/repos/extra-x86_64/f-spot.install (from rev 143779,
f-spot/trunk/f-spot.install)
===================================================================
--- extra-x86_64/f-spot.install (rev 0)
+++ extra-x86_64/f-spot.install 2011-11-29 08:49:53 UTC (rev 143780)
@@ -0,0 +1,24 @@
+pkgname=f-spot
+
+post_install() {
+ gconfpkg --install $pkgname
+ update-desktop-database -q
+ xdg-icon-resource forceupdate
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ gconfpkg --uninstall $pkgname
+}
+
+post_remove() {
+ update-desktop-database -q
+ xdg-icon-resource forceupdate
+}
Copied: f-spot/repos/extra-x86_64/flickrnet-3.0.patch (from rev 143779,
f-spot/trunk/flickrnet-3.0.patch)
===================================================================
--- extra-x86_64/flickrnet-3.0.patch (rev 0)
+++ extra-x86_64/flickrnet-3.0.patch 2011-11-29 08:49:53 UTC (rev 143780)
@@ -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;
+ }
+ }
Deleted: extra-x86_64/mono-2.8.patch
===================================================================
--- extra-x86_64/mono-2.8.patch 2011-11-29 08:13:48 UTC (rev 143779)
+++ extra-x86_64/mono-2.8.patch 2011-11-29 08:49:53 UTC (rev 143780)
@@ -1,22 +0,0 @@
-From 9d6e8052b188c2b1cb310ef05842da74a730a39f Mon Sep 17 00:00:00 2001
-From: Marek Habersack <[email protected]>
-Date: Wed, 15 Sep 2010 21:21:52 +0000
-Subject: PixbufLoader from gtk-sharp/master does not have a Close () overload
which takes a boolean parameter
-
-https://bugzilla.gnome.org/show_bug.cgi?id=629224
----
-diff --git a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
-index 2eea50e..9c9c07a 100644
---- a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
-+++ b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
-@@ -132,7 +132,7 @@ namespace FSpot.Loaders {
- public new bool Close ()
- {
- lock (sync_handle) {
-- return base.Close (true);
-+ return base.Close ();
- }
- }
- #endregion
---
-cgit v0.8.3.1
Copied: f-spot/repos/extra-x86_64/mono-2.8.patch (from rev 143779,
f-spot/trunk/mono-2.8.patch)
===================================================================
--- extra-x86_64/mono-2.8.patch (rev 0)
+++ extra-x86_64/mono-2.8.patch 2011-11-29 08:49:53 UTC (rev 143780)
@@ -0,0 +1,22 @@
+From 9d6e8052b188c2b1cb310ef05842da74a730a39f Mon Sep 17 00:00:00 2001
+From: Marek Habersack <[email protected]>
+Date: Wed, 15 Sep 2010 21:21:52 +0000
+Subject: PixbufLoader from gtk-sharp/master does not have a Close () overload
which takes a boolean parameter
+
+https://bugzilla.gnome.org/show_bug.cgi?id=629224
+---
+diff --git a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
+index 2eea50e..9c9c07a 100644
+--- a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
++++ b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
+@@ -132,7 +132,7 @@ namespace FSpot.Loaders {
+ public new bool Close ()
+ {
+ lock (sync_handle) {
+- return base.Close (true);
++ return base.Close ();
+ }
+ }
+ #endregion
+--
+cgit v0.8.3.1
