diff --git a/dev-db/libflaim/ChangeLog b/dev-db/libflaim/ChangeLog index 35e6f1d..b77d88b 100644 --- a/dev-db/libflaim/ChangeLog +++ b/dev-db/libflaim/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 03 Dec 2009; Mario Fetka + +files/libflaim-gcc43.patch, +files/libflaim-gcc44.patch, + +libflaim-4.9.845.ebuild, +files/libflaim-warning.patch: + add stable version + 25 Jul 2009; Mario Fetka libflaim-4.10_pre1107.ebuild: add debug support diff --git a/dev-db/libflaim/Manifest b/dev-db/libflaim/Manifest index 492c69a..f587523 100644 --- a/dev-db/libflaim/Manifest +++ b/dev-db/libflaim/Manifest @@ -1,6 +1,11 @@ +AUX libflaim-gcc43.patch 887 RMD160 4ae2a662a0b4f86addb89b56dcb58ed58f6327b5 SHA1 139fd6eb1981e3588bfbb73bb0e56601e6d077fb SHA256 8542bb4640782ed68f1207106eed6f08808ff09f4fde363772a1c7aacab6c5af +AUX libflaim-gcc44.patch 445 RMD160 0b41b6c456e778448863026db84852966ef97c12 SHA1 36a2e5d191b0ee37c3e4b4a0f25c45fa51f4375d SHA256 ebd9e33a31d3f95fe5dce3382739fdf6842508ad7c9ffcc202c6421df7abe7f9 +AUX libflaim-warning.patch 2211 RMD160 f7dced21bfe29b8308b6dec1214e44aca5b3bded SHA1 27b05204217056c21c26c042480b1ac648ab6f54 SHA256 ff0f55ecdf7968be8c6e8e04fdc3d7e3abf10e741927fe463ea85579da2b636c +DIST libflaim-4.9.845.tar.gz 2852582 RMD160 28210d8f1f48813f07b85090d7b8028d2f37a1df SHA1 c3b4ae0dc68ae9d26cc3d28f286cd0bc509f4212 SHA256 32992394f70be202eb85a17082b2a30a2bc5d1cecdcc031e272176eac6d1807c EBUILD libflaim-4.10_pre1084.ebuild 918 RMD160 8c72b3cb944f44bb6539453e7c83270b8874de55 SHA1 bb900def3935b22ac06b682cf9c02b730b0480fb SHA256 eab82e9f3ec4068c2513087287e49ce242351ebc02f7fb7154ac90f44b4d8681 EBUILD libflaim-4.10_pre1106.ebuild 946 RMD160 fe87e519a1aa4d364717ade96561f9077104ec90 SHA1 e52ed144944525e4de37e6ed22345beb4aa8fdf3 SHA256 2e00130e5b032a7f0642435aac726248c1fbbbc7515a18216b08b8713834f721 EBUILD libflaim-4.10_pre1107.ebuild 978 RMD160 f80ba01b71252ab8598046b2e75d1054753dc3b6 SHA1 2fadd5f069e14a25c84c5ca6d9187d16e17726e9 SHA256 44488467016f0a0f1190c7c0117a2196e8603c8bbbae545f75300e7dad27fbc7 EBUILD libflaim-4.10_pre1110.ebuild 964 RMD160 947d4ff677096effb10e9100061d4cf3c79a618d SHA1 321eecff42f11be96f65c0fe5fd7e00dbd817677 SHA256 6fb15571fe2dfa020f8a55ff2d1b37bdc8b2f7ec455d966c2880ff1c75f963fa -MISC ChangeLog 2459 RMD160 72f8d1017766e59b72a88c91ab8f1dcef9634207 SHA1 61b9efc773aaa8f7fdde360f61f8af8c7c47f65b SHA256 8ca945c5e35cecc84ef065ad6a02a1a5661c74a278d9aafc8bcd1e69a7c24b56 +EBUILD libflaim-4.9.845.ebuild 850 RMD160 5f8312d96a71ba4bfbc91329c1759c8655415b37 SHA1 6458e1dfbd2cda0546fb9c5dd2694edcfe9cc2c1 SHA256 1bda9bcf5420345ceabd9742d408da051b483b32904d30cbc16ef7c5ecc4369c +MISC ChangeLog 2651 RMD160 c4a74ec45f1d2e70e103bdc7f303e16a2d1c0299 SHA1 ea64a97cc002464b3c79656ecbc746fa5e1db763 SHA256 24ea76ac2c22dcb5e3e5c08d7606624641a67df6e19949d86597276442a725d6 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/dev-db/libflaim/files/libflaim-gcc43.patch b/dev-db/libflaim/files/libflaim-gcc43.patch new file mode 100644 index 0000000..501e3c4 --- /dev/null +++ b/dev-db/libflaim/files/libflaim-gcc43.patch @@ -0,0 +1,24 @@ +--- flaim/src/kybuild.cpp 2008-02-15 20:02:22.000000000 +0000 ++++ flaim/src/kybuild.cpp 2008-02-15 20:02:50.000000000 +0000 +@@ -533,8 +533,8 @@ + if (pIxd->uiFlags & IXD_OFFLINE) + { + if (uiContainerNum > pIxd->uiLastContainerIndexed || +- uiContainerNum == pIxd->uiLastContainerIndexed && +- uiDrn > pIxd->uiLastDrnIndexed) ++ (uiContainerNum == pIxd->uiLastContainerIndexed && ++ uiDrn > pIxd->uiLastDrnIndexed)) + { + continue; + } +--- flaim/ftk/src/ftk.h 2006-10-12 23:56:32.000000000 +0100 ++++ flaim/ftk/src/ftk.h 2008-02-15 21:00:17.000000000 +0000 +@@ -3687,7 +3687,7 @@ + } F_TMSTAMP; + + #define f_timeIsLeapYear(year) \ +- ((((year) & 0x03) == 0) && (((year) % 100) != 0) || (((year) % 400) == 0)) ++(((((year) & 0x03) == 0) && (((year) % 100) != 0)) || (((year) % 400) == 0)) + + void f_timeGetSeconds( + FLMUINT * puiSeconds); diff --git a/dev-db/libflaim/files/libflaim-gcc44.patch b/dev-db/libflaim/files/libflaim-gcc44.patch new file mode 100644 index 0000000..c2829de --- /dev/null +++ b/dev-db/libflaim/files/libflaim-gcc44.patch @@ -0,0 +1,12 @@ +--- ftkdir.cpp.orig 2006-10-13 02:56:32 +0400 ++++ ftk/src/ftkdir.cpp 2007-05-25 00:48:30 +0400 +@@ -1075,7 +1075,8 @@ + if( (PathSeparator = strrchr( DirInfo->full_path, '/')) == NULL) + #endif + { +- (void) getcwd( DirInfo->full_path, F_PATH_MAX_SIZE); ++ if (!getcwd( DirInfo->full_path, F_PATH_MAX_SIZE)) ++ return (EINVAL); + uiLen = f_strlen( DirInfo->full_path ); + DirInfo->full_path[uiLen] = '/'; + DirInfo->full_path[uiLen+1] = '\0'; diff --git a/dev-db/libflaim/files/libflaim-warning.patch b/dev-db/libflaim/files/libflaim-warning.patch new file mode 100644 index 0000000..2e7344a --- /dev/null +++ b/dev-db/libflaim/files/libflaim-warning.patch @@ -0,0 +1,75 @@ +--- ftk/src/ftk.h ++++ ftk/src/ftk.h +@@ -330,8 +330,10 @@ + #endif + + #if defined( FLM_WIN) || defined( FLM_NLM) ++ #define FLMATOMIC_RET long + #define FLMATOMIC volatile long + #else ++ #define FLMATOMIC_RET int + #define FLMATOMIC volatile int + #endif + +@@ -3943,7 +3945,7 @@ + } F_TMSTAMP; + + #define f_timeIsLeapYear(year) \ +- ((((year) & 0x03) == 0) && (((year) % 100) != 0) || (((year) % 400) == 0)) ++ (((((year) & 0x03) == 0) && (((year) % 100) != 0)) || (((year) % 400) == 0)) + + void f_timeGetSeconds( + FLMUINT * puiSeconds); +--- ftk/src/ftksys.h ++++ ftk/src/ftksys.h +@@ -218,7 +218,7 @@ + Desc: + **********************************************************************/ + #if defined( FLM_PPC) && defined( FLM_GNUC) && defined( FLM_LINUX) +- extern "C" FLMATOMIC ppc_atomic_add( ++ extern "C" FLMATOMIC_RET ppc_atomic_add( + FLMATOMIC * piTarget, + FLMINT32 iDelta); + #endif +@@ -227,7 +227,7 @@ + Desc: + **********************************************************************/ + #if defined( FLM_PPC) && defined( FLM_GNUC) && defined( FLM_LINUX) +- extern "C" FLMATOMIC ppc_atomic_xchg( ++ extern "C" FLMATOMIC_RET ppc_atomic_xchg( + FLMATOMIC * piTarget, + FLMATOMIC iNewValue); + #endif +--- ftk/src/ftkunix.cpp ++++ ftk/src/ftkunix.cpp +@@ -1356,7 +1356,7 @@ + Desc: + ****************************************************************************/ + #if defined( FLM_PPC) && defined( FLM_GNUC) +-FLMATOMIC ppc_atomic_add( ++FLMATOMIC_RET ppc_atomic_add( + FLMATOMIC * piTarget, + FLMINT32 iDelta) + { +@@ -1381,7 +1381,7 @@ + Desc: + ****************************************************************************/ + #if defined( FLM_PPC) && defined( FLM_GNUC) +-FLMATOMIC ppc_atomic_xchg( ++FLMATOMIC_RET ppc_atomic_xchg( + FLMATOMIC * piTarget, + FLMATOMIC iNewValue) + { +--- src/kybuild.cpp ++++ src/kybuild.cpp +@@ -534,8 +534,8 @@ + if (pIxd->uiFlags & IXD_OFFLINE) + { + if (uiContainerNum > pIxd->uiLastContainerIndexed || +- uiContainerNum == pIxd->uiLastContainerIndexed && +- uiDrn > pIxd->uiLastDrnIndexed) ++ ( uiContainerNum == pIxd->uiLastContainerIndexed && ++ uiDrn > pIxd->uiLastDrnIndexed ) ) + { + continue; + } diff --git a/dev-db/libflaim/libflaim-4.9.845.ebuild b/dev-db/libflaim/libflaim-4.9.845.ebuild new file mode 100644 index 0000000..9c85901 --- /dev/null +++ b/dev-db/libflaim/libflaim-4.9.845.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: +inherit eutils + +DESCRIPTION="FLAIM is an embeddable cross-platform database engine that provides +a rich, powerful, easy-to-use feature set." +HOMEPAGE="http://flaim.sourceforge.net" +SRC_URI="mirror://sourceforge/flaim/files/stable/flaim/source/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~ppc" +RESTRICT="mirror" + +RDEPEND="!dev-lib/libflaimtk" + +DEPEND="${RDEPEND}" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/libflaim-gcc43.patch + epatch ${FILESDIR}/libflaim-gcc44.patch +} + +src_compile() { + make DESTDIR=${D} OSTYPE=`uname -s` HOSTTYPE=`uname -m` || \ + die "Error compiling ${PN}" +} + +src_install() { + make DESTDIR=${D} install OSTYPE=`uname -s` HOSTTYPE=`uname -m` || \ + die "Error installing ${PN}" +}