[arch-commits] Commit in kino/repos (3 files)

[Eric Belanger]

    Date: Tuesday, July 8, 2008 @ 21:36:03
  Author: eric
Revision: 4706

Merged revisions 2-4705 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/kino/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r4683 | eduardo | 2008-07-08 17:18:46 -0400 (Tue, 08 Jul 2008) | 1 line
........
  r4686 | daniel | 2008-07-08 17:29:19 -0400 (Tue, 08 Jul 2008) | 1 line
  
  correct the patch
........
  r4687 | eduardo | 2008-07-08 17:46:12 -0400 (Tue, 08 Jul 2008) | 1 line
  
  upgpkg: kino 1.3.0-1
........

Added:
  kino/repos/extra-x86_64/kino-gcc43.patch
    (from rev 4687, kino/trunk/kino-gcc43.patch)
Modified:
  kino/repos/extra-x86_64/	(properties)
  kino/repos/extra-x86_64/PKGBUILD

------------------+
 PKGBUILD         |    9 ++++++---
 kino-gcc43.patch |   10 ++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)


Property changes on: kino/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /kino/trunk:1
   + /kino/trunk:1-4705

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-09 01:31:31 UTC (rev 4705)
+++ extra-x86_64/PKGBUILD	2008-07-09 01:36:03 UTC (rev 4706)
@@ -3,19 +3,22 @@
 # Contributor: Robert Emil Berge <robert at rebi.no>
 
 pkgname=kino
-pkgver=1.2.0
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="A non-linear DV editor."
 url="http://www.kinodv.org/"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=(libglade libdv libsamplerate libxv libiec61883 libavc1394 libsm perlxml)
-source=(http://downloads.sourceforge.net/sourceforge/kino/$pkgname-$pkgver.tar.gz)
-md5sums=('8d7140fce089acce771eade7821d0981')
+source=(http://downloads.sourceforge.net/sourceforge/kino/$pkgname-$pkgver.tar.gz
+	kino-gcc43.patch)
+md5sums=('843af2668846dd03a6985ecaf12a9259'
+         'ee0c377d3d22d1df2ec5aa9c840be7c5')
 options=("!libtool")
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  patch -Np0 < $srcdir/kino-gcc43.patch
   ./configure --prefix=/usr --sysconfdir=/etc
   make || return 1
   make DESTDIR=$startdir/pkg prefix=/usr sysconfdir=/etc install

Copied: kino/repos/extra-x86_64/kino-gcc43.patch (from rev 4687, kino/trunk/kino-gcc43.patch)
===================================================================
--- extra-x86_64/kino-gcc43.patch	                        (rev 0)
+++ extra-x86_64/kino-gcc43.patch	2008-07-09 01:36:03 UTC (rev 4706)
@@ -0,0 +1,10 @@
+--- src/playlist.ccorig	2007-09-13 06:32:25.000000000 +0200
++++ src/playlist.cc	2008-03-28 10:58:21.000000000 +0100
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ // C++ includes
++#include <algorithm> // std::sort
+ #include <iostream>
+ #include <fstream>
+ #include <sstream>