[arch-commits] Commit in smc/trunk (PKGBUILD boost-1.36.0.patch)

[Kevin Piche]

    Date: Thursday, September 18, 2008 @ 00:07:43
  Author: kevin
Revision: 12673

upgpkg: smc 1.5-2
    Updated for boost 1.36.0

Added:
  smc/trunk/boost-1.36.0.patch
Modified:
  smc/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   10 ++++----
 boost-1.36.0.patch |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-17 21:20:37 UTC (rev 12672)
+++ PKGBUILD	2008-09-18 04:07:43 UTC (rev 12673)
@@ -6,19 +6,20 @@
 replaces=('smclone')
 conflicts=('smclone')
 pkgver=1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Secret Maryo Chronicles"
 arch=(i686 x86_64)
 url="http://www.secretmaryo.org/"
 license=('GPL3')
 makedepends=(autoconf automake)
-depends=(sdl_image sdl_ttf sdl_mixer cegui boost libpng)
-source=(http://dl.sourceforge.net/sourceforge/smclone/$pkgname-$pkgver.tar.bz2 smc.desktop smc.png)
+depends=(sdl_image sdl_ttf sdl_mixer cegui boost=1.36.0 libpng)
+source=(http://dl.sourceforge.net/sourceforge/smclone/$pkgname-$pkgver.tar.bz2 smc.desktop smc.png boost-1.36.0.patch)
 md5sums=('72d10648435c349988dcd053e5fe64fe' '80fe208132ff41dd7677a53ee429ecdb'
-         'efca7580e28748625eb676c9d24ee122')
+         'efca7580e28748625eb676c9d24ee122' '18f9c82a8d62c80bcadb8c65bb829ba3')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/boost-1.36.0.patch
   ./autogen.sh || return 1
   ./configure --prefix=/usr || return 1
   make install LDADD=-lpng DESTDIR=$startdir/pkg || return 1
@@ -26,4 +27,3 @@
   install -D -m644 $startdir/src/$pkgname.desktop $startdir/pkg/usr/share/applications/$pkgname.desktop
   install -D -m644 $startdir/src/$pkgname.png $startdir/pkg/usr/share/pixmaps/$pkgname.png
 }
-

Added: boost-1.36.0.patch
===================================================================
--- boost-1.36.0.patch	                        (rev 0)
+++ boost-1.36.0.patch	2008-09-18 04:07:43 UTC (rev 12673)
@@ -0,0 +1,60 @@
+diff -Naur smc-1.5.orig/src/core/game_core.cpp smc-1.5.new/src/core/game_core.cpp
+--- smc-1.5.orig/src/core/game_core.cpp	2008-05-02 19:33:38.000000000 -0400
++++ smc-1.5.new/src/core/game_core.cpp	2008-09-17 23:50:21.000000000 -0400
+@@ -1544,29 +1544,29 @@
+ 			if( fs::is_directory( *dir_itr ) )
+ 			{
+ 				// ignore hidden directories
+-				if( dir_itr->leaf().find( "." ) == 0 )
++				if( dir_itr->filename().find( "." ) == 0 )
+ 				{
+ 					continue;
+ 				}
+ 
+ 				if( with_directories )
+ 				{
+-					valid_files.push_back( dir + "/" + dir_itr->leaf() );
++					valid_files.push_back( dir + "/" + dir_itr->filename() );
+ 				}
+ 
+ 				// load all items from the sub-directory
+-				vector<string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->leaf(), file_type, with_directories );
++				vector<string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->filename(), file_type, with_directories );
+ 				valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() );
+ 			}
+ 			// valid file
+-			else if( file_type.empty() || dir_itr->leaf().rfind( file_type ) != string::npos )
++			else if( file_type.empty() || dir_itr->filename().rfind( file_type ) != string::npos )
+ 			{
+-				valid_files.push_back( dir + "/" + dir_itr->leaf() );
++				valid_files.push_back( dir + "/" + dir_itr->filename() );
+ 			}
+ 		}
+ 		catch( const std::exception &ex )
+ 		{
+-			printf( "%s %s\n", dir_itr->leaf().c_str(), ex.what() );
++			printf( "%s %s\n", dir_itr->filename().c_str(), ex.what() );
+ 		}
+ 	}
+ 
+diff -Naur smc-1.5.orig/src/overworld/worlds.cpp smc-1.5.new/src/overworld/worlds.cpp
+--- smc-1.5.orig/src/overworld/worlds.cpp	2008-04-22 01:47:42.000000000 -0400
++++ smc-1.5.new/src/overworld/worlds.cpp	2008-09-17 23:51:03.000000000 -0400
+@@ -111,7 +111,7 @@
+ 	{
+ 		try
+ 		{
+-			string current_dir = dir_itr->leaf();
++			string current_dir = dir_itr->filename();
+ 
+ 			// only directories with an existing description
+ 			if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )
+@@ -138,7 +138,7 @@
+ 		}
+ 		catch( const std::exception &ex )
+ 		{
+-			printf( "%s %s\n", dir_itr->leaf().c_str(), ex.what() );
++			printf( "%s %s\n", dir_itr->filename().c_str(), ex.what() );
+ 		}
+ 	}
+ }