[arch-commits] CVS update of extra (8 files)

Tobias Kieslich tobias at archlinux.org
Wed Apr 2 22:20:58 UTC 2008


    Date: Wednesday, April 2, 2008 @ 18:20:58
  Author: tobias
    Path: /home/cvs-extra/extra

   Added: multimedia/exiv2/exiv2_gcc-4.3.diff (1.1)
Modified: lib/libkexiv2/PKGBUILD (1.4 -> 1.5)
          lib/strigi/PKGBUILD (1.2 -> 1.3)
          multimedia/digikam/PKGBUILD (1.27 -> 1.28)
          multimedia/exiv2/PKGBUILD (1.8 -> 1.9)
          multimedia/gimp-ufraw/PKGBUILD (1.20 -> 1.21)
          multimedia/gwenview/PKGBUILD (1.19 -> 1.20)
          multimedia/kipi-plugins/PKGBUILD (1.22 -> 1.23)

updated eviv2 and hopefully all dependencies


-------------------------------------+
 lib/libkexiv2/PKGBUILD              |    8 +++---
 lib/strigi/PKGBUILD                 |    4 +--
 multimedia/digikam/PKGBUILD         |    6 ++---
 multimedia/exiv2/PKGBUILD           |   12 ++++++----
 multimedia/exiv2/exiv2_gcc-4.3.diff |   39 ++++++++++++++++++++++++++++++++++
 multimedia/gimp-ufraw/PKGBUILD      |    6 ++---
 multimedia/gwenview/PKGBUILD        |    7 +++---
 multimedia/kipi-plugins/PKGBUILD    |   10 ++++----
 8 files changed, 67 insertions(+), 25 deletions(-)


Index: extra/lib/libkexiv2/PKGBUILD
diff -u extra/lib/libkexiv2/PKGBUILD:1.4 extra/lib/libkexiv2/PKGBUILD:1.5
--- extra/lib/libkexiv2/PKGBUILD:1.4	Sat Oct 20 09:37:19 2007
+++ extra/lib/libkexiv2/PKGBUILD	Wed Apr  2 18:20:57 2008
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD,v 1.4 2007/10/20 13:37:19 tpowa Exp $
+# $Id: PKGBUILD,v 1.5 2008/04/02 22:20:57 tobias Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=libkexiv2
 pkgver=0.1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="an exiv2 library wrapper"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://kipi-plugins.sourceforge.net"
-depends=('kdelibs' 'exiv2')
+depends=('kdelibs' 'exiv2>-0.16')
 source=(http://heanet.dl.sourceforge.net/sourceforge/kipi/$pkgname-$pkgver.tar.bz2)
+md5sums=('8a256ac6a3895720a88b29eaf932917c')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -21,4 +22,3 @@
    mkdir -p $startdir/pkg/usr/lib/
    mv $startdir/pkg/opt/kde/lib/pkgconfig $startdir/pkg/usr/lib/
  }
-md5sums=('8a256ac6a3895720a88b29eaf932917c')
Index: extra/lib/strigi/PKGBUILD
diff -u extra/lib/strigi/PKGBUILD:1.2 extra/lib/strigi/PKGBUILD:1.3
--- extra/lib/strigi/PKGBUILD:1.2	Sun Jan  6 13:33:25 2008
+++ extra/lib/strigi/PKGBUILD	Wed Apr  2 18:20:58 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.2 2008/01/06 18:33:25 tpowa Exp $
+# $Id: PKGBUILD,v 1.3 2008/04/02 22:20:58 tobias Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=strigi
 pkgver=0.5.7.svn757222
-pkgrel=1
+pkgrel=2
 pkgdesc="Strigi Desktop Search"
 arch=('i686' 'x86_64')
 url="http://strigi.sourceforge.net"
Index: extra/multimedia/digikam/PKGBUILD
diff -u extra/multimedia/digikam/PKGBUILD:1.27 extra/multimedia/digikam/PKGBUILD:1.28
--- extra/multimedia/digikam/PKGBUILD:1.27	Fri Jan 11 09:28:22 2008
+++ extra/multimedia/digikam/PKGBUILD	Wed Apr  2 18:20:57 2008
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD,v 1.27 2008/01/11 14:28:22 tpowa Exp $
+# $Id: PKGBUILD,v 1.28 2008/04/02 22:20:57 tobias Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=digikam
 pkgver=0.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Digital photo management application for kde"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://digikam.sourceforge.net"
-depends=('sqlite3' 'libkipi' 'libgphoto2' 'exiv2>=0.14' 'lcms' 'dcraw' 'libkexiv2>=0.1.6' 'jasper>=1.900.1' 'lcms' 'libkdcraw>=0.1.2')
+depends=('sqlite3' 'libkipi' 'libgphoto2' 'exiv2>=0.16' 'lcms' 'dcraw' 'libkexiv2>=0.1.6' 'jasper>=1.900.1' 'lcms' 'libkdcraw>=0.1.2')
 makedepends=('pkgconfig')
 source=(http://garr.dl.sourceforge.net/sourceforge/digikam/${pkgname}-${pkgver}.tar.bz2)
 replaces=('digikamimageplugins')
Index: extra/multimedia/exiv2/PKGBUILD
diff -u extra/multimedia/exiv2/PKGBUILD:1.8 extra/multimedia/exiv2/PKGBUILD:1.9
--- extra/multimedia/exiv2/PKGBUILD:1.8	Thu Nov  8 17:02:28 2007
+++ extra/multimedia/exiv2/PKGBUILD	Wed Apr  2 18:20:58 2008
@@ -1,20 +1,22 @@
-#$Id: PKGBUILD,v 1.8 2007/11/08 22:02:28 tobias Exp $
+#$Id: PKGBUILD,v 1.9 2008/04/02 22:20:58 tobias Exp $
 # Maintainer: tobias <tobias at arhlinux.org>
 
 pkgname=exiv2
-pkgver=0.15
+pkgver=0.16
 pkgrel=1
 pkgdesc="Exif and Iptc metadata manipulation library and tools."
 arch=(i686 x86_64)
 url="http://exiv2.org"
-license=('GPL')
+license=('GPL2')
 depends=('gcc-libs' 'zlib')
 options=('!libtool')
-source=(http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz)
-md5sums=('bb18d19e1d6fb255dadda456cadec00e')
+source=(http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz \
+        exiv2_gcc-4.3.diff)
+md5sums=('a6e72343885d990c593bd013c6c988f1' 'b0070a6be9566b76a2b25c07bd3dfc09')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np1 -i ../exiv2_gcc-4.3.diff || return 1
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=${startdir}/pkg install
Index: extra/multimedia/exiv2/exiv2_gcc-4.3.diff
diff -u /dev/null extra/multimedia/exiv2/exiv2_gcc-4.3.diff:1.1
--- /dev/null	Wed Apr  2 18:20:58 2008
+++ extra/multimedia/exiv2/exiv2_gcc-4.3.diff	Wed Apr  2 18:20:58 2008
@@ -0,0 +1,39 @@
+--- a/xmpsdk/src/XMPCore_Impl.hpp
++++ b/xmpsdk/src/XMPCore_Impl.hpp
+@@ -24,6 +24,7 @@
+ #include <map>
+ 
+ #include <cassert>
++#include <cstring>
+ 
+ #if XMP_MacBuild
+ 	#include <Multiprocessing.h>
+@@ -89,7 +90,7 @@
+ #define kHexDigits "0123456789ABCDEF"
+ 
+ #define XMP_LitMatch(s,l)		(std::strcmp((s),(l)) == 0)
+-#define XMP_LitNMatch(s,l,n)	(std::strncmp((s),(l),(n)) == 0)
++#define XMP_LitNMatch(s,l,n)	(strncmp((s),(l),(n)) == 0)
+ 	// *** Use the above macros!
+ 
+ #define kTab ((char)0x09)
+@@ -369,7 +370,7 @@
+ IsPathPrefix ( XMP_StringPtr fullPath, XMP_StringPtr prefix )
+ {
+ 	bool isPrefix = false;
+-	XMP_StringLen prefixLen = std::strlen(prefix);
++	XMP_StringLen prefixLen = strlen(prefix);
+ 	if ( XMP_LitNMatch ( prefix, fullPath, prefixLen ) ) {
+ 		char separator = fullPath[prefixLen];
+ 		if ( (separator == 0) || (separator == '/') ||
+--- a/xmpsdk/src/XMPMeta.cpp
++++ b/xmpsdk/src/XMPMeta.cpp
+@@ -20,6 +20,8 @@
+ #include "UnicodeInlines.incl_cpp"
+ #include "UnicodeConversions.hpp"
+ 
++#include <cstring>
++
+ #if XMP_DebugBuild
+ 	#include <iostream>
+ #endif
Index: extra/multimedia/gimp-ufraw/PKGBUILD
diff -u extra/multimedia/gimp-ufraw/PKGBUILD:1.20 extra/multimedia/gimp-ufraw/PKGBUILD:1.21
--- extra/multimedia/gimp-ufraw/PKGBUILD:1.20	Wed Nov 21 16:54:12 2007
+++ extra/multimedia/gimp-ufraw/PKGBUILD	Wed Apr  2 18:20:58 2008
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD,v 1.20 2007/11/21 21:54:12 tobias Exp $
+# $Id: PKGBUILD,v 1.21 2008/04/02 22:20:58 tobias Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 
 pkgname=gimp-ufraw
 _srcname=ufraw
 pkgver=0.13
-pkgrel=1
+pkgrel=2
 pkgdesc="standalone or gimp plugin converter for raw files"
 url="http://ufraw.sourceforge.net/"
 arch=(i686 x86_64)
 license=(GPL2)
-depends=('lcms' 'gtk2' 'libexif' 'exiv2')
+depends=('lcms' 'gtk2' 'libexif' 'exiv2>=0.16')
 makedepends=('gimp')
 source=(http://dl.sourceforge.net/sourceforge/${_srcname}/${_srcname}-${pkgver}.tar.gz)
 md5sums=('6470f787a8f62f6e1642161e3c8d557b')
Index: extra/multimedia/gwenview/PKGBUILD
diff -u extra/multimedia/gwenview/PKGBUILD:1.19 extra/multimedia/gwenview/PKGBUILD:1.20
--- extra/multimedia/gwenview/PKGBUILD:1.19	Tue Sep 18 19:34:17 2007
+++ extra/multimedia/gwenview/PKGBUILD	Wed Apr  2 18:20:58 2008
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD,v 1.19 2007/09/18 23:34:17 damir Exp $
+# $Id: PKGBUILD,v 1.20 2008/04/02 22:20:58 tobias Exp $
 # Contributor: Aurelien Gateau <aurelien.gateau at free.fr>
 # Maintainer: damir <damir at archlinux.org>
 
 pkgname=gwenview
 pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An image viewer for KDE"
 arch=("i686" "x86_64")
 license=('GPL2')
 url="http://gwenview.sourceforge.net"
 groups=("kde")
-depends=('kdelibs>=3.5.7' 'exiv2>=0.14' 'libkipi' 'libmng')
+depends=('kdelibs>=3.5.7' 'exiv2>=0.16' 'libkipi' 'libmng')
 source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2")
+md5sums=('33c3fc68224d57f5f5cc4d34b48293c6')
 
 build() {
    cd $startdir/src/$pkgname-$pkgver
Index: extra/multimedia/kipi-plugins/PKGBUILD
diff -u extra/multimedia/kipi-plugins/PKGBUILD:1.22 extra/multimedia/kipi-plugins/PKGBUILD:1.23
--- extra/multimedia/kipi-plugins/PKGBUILD:1.22	Tue Jan  8 10:37:30 2008
+++ extra/multimedia/kipi-plugins/PKGBUILD	Wed Apr  2 18:20:58 2008
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.22 2008/01/08 15:37:30 daniel Exp $
+# $Id: PKGBUILD,v 1.23 2008/04/02 22:20:58 tobias Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 # 0.1.3-1 -> 0.1.3-2 : rebuild against exiv2=0.13, libnamechange 0.12 -> 0.13 - damir 
@@ -6,20 +6,20 @@
 
 pkgname=kipi-plugins
 pkgver=0.1.5beta1
-pkgrel=2
+pkgrel=3
 pkgdesc="libkipi plugins for digikam and kde apps"
 arch=("i686" "x86_64")
 license=('GPL')
 url="http://www.kipi-plugins.org"
-depends=('libkexiv2>=0.1.6' 'libkipi' 'libgphoto2' 'exiv2>=0.14' 'libgpod>=0.6.0' 'libkdcraw>=0.1.2')
+depends=('libkexiv2>=0.1.6' 'libkipi' 'libgphoto2' 'exiv2>=0.16' 'libgpod>=0.6.0' 'libkdcraw>=0.1.2')
 makedepends=('kdepim')
 install=('kipi-plugins.install')
-source=("http://puzzle.dl.sourceforge.net/sourceforge/kipi/$pkgname-0.1.5-beta1.tar.bz2")
+source=("http://dl.sourceforge.net/sourceforge/kipi/$pkgname-0.1.5-beta1.tar.bz2")
 
 build() {
   cd $startdir/src/$pkgname-0.1.5-beta1
 
-  source /etc/profile.d/qt.sh
+  source /etc/profile.d/qt3.sh
 
   #make -f admin/Makefile.common
   ./configure --prefix=/opt/kde --disable-debug




More information about the arch-commits mailing list