[arch-commits] Commit in python-vpython/repos (5 files)

[Giovanni Scafora]

    Date: Saturday, July 25, 2009 @ 13:23:06
  Author: giovanni
Revision: 47727

Merged revisions 47725 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/python-vpython/trunk

........
  r47725 | giovanni | 2009-07-25 10:12:19 -0700 (sab, 25 lug 2009) | 2 lines
  
  upgpkg: python-vpython 5.11-1
      New version 5.11
........

Added:
  python-vpython/repos/extra-i686/Makefile.in.patch
    (from rev 47725, python-vpython/trunk/Makefile.in.patch)
Modified:
  python-vpython/repos/extra-i686/	(properties)
  python-vpython/repos/extra-i686/PKGBUILD
  python-vpython/repos/extra-i686/idlepath.patch
Deleted:
  python-vpython/repos/extra-i686/python-visual_gcc43.diff

--------------------------+
 Makefile.in.patch        |   11 +++++++++++
 PKGBUILD                 |   42 ++++++++++++++++++++----------------------
 idlepath.patch           |    5 ++---
 python-visual_gcc43.diff |   12 ------------
 4 files changed, 33 insertions(+), 37 deletions(-)


Property changes on: python-vpython/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /python-vpython/trunk:1-22312
   + /python-vpython/trunk:1-47726

Copied: python-vpython/repos/extra-i686/Makefile.in.patch (from rev 47725, python-vpython/trunk/Makefile.in.patch)
===================================================================
--- extra-i686/Makefile.in.patch	                        (rev 0)
+++ extra-i686/Makefile.in.patch	2009-07-25 17:23:06 UTC (rev 47727)
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in	2009-07-25 16:36:10.000000000 -0700
++++ b/src/Makefile.in	2009-07-25 16:36:10.000000000 -0700
+@@ -208,7 +208,7 @@
+  else
+     # Libtoolish rules.  These should apply to all POSIX-like systems.
+     CVISUAL_LIBS += $(filter-out $(_FILTER_OUT), $(GTK_LIBS) \
+-       $(GTHREAD_LIBS) -lboost_python -lboost_thread -lboost_signals)
++       $(GTHREAD_LIBS) -lboost_python-mt -lboost_thread-mt -lboost_signals-mt)
+     CXX_RULE = $(LT_CXX_RULE)
+     LINK_RULE = $(LT_LINKRULE)
+     PLATFORM_TARGET = cvisualmodule.la

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-25 17:12:59 UTC (rev 47726)
+++ extra-i686/PKGBUILD	2009-07-25 17:23:06 UTC (rev 47727)
@@ -3,32 +3,30 @@
 # Contributor: Comete <la_comete at tiscali.fr>
 
 pkgname=python-vpython
-pkgver=3.2.9
-pkgrel=5
-pkgdesc="A Python module that offers real-time 3D output, and is easily usable by novice programmers"
-arch=(i686 x86_64)
+pkgver=5.11
+pkgrel=1
+pkgdesc="A Python module that offers real-time 3D output"
+arch=('i686' 'x86_64')
 url="http://www.vpython.org"
-depends=('gtk' 'python' 'gtkglarea' 'pkgconfig' 'python-numeric'
-'boost>=1.35.0' 'tk')
+depends=('gtkglextmm' 'libglademm' 'python-numeric' 'boost>=1.39.0' 'tk')
+makedepends=('pkgconfig')
 license=('custom')
-source=(http://vpython.org/download/visual-$pkgver.tar.bz2 idlepath.patch
-python-visual_gcc43.diff)
-md5sums=('58e46ecb628a4fdbb5c58540b6cbede1' '5739f4792c2594cfd5d2862025b6eedc'
-         '46f7ec82b10ad24c0298f49a4998b73e')
-replaces=(vpython)
+options=(!libtool)
+source=(http://www.vpython.org/contents/download/visual-5.11.tar.bz2 idlepath.patch Makefile.in.patch)
+md5sums=('b7c0acc12e395bfd050dada008891dc1'
+         '565dfeb03de806ba2382d05c0ded27d6'
+         '8327c39c71c34d208afe306791fca7d2')
 
 build() {
-  cd $startdir/src/visual-$pkgver
-  patch -Np1 -i ../idlepath.patch || return 1
-  patch -Np1 -i ../python-visual_gcc43.diff || return 1
+  cd ${srcdir}/visual-${pkgver}_release
+  patch -Np1 -i ${srcdir}/idlepath.patch || return 1
+  patch -Np1 -i ${srcdir}/Makefile.in.patch || return 1
   pythondir=`python -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
-  unset PYTHONPATH							# ignore developers PYTHONPATH
-  ./configure --prefix=/usr --with-example-dir=$pythondir/visual/demos
+  unset PYTHONPATH # ignore developers PYTHONPATH
+  ./configure --prefix=/usr \
+              --with-example-dir=$pythondir/visual/demos
   make || return 1
-  mkdir -p $startdir/pkg${pythondir}
-  mkdir -p $startdir/pkg/usr/bin
-  make DESTDIR=$startdir/pkg install
-  # license
-  install -D -m644 license.txt \
-                   $startdir/pkg/usr/share/licenses/$pkgname/license.txt
+  make DESTDIR=${pkgdir} install
+  install -D -m644 license.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
+

Modified: extra-i686/idlepath.patch
===================================================================
--- extra-i686/idlepath.patch	2009-07-25 17:12:59 UTC (rev 47726)
+++ extra-i686/idlepath.patch	2009-07-25 17:23:06 UTC (rev 47727)
@@ -1,6 +1,5 @@
-diff -ur visual-3.2.1.orig/bin/vpython.in visual-3.2.1/bin/vpython.in
---- visual-3.2.1.orig/bin/vpython.in	2005-02-25 21:39:38.000000000 +0100
-+++ visual-3.2.1/bin/vpython.in	2005-08-06 12:41:54.000000000 +0200
+--- a/bin/vpython.in	2005-02-25 21:39:38.000000000 +0100
++++ b/bin/vpython.in	2005-08-06 12:41:54.000000000 +0200
 @@ -17,8 +17,8 @@
      ;;
  '')

Deleted: extra-i686/python-visual_gcc43.diff
===================================================================
--- extra-i686/python-visual_gcc43.diff	2009-07-25 17:12:59 UTC (rev 47726)
+++ extra-i686/python-visual_gcc43.diff	2009-07-25 17:23:06 UTC (rev 47727)
@@ -1,12 +0,0 @@
-diff -Nru --exclude changelog python-visual-3.2.9/include/platlinux.h python-visual-3.2.9/include/platlinux.h
---- python-visual-3.2.9/include/platlinux.h	2005-06-25 17:08:57.000000000 +0530
-+++ python-visual-3.2.9/include/platlinux.h	2008-03-23 15:13:48.000000000 +0530
-@@ -24,7 +24,7 @@
- 	pthread_mutex_t mtx;
-   
-  public:
--	typedef lock<mutex> lock;
-+	typedef visual::lock<mutex> lock;
- 
- 	mutex(int spincount=0, int count=1);
- 	~mutex();