[arch-commits] CVS update of extra/multimedia/f-spot (3 files)

Jan de Groot jgc at archlinux.org
Mon Mar 24 14:16:55 UTC 2008 

    Date: Monday, March 24, 2008 @ 10:16:55
  Author: jgc
    Path: /home/cvs-extra/extra/multimedia/f-spot

   Added: gnome-sharp-2.20.patch (1.1)
Modified: PKGBUILD (1.21 -> 1.22) f-spot.install (1.6 -> 1.7)

upgpkg: f-spot 0.4.2-1
    Fix build (and run) with gnome 2.22. Segfaults on shutdown but program works so far


------------------------+
 PKGBUILD               |   29 ++++++++++++++++++-----------
 f-spot.install         |   25 +++++++++++--------------
 gnome-sharp-2.20.patch |   37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 25 deletions(-)


Index: extra/multimedia/f-spot/PKGBUILD
diff -u extra/multimedia/f-spot/PKGBUILD:1.21 extra/multimedia/f-spot/PKGBUILD:1.22
--- extra/multimedia/f-spot/PKGBUILD:1.21	Tue Dec 11 15:34:35 2007
+++ extra/multimedia/f-spot/PKGBUILD	Mon Mar 24 10:16:55 2008
@@ -1,33 +1,40 @@
-# $Id: PKGBUILD,v 1.21 2007/12/11 20:34:35 jgc Exp $
+# $Id: PKGBUILD,v 1.22 2008/03/24 14:16:55 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Kritoke <kritoke at nospam.gmail.com>
 
 pkgname=f-spot
-pkgver=0.4.1
+pkgver=0.4.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=('gnome-sharp>=2.16.0' 'ndesk-dbus-glib' 'lcms' 'libexif' 'libgphoto2>=2.4' 'libjpeg' 'sqlite3' 'libgnomeui>=2.20.1.1' 'desktop-file-utils')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0' 'gnome-screensaver>=2.20.0')
-options=('!libtool')
+depends=('gnome-desktop-sharp>=2.20.1' 'ndesk-dbus-glib>=0.4.1' 'lcms' 'libexif' 'libgphoto2>=2.4.0-5' 'libjpeg' 'sqlite3' 'libgnomeui>=2.22.0' 'desktop-file-utils')
+makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.12.2' 'gnome-screensaver>=2.22.0')
+options=('!libtool' '!makeflags')
 install=f-spot.install
-source=(http://ftp.gnome.org/pub/gnome/sources/f-spot/0.4/f-spot-${pkgver}.tar.bz2)
-md5sums=('b3ab702f608ab0cf477de47fb0d675fe')
+source=(http://ftp.gnome.org/pub/gnome/sources/f-spot/0.4/f-spot-${pkgver}.tar.bz2
+	gnome-sharp-2.20.patch)
+md5sums=('970b8c9de9acf97c90e3d9608827606d')
 
 build() {
   export MONO_SHARED_DIR="${startdir}/src/.wabi"
   mkdir -p "${MONO_SHARED_DIR}"
 
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np1 -i ${startdir}/src/gnome-sharp-2.20.patch || return 1
+  libtoolize --force --copy || return 1
+  intltoolize --force --copy || return 1
+  aclocal || return 1
+  autoconf || return 1
+  automake || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
-	      --disable-scrollkeeper
+	      --disable-scrollkeeper || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
 
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/multimedia/f-spot/f-spot.install
diff -u extra/multimedia/f-spot/f-spot.install:1.6 extra/multimedia/f-spot/f-spot.install:1.7
--- extra/multimedia/f-spot/f-spot.install:1.6	Tue Dec 11 15:34:35 2007
+++ extra/multimedia/f-spot/f-spot.install	Mon Mar 24 10:16:55 2008
@@ -1,15 +1,6 @@
 pkgname=f-spot
 
 post_install() {
-  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
   usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
@@ -20,6 +11,17 @@
 }
 
 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
 }
 
@@ -31,8 +33,3 @@
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*
Index: extra/multimedia/f-spot/gnome-sharp-2.20.patch
diff -u /dev/null extra/multimedia/f-spot/gnome-sharp-2.20.patch:1.1
--- /dev/null	Mon Mar 24 10:16:55 2008
+++ extra/multimedia/f-spot/gnome-sharp-2.20.patch	Mon Mar 24 10:16:55 2008
@@ -0,0 +1,37 @@
+diff -ruN f-spot-0.4.2.orig/configure.in f-spot-0.4.2/configure.in
+--- f-spot-0.4.2.orig/configure.in	2008-03-24 13:52:04.000000000 +0000
++++ f-spot-0.4.2/configure.in	2008-03-24 13:57:38.000000000 +0000
+@@ -74,7 +74,7 @@
+ AC_SUBST(F_LIBS)
+ 
+ PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= 2.8)
+-if pkg-config --atleast-version=2.19.90 gnome-sharp; then
++if pkg-config --atleast-version=2.19.90 gnome-sharp-2.0; then
+ 	PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14 >= 2.19.90)
+ 	GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-3.14"
+ else
+diff -ruN f-spot-0.4.2.orig/src/InfoDisplay.cs f-spot-0.4.2/src/InfoDisplay.cs
+--- f-spot-0.4.2.orig/src/InfoDisplay.cs	2008-03-24 13:52:04.000000000 +0000
++++ f-spot-0.4.2/src/InfoDisplay.cs	2008-03-24 13:56:16.000000000 +0000
+@@ -148,7 +148,7 @@
+ 
+ 		private void Update ()
+ 		{
+-			Gtk.HTMLStream stream = this.Begin (null, "text/html; charset=utf-8", Gtk.HTMLBeginFlags.Scroll);
++			Gtk.HTMLStream stream = this.Begin (null, "text/html; charset=utf-8", Gtk.HTMLBeginFlags.KeepScroll);
+ 			
+ 			string bg = Color (this.Style.Background (Gtk.StateType.Active));
+ 			string fg = Color (this.Style.Foreground (Gtk.StateType.Active));
+diff -ruN f-spot-0.4.2.orig/src/Makefile.am f-spot-0.4.2/src/Makefile.am
+--- f-spot-0.4.2.orig/src/Makefile.am	2008-03-24 13:52:04.000000000 +0000
++++ f-spot-0.4.2/src/Makefile.am	2008-03-24 13:55:36.000000000 +0000
+@@ -316,7 +316,8 @@
+ 	$(GCONF_PKG)				\
+ 	$(GTKHTML_SHARP_PKG)			\
+ 	-pkg:glade-sharp-2.0			\
+-	-pkg:gnome-vfs-sharp-2.0
++	-pkg:gnome-vfs-sharp-2.0		\
++	-pkg:gnome-sharp-2.0
+ 
+ F_SPOT_DISTRESOURCES =			\
+ 	$(srcdir)/dces.rdf		\

More information about the arch-commits mailing list