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 =================================================================== --- PKGBUILD 2011-01-01 19:45:23 UTC (rev 104365) +++ PKGBUILD 2011-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 +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