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

[Ronald van Haren]

    Date: Sunday, July 12, 2009 @ 13:54:50
  Author: ronald
Revision: 45576

fix svn merge error

Added:
  aiksaurus/repos/extra-i686/aiksaurus-gcc44.patch
    (from rev 45574, aiksaurus/trunk/aiksaurus-gcc44.patch)
Modified:
  aiksaurus/repos/extra-i686/	(properties)
  aiksaurus/repos/extra-i686/PKGBUILD

-----------------------+
 PKGBUILD              |   24 ++++++++++++++++--------
 aiksaurus-gcc44.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 8 deletions(-)


Property changes on: aiksaurus/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /aiksaurus/trunk:1
   + /aiksaurus/trunk:1-45575

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-12 17:51:06 UTC (rev 45575)
+++ extra-i686/PKGBUILD	2009-07-12 17:54:50 UTC (rev 45576)
@@ -1,20 +1,28 @@
 # $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=aiksaurus
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform, open-source thesaurus"
 url="http://aiksaurus.sourceforge.net/"
-license="GPL"
+license=('GPL')
+arch=('i686' 'x86_64')
+options=('!libtool')
 depends=('gtk2')
-source=(http://dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3eae03b7c49843ccc9262e52846ea6b4')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+	'aiksaurus-gcc44.patch')
+md5sums=('3eae03b7c49843ccc9262e52846ea6b4'
+         '7f94749172116b1529fc21b718ee7636')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # gcc44 build patch
+  patch -Np0 -i ${srcdir}/aiksaurus-gcc44.patch || return 1
+
   ./configure --prefix=/usr --with-gtk
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  find ${startdir}/pkg -name '*.la' -exec rm {} \;
+  make DESTDIR=${pkgdir} install
 }

Copied: aiksaurus/repos/extra-i686/aiksaurus-gcc44.patch (from rev 45574, aiksaurus/trunk/aiksaurus-gcc44.patch)
===================================================================
--- extra-i686/aiksaurus-gcc44.patch	                        (rev 0)
+++ extra-i686/aiksaurus-gcc44.patch	2009-07-12 17:54:50 UTC (rev 45576)
@@ -0,0 +1,31 @@
+--- base/aiksaurus.t.cpp~	2003-06-26 21:44:38.000000000 -0400
++++ base/aiksaurus.t.cpp	2009-05-31 20:02:29.172988678 -0400
+@@ -22,6 +22,7 @@
+ #include "Aiksaurus.h"
+ #include "AsciiCompare.h"
+ #include "config.h"
++#include <cstdlib>
+ #include <iostream>
+ #include <string>
+ using namespace std;
+
+--- ./gtk/src/Display.cpp~	2003-05-27 19:56:54.000000000 -0400
++++ ./gtk/src/Display.cpp	2009-06-02 18:09:36.198627551 -0400
+@@ -22,6 +22,7 @@
+ #include "Meaning.h"
+ #include "DialogMediator.h"
+ #include "Exception.h"
++#include <cstring>
+ using namespace std;
+ 
+ namespace AiksaurusGTK_impl
+--- ./gtk/src/gtkAiksaur.t.cpp~	2002-01-11 21:02:12.000000000 -0500
++++ ./gtk/src/gtkAiksaur.t.cpp	2009-06-02 18:12:06.815277325 -0400
+@@ -21,6 +21,7 @@
+ #include <AiksaurusGTK.h>
+ #include "config.h"
+ #include <gtk/gtk.h>
++#include <cstdlib>
+ #include <iostream>
+ #include <string>
+ using namespace std;