Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7449d86176b1f22afd6c8d5cf34b0ebcafb6cdcd

commit 7449d86176b1f22afd6c8d5cf34b0ebcafb6cdcd
Author: kikadf <[email protected]>
Date:   Wed May 30 21:45:27 2012 +0200

pearpc-0.5-1-i686

* Version bump

diff --git a/source/xapps-extra/pearpc/FrugalBuild 
b/source/xapps-extra/pearpc/FrugalBuild
index d81d543..b9ab54d 100644
--- a/source/xapps-extra/pearpc/FrugalBuild
+++ b/source/xapps-extra/pearpc/FrugalBuild
@@ -1,34 +1,28 @@
-# Compiling Time: 0.25 SBU
+# Compiling Time: 0.35 SBU
# Maintainer: kikadf <[email protected]>
# Contributor: AlexExtreme <[email protected]>

pkgname=pearpc
-pkgver=0.4.0
-pkgrel=2
+pkgver=0.5
+pkgrel=1
pkgdesc="PearPC is an Open Source PowerPC platform emulator"
-_F_sourceforge_ext=".tar.bz2"
-Finclude sourceforge
-url="http://pearpc.sourceforge.net";
-up2date="lynx -dump http://sourceforge.net/projects/pearpc/files/pearpc/|grep 
'http.*pearpc/.*pearpc/.*/$'|sed 's|.*/\(.*\)/|\1|;q'"
depends=('libx11')
makedepends=('nasm' 'flex' 'bison')
+_F_sourceforge_ext=".tar.bz2"
+Fconfopts="$Fconfopts --enable-ui=x11"
+Finclude sourceforge
groups=('xapps-extra')
-archs=('i686' '!x86_64')
-source=(${source/0.4.0/0.4}) # FIXME
-sha1sums=('1cfa4f19f9a1de73c209a38d8fda174c0ebe6ad5')
+archs=('i686' 'x86_64')
+source=($source pearpc-fix-no-return-in-nonvoid-function.patch \
+        pearpc-fix-ambiguates-old-declaration.patch)
+sha1sums=('17c5ec69f0139d5a5ce02186a3c990040f45f343' \
+          '9361cd9b1d6f7bffa4e045f9b5b28344febdf2f6' \
+          '65b17d51d05e07defe6ab7bbacdf215b511152e7')
+
build()
{
-       Fcd $pkgname-0.4
-       Fmake --enable-cpu=jitc_x86 --enable-ui=x11 --enable-release
-       Fmkdir /usr/share/$pkgname-0.4
-       Fmkdir /usr/bin
-       Fexe $pkgname-0.4/src/ppc /usr/bin/ppc
-       Ffilerel scripts/ifppc_down /usr/share/$pkgname-0.4
-       Ffilerel scripts/ifppc_down.setuid /usr/share/$pkgname-0.4
-       Ffilerel scripts/ifppc_up /usr/share/$pkgname-0.4
-       Ffilerel scripts/ifppc_up.setuid /usr/share/$pkgname-0.4
-       Ffilerel video.x /usr/share/$pkgname-0.4
-       sed -i -e "s:video.x:/usr/share/$pkgname-0.4/video.x:g" ppccfg.example
-       Ffilerel ppccfg.example /usr/share/$pkgname-0.4
+       Fbuild
+       Ffile $_F_cd_path/video.x /usr/share/$pkgname/video.x
+       Ffile $_F_cd_path/ppccfg.example /usr/share/$pkgname/ppccfg.example
}
-# optimization OK
+
diff --git 
a/source/xapps-extra/pearpc/pearpc-fix-ambiguates-old-declaration.patch 
b/source/xapps-extra/pearpc/pearpc-fix-ambiguates-old-declaration.patch
new file mode 100644
index 0000000..1e140a8
--- /dev/null
+++ b/source/xapps-extra/pearpc/pearpc-fix-ambiguates-old-declaration.patch
@@ -0,0 +1,11 @@
+--- src/cpu/mem.h      2011-09-08 17:26:48.000000000 -0500
++++ src/cpu/mem.h.orig 2011-09-08 17:31:12.000000000 -0500
+@@ -23,7 +23,7 @@
+
+ #include "system/types.h"
+
+-bool  ppc_init_physical_memory(uint size);
++bool  FASTCALL ppc_init_physical_memory(uint size);
+
+ uint32  ppc_get_memory_size();
+
diff --git 
a/source/xapps-extra/pearpc/pearpc-fix-no-return-in-nonvoid-function.patch 
b/source/xapps-extra/pearpc/pearpc-fix-no-return-in-nonvoid-function.patch
new file mode 100644
index 0000000..c1269ec
--- /dev/null
+++ b/source/xapps-extra/pearpc/pearpc-fix-no-return-in-nonvoid-function.patch
@@ -0,0 +1,53 @@
+--- src/io/prom/forth.cc       2005-05-24 16:27:59.000000000 -0500
++++ src/io/prom/forth.cc.orig  2011-09-07 16:09:47.000000000 -0500
+@@ -205,10 +205,12 @@
+       return true;
+ }
+
++#if 0
+ String &ForthVM::getToken(const String &delimiters)
+ {
+
+ }
++#endif
+
+ bool ForthVM::consumeSpace(bool except)
+ {
+@@ -539,6 +541,7 @@
+
+ uint32 ForthVar::getExecToken(ForthVM &vm)
+ {
++   return 0;
+ }
+
+ void ForthVar::interprete(ForthVM &vm)
+--- src/io/prom/promboot.cc    2011-07-12 09:37:52.000000000 -0500
++++ src/io/prom/promboot.cc.orig       2011-09-07 16:15:45.000000000 -0500
+@@ -476,6 +476,7 @@
+                       loader_size -= size;
+               }
+       }
++      return false;
+ }
+
+ extern uint32 gMemorySize;
+--- src/io/serial/serial.cc    2006-10-11 13:39:02.000000000 -0500
++++ src/io/serial/serial.cc.orig       2011-09-07 16:19:44.000000000 -0500
+@@ -148,6 +148,7 @@
+               static char bl[10];
+               sprintf(bl, "%08x", a);
+       }
++      return NULL;
+ }
+
+ virtual bool readDeviceIO(uint r, uint32 address, uint32 &data, uint size)
+--- src/debug/debugger.cc      2008-02-07 14:38:29.000000000 -0600
++++ src/debug/debugger.cc.orig 2011-09-07 16:21:08.000000000 -0500
+@@ -562,6 +562,7 @@
+               return true;
+       }
+ #endif
++return false;
+ }
+
+ bool Debugger::parse(const String &str)
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to