[arch-commits] Commit in gigi/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Thursday, August 15, 2013 @ 21:46:05
  Author: arodseth
Revision: 95703

Still fails to build at the latest revision

Modified:
  gigi/trunk/PKGBUILD

----------+
 PKGBUILD |   43 ++++++++++++-------------------------------
 1 file changed, 12 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-15 18:52:08 UTC (rev 95702)
+++ PKGBUILD	2013-08-15 19:46:05 UTC (rev 95703)
@@ -6,7 +6,7 @@
 # Contributor: Manuel Gaul <inkaine at hotmail.com>
 
 pkgname=gigi
-pkgver=6141
+pkgver=6337
 pkgrel=1
 pkgdesc='Small, efficient and feature rich GUI for OpenGL and C++ (freeorion fork)'
 #url='http://gigi.sourceforge.net/'
@@ -16,7 +16,7 @@
 depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python')
 makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa-libgl')
 #https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/
-source=("$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/#revision=6141") # 5780 # 5407
+source=("$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/#revision=6337")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -25,56 +25,37 @@
   svnversion | tr -d [A-z]
 }
 
-build() {
-  cd "$srcdir/$pkgname"
+prepare() {
+  cd "$pkgname"
 
-  msg2 'Configuring...'
   setconf cmake/GiGiOgre.pc.in prefix /usr
   setconf cmake/GiGi.pc.in prefix /usr
   setconf cmake/GiGiSDL.pc.in prefix /usr
-  # It would be better if CMAKE_INSTALL_PREFIX or the resulting Makefiles
-  # could be re-configured in the package() function, but this works too.
+}
+
+build() {
+  cd "$pkgname"
+
   cmake \
     -D CMAKE_INSTALL_PREFIX="$srcdir/pkg/usr" \
     -D BUILD_TUTORIALS=OFF \
     -D CPACK_GENERATOR=GiGiDevel \
     -D CMAKE_C_FLAGS_RELEASE='-DNDEBUG' \
+    -D BOOST_SIGNALS_NO_DEPRECATION_WARNING=1 \
     .
-
-  #msg2 'Building documentation...'
-  #cd doc
-  #doxygen
-  #cd ..
-
-  msg2 'Compiling...'
   make -j1
 }
 
 package() {
-  cd "$srcdir/$pkgname"
+  cd "$pkgname"
 
-  msg2 'Packaging files...'
   make install
-
-  msg2 'Moving files to the right location...'
   mv -v "$srcdir/pkg/usr" "$pkgdir/"
 
-  #msg2 'Fixing documentation...'
-  #mkdir -p "$pkgdir/usr/share/doc"
-  #mv "$pkgdir/usr/doc" "$pkgdir/usr/share/doc/$pkgname"
-
-  #for f in `find "$pkgdir/usr/share/doc" -name "dir_*.html"`; do
-  #  sed -i "s:$srcdir:/:g" "$f"
-  #done
-
-  msg2 'Python 3 fix...'
+  # python3 fix
   for f in `find "$pkgdir/usr" -name "*.py"`; do
     sed -i "s:/env python:/python3:g" "$f"
   done
-
-  msg2 'Packaging license...'
-  install -Dm644 COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
 # vim:set ts=2 sw=2 et: