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

[Eric Bélanger]

    Date: Thursday, March 26, 2009 @ 01:01:13
  Author: eric
Revision: 31368

Fixed svn conflict

Added:
  3ddesktop/repos/extra-i686/3ddesktop-0.2.9-missing-include.patch
    (from rev 31360, 3ddesktop/trunk/3ddesktop-0.2.9-missing-include.patch)
Modified:
  3ddesktop/repos/extra-i686/	(properties)
  3ddesktop/repos/extra-i686/PKGBUILD

---------------------------------------+
 3ddesktop-0.2.9-missing-include.patch |   11 +++++++++++
 PKGBUILD                              |   18 +++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)


Property changes on: 3ddesktop/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /3ddesktop/trunk:1
   + /3ddesktop/trunk:1-31367

Copied: 3ddesktop/repos/extra-i686/3ddesktop-0.2.9-missing-include.patch (from rev 31360, 3ddesktop/trunk/3ddesktop-0.2.9-missing-include.patch)
===================================================================
--- extra-i686/3ddesktop-0.2.9-missing-include.patch	                        (rev 0)
+++ extra-i686/3ddesktop-0.2.9-missing-include.patch	2009-03-26 05:01:13 UTC (rev 31368)
@@ -0,0 +1,11 @@
+diff -u -r a/config.hpp b/config.hpp
+--- a/config.hpp	2005-06-20 13:28:29.000000000 +0200
++++ b/config.hpp	2008-12-17 19:40:05.000000000 +0100
+@@ -24,6 +24,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ 
+ #include <errno.h>
+ #include <unistd.h>

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-26 04:48:06 UTC (rev 31367)
+++ extra-i686/PKGBUILD	2009-03-26 05:01:13 UTC (rev 31368)
@@ -4,18 +4,22 @@
 
 pkgname=3ddesktop
 pkgver=0.2.9
-pkgrel=2
+pkgrel=3
 pkgdesc="a 3d virtual desktop switcher (opengl/mesa)"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://desk3d.sourceforge.net"
+license=('GPL')
 depends=('freetype2' 'libxi' 'libxmu' 'imlib2' 'glut')
-source=(http://easynews.dl.sourceforge.net/sourceforge/desk3d/$pkgname-$pkgver.tar.gz 3ddesktop-0.2.9-gcc4.patch)
-md5sums=('da1e8b0d2c210a441676bbf663e694ee' '9aac53edbd737f827651470da4e5a7b2')
+backup=('etc/3ddesktop/3ddesktop.conf')
+source=(http://downloads.sourceforge.net/sourceforge/desk3d/$pkgname-$pkgver.tar.gz 3ddesktop-0.2.9-gcc4.patch 3ddesktop-0.2.9-missing-include.patch)
+md5sums=('da1e8b0d2c210a441676bbf663e694ee' '9aac53edbd737f827651470da4e5a7b2'\
+         'ae911ed543329f63fe50cfbb9021deeb')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   patch -Np1 -i ../3ddesktop-0.2.9-gcc4.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc/3ddesktop
+  patch -Np1 -i ../3ddesktop-0.2.9-missing-include.patch || return 1
+  ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc/3ddesktop || return 1
   make || return 1
-  make prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc/3ddesktop install
+  make DESTDIR=$pkgdir install || return 1
 }