[arch-commits] Commit in f-spot/trunk (PKGBUILD flickrnet-3.0.patch)

2011-11-29 Thread Ionut Biru
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
===
--- PKGBUILD2011-11-29 08:03:13 UTC (rev 143778)
+++ PKGBUILD2011-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.0 +0100
 
f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs
2011-11-28 14:23:08.0 +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,
+-

[arch-commits] Commit in f-spot/trunk (PKGBUILD)

2011-05-31 Thread Ionut Biru
Date: Tuesday, May 31, 2011 @ 05:04:12
  Author: ibiru
Revision: 125874

add libunique to dependency. FS#24517

Modified:
  f-spot/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 22:54:29 UTC (rev 125873)
+++ PKGBUILD2011-05-31 09:04:12 UTC (rev 125874)
@@ -5,13 +5,13 @@
 
 pkgname=f-spot
 pkgver=0.8.2
-pkgrel=1
+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=0.3' 'gnome-sharp=2.8' 'ndesk-dbus-glib=0.3.0' 
'lcms=1.12' 'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 
'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool=0.35.0' 'gnome-doc-utils=0.17.3' 
'gnome-screensaver=2.30.0')
+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



[arch-commits] Commit in f-spot/trunk (PKGBUILD f-spot.install mono-2.8.patch)

2011-01-01 Thread Ionut Biru
Date: Saturday, January 1, 2011 @ 15:04:19
  Author: ibiru
Revision: 104366

upgpkg: f-spot 0.8.2-1
update to 0.8.2

Added:
  f-spot/trunk/mono-2.8.patch
Modified:
  f-spot/trunk/PKGBUILD
  f-spot/trunk/f-spot.install

+
 PKGBUILD   |   30 ++
 f-spot.install |   19 ---
 mono-2.8.patch |   22 ++
 3 files changed, 44 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-01 19:45:23 UTC (rev 104365)
+++ PKGBUILD2011-01-01 20:04:19 UTC (rev 104366)
@@ -1,33 +1,39 @@
 # $Id$
 # Maintainer: Jan de Groot j...@archlinux.org
 # Contributor: Kritoke krit...@nospam.gmail.com
+# Contributor: György Balló ball...@freestart.hu
 
 pkgname=f-spot
-pkgver=0.6.2
+pkgver=0.8.2
 pkgrel=1
 pkgdesc=A personal photo management program for GNOME
 url=http://www.gnome.org/projects/f-spot/;
 arch=(i686 x86_64)
 license=('GPL')
-depends=('mono=2.6.4' 'gnome-sharp=2.24.1' 'lcms=1.18-3' 
'libgphoto2=2.4.9' 'ndesk-dbus-glib=0.4.1' 'hicolor-icon-theme' 
'mono-addins=0.4')
-makedepends=('intltool' 'gnome-doc-utils=0.20.0' 'gnome-screensaver=2.30.0')
-options=('!libtool' '!makeflags' '!emptydirs')
-install=f-spot.install
-source=(http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-${pkgver}.tar.bz2)
-sha256sums=('f7d836c114af9d7f50903cd79710f079b025f1f8b8495d9117b150d6e746c67e')
+depends=('mono-addins=0.3' 'gnome-sharp=2.8' 'ndesk-dbus-glib=0.3.0' 
'lcms=1.12' 'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 
'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('intltool=0.35.0' 'gnome-doc-utils=0.17.3' 
'gnome-screensaver=2.30.0')
+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}
-  ./configure --prefix=/usr --sysconfdir=/etc \
-  --localstatedir=/var --disable-static \
-  --disable-scrollkeeper || return 1
-  make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install || 
return 1
+  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
 }
+

Modified: f-spot.install
===
--- f-spot.install  2011-01-01 19:45:23 UTC (rev 104365)
+++ f-spot.install  2011-01-01 20:04:19 UTC (rev 104366)
@@ -1,9 +1,9 @@
 pkgname=f-spot
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  gconfpkg --install $pkgname
   update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  xdg-icon-resource forceupdate
 }
 
 pre_upgrade() {
@@ -11,25 +11,14 @@
 }
 
 post_upgrade() {
-  if [ `vercmp $2 0.2.0` -lt 0 ]; then
-  cat  EOM
-  == as of version 0.2.0 f-spot depends on sqlite3 instead of sqlite2, but
-  == you might want to keep sqlite2 installed to have f-spot convert your 
data.
-  == Please make an backup of your meta-data in ~/.gnome2/f-spot/photos.db
-  == and try to convert it manually if you encounter problems:
-  # cd ~/.gnome2/f-spot   
-  # mv photos.db photos.old.db
-  # sqlite photos.old.db .dump | sqlite3 photos.db
-EOM
-  fi
   post_install $1
 }
 
 pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  gconfpkg --uninstall $pkgname
 }
 
 post_remove() {
   update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  xdg-icon-resource forceupdate
 }

Added: mono-2.8.patch
===
--- mono-2.8.patch  (rev 0)
+++ mono-2.8.patch  2011-01-01 20:04:19 UTC (rev 104366)
@@ -0,0 +1,22 @@
+From 9d6e8052b188c2b1cb310ef05842da74a730a39f Mon Sep 17 00:00:00 2001
+From: Marek Habersack gren...@twistedcode.net
+Date: Wed, 15 Sep 2010 21:21:52 +
+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 

[arch-commits] Commit in f-spot/trunk (PKGBUILD)

2010-05-26 Thread Jan de Groot
Date: Wednesday, May 26, 2010 @ 06:55:37
  Author: jgc
Revision: 81066

upgpkg: f-spot 0.6.2-1
Update to 0.6.2: remove libbeagle dependency, add mono-addins dependency

Modified:
  f-spot/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-26 10:19:34 UTC (rev 81065)
+++ PKGBUILD2010-05-26 10:55:37 UTC (rev 81066)
@@ -3,18 +3,18 @@
 # Contributor: Kritoke krit...@nospam.gmail.com
 
 pkgname=f-spot
-pkgver=0.6.1.5
-pkgrel=2
+pkgver=0.6.2
+pkgrel=1
 pkgdesc=A personal photo management program for GNOME
 url=http://www.gnome.org/projects/f-spot/;
 arch=(i686 x86_64)
 license=('GPL')
-depends=('mono=2.6.1' 'gnome-sharp=2.24.1' 'lcms=1.18-3' 
'libgphoto2=2.4.7-2' 'ndesk-dbus-glib=0.4.1' 'libbeagle=0.3.9' 
'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils=0.18.0' 'gnome-screensaver=2.28.0')
-options=('!libtool' '!makeflags')
+depends=('mono=2.6.4' 'gnome-sharp=2.24.1' 'lcms=1.18-3' 
'libgphoto2=2.4.9' 'ndesk-dbus-glib=0.4.1' 'hicolor-icon-theme' 
'mono-addins=0.4')
+makedepends=('intltool' 'gnome-doc-utils=0.20.0' 'gnome-screensaver=2.30.0')
+options=('!libtool' '!makeflags' '!emptydirs')
 install=f-spot.install
 
source=(http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-${pkgver}.tar.bz2)
-sha256sums=('cb538e90b5e8c6e6b24af784c084afa2c1712c7606c6e64d4731d6145596ba46')
+sha256sums=('f7d836c114af9d7f50903cd79710f079b025f1f8b8495d9117b150d6e746c67e')
 
 build() {
   export MONO_SHARED_DIR=${srcdir}/.wabi



[arch-commits] Commit in f-spot/trunk (PKGBUILD)

2009-11-05 Thread Jan de Groot
Date: Thursday, November 5, 2009 @ 14:17:05
  Author: jgc
Revision: 58178

upgpkg: f-spot 0.6.1.5-1
Update to 0.6.1.5

Modified:
  f-spot/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-05 19:10:41 UTC (rev 58177)
+++ PKGBUILD2009-11-05 19:17:05 UTC (rev 58178)
@@ -3,7 +3,7 @@
 # Contributor: Kritoke krit...@nospam.gmail.com
 
 pkgname=f-spot
-pkgver=0.6.1.4
+pkgver=0.6.1.5
 pkgrel=1
 pkgdesc=A personal photo management program for GNOME
 url=http://www.gnome.org/projects/f-spot/;
@@ -14,7 +14,7 @@
 options=('!libtool' '!makeflags')
 install=f-spot.install
 
source=(http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-${pkgver}.tar.bz2)
-sha256sums=('7e2b5738dbff1e9887298c98aab84e4967c0092913b77ea3194d4e33a7577191')
+sha256sums=('cb538e90b5e8c6e6b24af784c084afa2c1712c7606c6e64d4731d6145596ba46')
 
 build() {
   export MONO_SHARED_DIR=${srcdir}/.wabi