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

[Jan de Groot]

    Date: Sunday, June 1, 2008 @ 12:03:21
  Author: jgc
Revision: 2362

upgpkg: f-spot 0.4.4-1
    Add patch to compile with mono 1.9.1, bug in mono 1.9.1 I guess
Add patch to fix DESTDIR in makefile.in

Added:
  f-spot/trunk/makefile-destdir.patch
  f-spot/trunk/mono-1.9.1-compilefix.patch
Modified:
  f-spot/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   19 ++++++++-----------
 makefile-destdir.patch      |   20 ++++++++++++++++++++
 mono-1.9.1-compilefix.patch |   20 ++++++++++++++++++++
 3 files changed, 48 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-06-01 15:36:04 UTC (rev 2361)
+++ PKGBUILD	2008-06-01 16:03:21 UTC (rev 2362)
@@ -3,31 +3,28 @@
 # Contributor: Kritoke <kritoke at nospam.gmail.com>
 
 pkgname=f-spot
-pkgver=0.4.2
+pkgver=0.4.4
 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-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')
+depends=('gnome-desktop-sharp>=2.20.1' 'ndesk-dbus-glib>=0.4.1' 'lcms' 'libexif' 'libgphoto2>=2.4.0-6' 'libjpeg' 'sqlite3' 'libgnomeui>=2.22.1' 'desktop-file-utils')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.2' 'gnome-screensaver>=2.22.2')
 options=('!libtool' '!makeflags')
 install=f-spot.install
 source=(http://ftp.gnome.org/pub/gnome/sources/f-spot/0.4/f-spot-${pkgver}.tar.bz2
-	gnome-sharp-2.20.patch)
-md5sums=('970b8c9de9acf97c90e3d9608827606d' 'c94c74e1cbccbc8b41a5132668b9abe7')
+	mono-1.9.1-compilefix.patch
+	makefile-destdir.patch)
+md5sums=('54cab07d300c0bef9049b0aeea196d1b')
 
 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
+  patch -Np0 -i ${startdir}/src/mono-1.9.1-compilefix.patch || return 1
+  patch -Np0 -i ${startdir}/src/makefile-destdir.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --disable-scrollkeeper || return 1

Added: makefile-destdir.patch
===================================================================
--- makefile-destdir.patch	                        (rev 0)
+++ makefile-destdir.patch	2008-06-01 16:03:21 UTC (rev 2362)
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2008-06-01 15:48:02.000000000 +0000
++++ Makefile.in	2008-06-01 15:48:50.000000000 +0000
+@@ -892,14 +892,14 @@
+ install-data-hook: 
+ 	$(UPDATE_DESKTOP)
+ 	if [ "x$(DIR_GIO)" != "x" ] ; then \
+-		$(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(libdir)/f-spot/; \
+-		$(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(libdir)/f-spot/; \
++		$(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/; \
++		$(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(DESTDIR)$(libdir)/f-spot/; \
+ 	fi
+ 
+ uninstall-hook: 
+ 	$(UPDATE_DESKTOP)
+ 	if [ "x$(DIR_GIO)" != "x" ] ; then \
+-		rm -f $(libdir)/f-spot/gio-sharp.dll $(libdir)/f-spot/gio-sharp.dll.config; \
++		rm -f $(DESTDIR)$(libdir)/f-spot/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/gio-sharp.dll.config; \
+ 	fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

Added: mono-1.9.1-compilefix.patch
===================================================================
--- mono-1.9.1-compilefix.patch	                        (rev 0)
+++ mono-1.9.1-compilefix.patch	2008-06-01 16:03:21 UTC (rev 2362)
@@ -0,0 +1,20 @@
+--- extensions/SmugMugExport/Makefile.in.orig	2008-06-01 15:30:29.000000000 +0000
++++ extensions/SmugMugExport/Makefile.in	2008-06-01 15:30:53.000000000 +0000
+@@ -314,7 +314,7 @@
+ 	-r:$(DIR_TAO_EXTENSIONLOADER)/Tao.OpenGl.ExtensionLoader.dll
+ 
+ CSC_FLAGS = -debug
+-CSC_LIB = gmcs $(CSC_FLAGS) -target:library
++CSC_LIB = gmcs -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+ PLUGIN_NAME = SmugMugExport
+@@ -702,7 +702,7 @@
+ 
+ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
+ 	$(MAKE) -C $(SUBDIRS)
+-	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
++	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES) -g
+ 
+ install-data-hook:
+ 	rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml