[arch-commits] Commit in f-spot/repos (5 files)

Jan de Groot jgc at archlinux.org
Sun Jun 1 16:04:59 UTC 2008 

    Date: Sunday, June 1, 2008 @ 12:04:58
  Author: jgc
Revision: 2363

Fix conflict, remove old patch

Added:
  f-spot/repos/extra-x86_64/makefile-destdir.patch
    (from rev 2362, f-spot/trunk/makefile-destdir.patch)
  f-spot/repos/extra-x86_64/mono-1.9.1-compilefix.patch
    (from rev 2362, f-spot/trunk/mono-1.9.1-compilefix.patch)
Modified:
  f-spot/repos/extra-x86_64/	(properties)
  f-spot/repos/extra-x86_64/PKGBUILD
Deleted:
  f-spot/repos/extra-x86_64/gnome-sharp-2.20.patch

-----------------------------+
 PKGBUILD                    |   19 ++++++++-----------
 gnome-sharp-2.20.patch      |   37 -------------------------------------
 makefile-destdir.patch      |   20 ++++++++++++++++++++
 mono-1.9.1-compilefix.patch |   20 ++++++++++++++++++++
 4 files changed, 48 insertions(+), 48 deletions(-)


Property changes on: f-spot/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /f-spot/trunk:1
   + /f-spot/trunk:1-2362

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-01 16:03:21 UTC (rev 2362)
+++ extra-x86_64/PKGBUILD	2008-06-01 16:04:58 UTC (rev 2363)
@@ -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')
+	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

Deleted: extra-x86_64/gnome-sharp-2.20.patch
===================================================================
--- extra-x86_64/gnome-sharp-2.20.patch	2008-06-01 16:03:21 UTC (rev 2362)
+++ extra-x86_64/gnome-sharp-2.20.patch	2008-06-01 16:04:58 UTC (rev 2363)
@@ -1,37 +0,0 @@
-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		\

Copied: f-spot/repos/extra-x86_64/makefile-destdir.patch (from rev 2362, f-spot/trunk/makefile-destdir.patch)
===================================================================
--- extra-x86_64/makefile-destdir.patch	                        (rev 0)
+++ extra-x86_64/makefile-destdir.patch	2008-06-01 16:04:58 UTC (rev 2363)
@@ -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.

Copied: f-spot/repos/extra-x86_64/mono-1.9.1-compilefix.patch (from rev 2362, f-spot/trunk/mono-1.9.1-compilefix.patch)
===================================================================
--- extra-x86_64/mono-1.9.1-compilefix.patch	                        (rev 0)
+++ extra-x86_64/mono-1.9.1-compilefix.patch	2008-06-01 16:04:58 UTC (rev 2363)
@@ -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

More information about the arch-commits mailing list