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

[Eric Bélanger]

    Date: Saturday, October 3, 2009 @ 15:33:01
  Author: eric
Revision: 53891

upgpkg: lensfun 0.2.3-2.1
    Added missing docs (close FS#14580), Added build patches, added python and libpng makedepends

Added:
  lensfun/trunk/lensfun-0.2.3-as-needed.patch
  lensfun/trunk/lensfun-0.2.3-glibc-2.10.patch
Modified:
  lensfun/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   17 ++++++++++++-----
 lensfun-0.2.3-as-needed.patch  |   13 +++++++++++++
 lensfun-0.2.3-glibc-2.10.patch |   11 +++++++++++
 3 files changed, 36 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-03 19:05:41 UTC (rev 53890)
+++ PKGBUILD	2009-10-03 19:33:01 UTC (rev 53891)
@@ -3,18 +3,25 @@
 
 pkgname=lensfun
 pkgver=0.2.3
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
 arch=(i686 x86_64)
+url="http://lensfun.berlios.de/"
 license=('LGPL3')
-source=(http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-url="http://lensfun.berlios.de/"
 depends=('glibc' 'glib2')
+makedepends=('python' 'libpng')
+source=(http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
+        lensfun-0.2.3-glibc-2.10.patch lensfun-0.2.3-as-needed.patch)
+md5sums=('c5c04be4f53e3eef450ff4948d8f65b3' '593c956bb50d8009f66ff9496fa67fdf'\
+         '99f34d25b54aab60ba7346008749abd6')
+sha1sums=('4cb8fb4ce9c439ec7a3447d7fd35dfd5b73253ce' 'f0804a6445376f55d91d565d2a546b14b0990bf7'\
+         'c16ddb0f39253462b8fa0882461ed7bd85d1c5fc')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
+    patch -p1 < ../lensfun-0.2.3-glibc-2.10.patch || return 1
+    patch -p1 < ../lensfun-0.2.3-as-needed.patch || return 1
     ./configure --prefix=/usr --libdir=/usr/lib || return 1
     make all || return 1
-    make INSTALL_PREFIX=$pkgdir install || return 1
+    make INSTALL_PREFIX="$pkgdir" install || return 1
 }
-md5sums=('c5c04be4f53e3eef450ff4948d8f65b3')

Added: lensfun-0.2.3-as-needed.patch
===================================================================
--- lensfun-0.2.3-as-needed.patch	                        (rev 0)
+++ lensfun-0.2.3-as-needed.patch	2009-10-03 19:33:01 UTC (rev 53891)
@@ -0,0 +1,13 @@
+diff -ru lensfun-0.2.3.orig/build/mak/compiler/gcc.mak lensfun-0.2.3/build/mak/compiler/gcc.mak
+--- lensfun-0.2.3.orig/build/mak/compiler/gcc.mak	2009-03-15 02:42:40.000000000 +0100
++++ lensfun-0.2.3/build/mak/compiler/gcc.mak	2009-03-15 02:43:37.000000000 +0100
+@@ -71,7 +71,7 @@
+ endef
+ 
+ LINK.GCC.AR = $(GCC.AR) $(GCC.ARFLAGS) $@ $^
+-LINK.GCC.EXEC = $(GCC.LD) -o $@ $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2
++LINK.GCC.EXEC = $(GCC.LD) $(LDFLAGS) $^ $2 $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $(GCC.LDFLAGS) $1 -o $@
+ define LINK.GCC.SO
+ 	$(GCC.LD) -o $@.$(SHARED.$3) -Wl,"-soname=$(notdir $@).$(basename $(basename $(SHARED.$3)))" $(GCC.LDFLAGS.SHARED) $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2
+ 	ln -fs $(notdir $@.$(SHARED.$3)) $@.$(basename $(basename $(SHARED.$3)))
+Only in lensfun-0.2.3/out/posix/release: deps

Added: lensfun-0.2.3-glibc-2.10.patch
===================================================================
--- lensfun-0.2.3-glibc-2.10.patch	                        (rev 0)
+++ lensfun-0.2.3-glibc-2.10.patch	2009-10-03 19:33:01 UTC (rev 53891)
@@ -0,0 +1,11 @@
+--- lensfun-0.2.3.orig/tools/makedep/cppsetup.cpp	2009-07-04 21:20:49.000000000 +0200
++++ lensfun-0.2.3/tools/makedep/cppsetup.cpp	2009-07-04 22:19:18.000000000 +0200
+@@ -195,7 +195,7 @@
+     }
+     while (s);
+ 
+-    eol = strchr (var, 0);
++    eol = (char *)strchr (var, 0);
+ 
+     // Skip parentheses which Microsoft likes so much
+     if (*var == '(')