fixes for fltk and gcc-3.3 problems

5 files changed, 93 insertions, 3 deletions

diff --git a/app-emulation/pose/ChangeLog b/app-emulation/pose/ChangeLog
index 7b53584c3836..b855df76d1db 100644
--- a/app-emulation/pose/ChangeLog
+++ b/app-emulation/pose/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/pose
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/pose/ChangeLog,v 1.8 2003/10/01 11:41:19 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/pose/ChangeLog,v 1.9 2004/01/27 08:49:05 george Exp $
+
+*pose-3.5-r3 (26 Jan 2004)
+
+  26 Jan 2004; George Shapovalov <george@gentoo.org> pose-3.5-r3.ebuild, files/gcc-3.3_fix.diff.bz2 :
+  fixes for fltk and gcc-3.3 problems (#5219 mostly, see also ##26265 and 30210)
+  big thanks to Tom Collins <ltskinol@excite.com> for suggesting the fix.
 
 *pose-3.5-r2 (07 Aug 2003)
 
diff --git a/app-emulation/pose/files/digest-pose-3.5-r3 b/app-emulation/pose/files/digest-pose-3.5-r3
new file mode 100644
index 000000000000..6f7eb38e3cc3
--- /dev/null
+++ b/app-emulation/pose/files/digest-pose-3.5-r3
@@ -0,0 +1 @@
+MD5 c69b10798e524b999739bf1950125655 emulator_src_3.5.tar.gz 3162363
diff --git a/app-emulation/pose/files/gcc-3.3_fix.diff.bz2 b/app-emulation/pose/files/gcc-3.3_fix.diff.bz2
new file mode 100644
index 000000000000..b0a6f6d717ec
--- /dev/null
+++ b/app-emulation/pose/files/gcc-3.3_fix.diff.bz2
diff --git a/app-emulation/pose/pose-3.5-r2.ebuild b/app-emulation/pose/pose-3.5-r2.ebuild
index 90823ee787b5..c8383f91b587 100644
--- a/app-emulation/pose/pose-3.5-r2.ebuild
+++ b/app-emulation/pose/pose-3.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/pose/pose-3.5-r2.ebuild,v 1.2 2003/09/30 23:58:16 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/pose/pose-3.5-r2.ebuild,v 1.3 2004/01/27 08:49:05 george Exp $
 
 S=${WORKDIR}/Emulator_Src_3.5
 FLTK_PV=1.0.11
diff --git a/app-emulation/pose/pose-3.5-r3.ebuild b/app-emulation/pose/pose-3.5-r3.ebuild
new file mode 100644
index 000000000000..b7210234f06c
--- /dev/null
+++ b/app-emulation/pose/pose-3.5-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/pose/pose-3.5-r3.ebuild,v 1.1 2004/01/27 08:49:05 george Exp $
+
+S=${WORKDIR}/Emulator_Src_3.5
+HOMEPAGE="http://www.palmos.com/dev/tools/emulator/"
+SRC_URI="http://www.palmos.com/dev/tools/emulator/sources/emulator_src_3.5.tar.gz"
+
+DESCRIPTION="Palm OS Emulator"
+
+DEPEND=">=x11-libs/fltk-1.1.4"
+
+KEYWORDS="~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+src_unpack() {
+	unpack emulator_src_3.5.tar.gz
+
+	cd ${S}
+	patch -p1 < ${FILESDIR}/detect-fluid.diff || die "Patching failed"
+	patch -p1 < ${FILESDIR}/separate-builddir.diff || die "Patching failed"
+	patch -p1 < ${FILESDIR}/choose-gl.diff || die "Patching failed"
+	patch -p0 < ${FILESDIR}/init-clipwidget.diff || die "Patching failed"
+	bzcat ${FILESDIR}/gcc-3.3_fix.diff.bz2 | patch -p1 || die "Patching failed"
+
+	cd ${S}/BuildUnix
+	aclocal
+	automake --foreign
+	autoconf
+	sed -i -e "s:-DPLATFORM_UNIX:-DFLTK_1_0_COMPAT -DPLATFORM_UNIX:" configure
+
+	cd ${S}
+	mkdir install-fltk
+	ln -s /usr/include/fltk-1.1 install-fltk/include
+	ln -s /usr/lib/fltk-1.1 install-fltk/lib
+	mkdir static-libs
+	mkdir build-normal
+#	mkdir build-profile
+
+	cd ${S}/static-libs
+	ln -sf `g++ -print-file-name=libstdc++.a` libstdc++.a
+}
+
+src_compile() {
+	cd ${S}/build-normal
+#	cd ${S}/BuildUnix
+	LDFLAGS=-L${S}/static-libs ../BuildUnix/configure --prefix=/usr \
+		--with-fltk=${S}/install-fltk \
+		--disable-gl || die
+
+	make || die
+
+#	cd ${S}/build-profile
+#	LDFLAGS=-L${S}/static-libs ../BuildUnix/configure --prefix=/usr \
+#		--with-fltk=${S}/install-fltk \
+#		--disable-gl --enable-palm-profile || die
+#
+#	make || die
+}
+
+src_install() {
+	cd ${S}/build-normal
+	dobin pose
+
+#	cd ${S}/build-profile
+#	newbin pose pose-profile
+
+	cd ${S}/Docs
+	dodoc *.txt *.rtf
+	dohtml *.html
+	insinto /usr/share/doc/${PF}
+	doins *.pdf
+
+	dodir /usr/share/pose/downloads
+	dodir /usr/share/pose/roms
+
+	cd ${S}/ROMTransfer/Source
+	insinto /usr/share/pose/downloads
+	doins *.prc
+}
+