diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2004-06-26 23:09:25 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2004-06-26 23:09:25 +0000 |
| commit | e5e56a08014b7bec79ad87ad0135268a9d4d168e (patch) | |
| tree | b2a3ead8d3f4ad087796c02cf1972dc703530561 /app-pda | |
| parent | added patch to prevent segv on missing /proc/bus/usb/devices (#42378) (diff) | |
| download | historical-e5e56a08014b7bec79ad87ad0135268a9d4d168e.tar.gz historical-e5e56a08014b7bec79ad87ad0135268a9d4d168e.tar.bz2 historical-e5e56a08014b7bec79ad87ad0135268a9d4d168e.zip | |
fix assert header problems (#50150)
Diffstat (limited to 'app-pda')
| -rw-r--r-- | app-pda/plptools/ChangeLog | 4 | ||||
| -rw-r--r-- | app-pda/plptools/Manifest | 5 | ||||
| -rw-r--r-- | app-pda/plptools/files/plptools-0.12-assert.h.patch | 31 | ||||
| -rw-r--r-- | app-pda/plptools/plptools-0.12.ebuild | 21 |
4 files changed, 51 insertions, 10 deletions
diff --git a/app-pda/plptools/ChangeLog b/app-pda/plptools/ChangeLog index 53ad0ce20bff..08dcdfd110c4 100644 --- a/app-pda/plptools/ChangeLog +++ b/app-pda/plptools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-pda/plptools # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 + 26 Jun 2004; Alastair Tse <liquidx@gentoo.org> + +files/plptools-0.12-assert.h.patch, plptools-0.12.ebuild: + fix assert header problems (#50150) + *plptools-0.12 (11 Jan 2004) 11 Jan 2004; Troy Dack <tad@gentoo.org> plptools-0.11-r1.ebuild, diff --git a/app-pda/plptools/Manifest b/app-pda/plptools/Manifest index 67512cccefd6..34ec659a0f70 100644 --- a/app-pda/plptools/Manifest +++ b/app-pda/plptools/Manifest @@ -1,10 +1,11 @@ -MD5 242eb1ef3f62eac79a12bbcce68cd4fb plptools-0.12.ebuild 1001 +MD5 36ccd8a2e61f5c8f4cc80d5da419b54f plptools-0.12.ebuild 1010 MD5 2049e4b345d2e598c4a0825cbd1077bd plptools-0.11-r1.ebuild 872 MD5 b5ba640fb5399278e281337e2acac959 plptools-0.11.ebuild 869 -MD5 9614f114749955f6953f71a4419ed20d ChangeLog 867 +MD5 c034da518ddef0d74bc787f992f33929 ChangeLog 1016 MD5 8f1a395f7ca3054f5cd79687dbda0881 metadata.xml 216 MD5 b3ce73e6781d2293d40d0048fcb48c84 files/plptools-0.11-gentoo.patch 516 MD5 ab42a6f1d4c18d5eee94ce1cb6ba971d files/psion 1113 +MD5 269a36c59ac1b22d516036062c4c1d97 files/plptools-0.12-assert.h.patch 1024 MD5 26b69a1efa7dd33edd7beb83ba2b15cd files/psion.conf 94 MD5 ada7c64a2c3655d40ddb78570ac41671 files/digest-plptools-0.11-r1 65 MD5 ada7c64a2c3655d40ddb78570ac41671 files/digest-plptools-0.11 65 diff --git a/app-pda/plptools/files/plptools-0.12-assert.h.patch b/app-pda/plptools/files/plptools-0.12-assert.h.patch new file mode 100644 index 000000000000..0ff848036758 --- /dev/null +++ b/app-pda/plptools/files/plptools-0.12-assert.h.patch @@ -0,0 +1,31 @@ +=================================================================== +RCS file: /cvsroot/plptools/plptools/lib/Enum.h,v +retrieving revision 1.9 +retrieving revision 1.10 +diff -u -r1.9 -r1.10 +--- plptools/plptools/lib/Enum.h 2003/02/05 07:59:08 1.9 ++++ plptools/plptools/lib/Enum.h 2004/03/13 11:15:36 1.10 +@@ -27,6 +27,7 @@ + #include <config.h> + #endif + ++#include <assert.h> + #include <map> + #include <string> + +@@ -276,13 +277,13 @@ + * // declaration of enumeration; somewhere + * class rfsv { + * [...] +- * enum PSI_ERROR_CODES { E_PSI_GEN_NONE, E_PSI_GEN_FAIL, E_PSI_GEN_ARG }; ++ * enum PSI_ERROR_CODES { E_PSI_GEN_NONE, E_PSI_GEN_FAIL, E_PSI_GEN_ARG }; + * [...] + * }; + * + * // definition of the Enum<E> with the appropriate string representations + * ENUM_DEFINITION(rfsv::PSI_ERROR_CODES, +- * rfsv::E_PSI_GEN_NONE) { ++ * rfsv::E_PSI_GEN_NONE) { + * stringRep.add(rfsv::E_PSI_GEN_NONE, "no error"); + * stringRep.add(rfsv::E_PSI_GEN_FAIL, "general"); + * stringRep.add(rfsv::E_PSI_GEN_ARG, "bad argument"); diff --git a/app-pda/plptools/plptools-0.12.ebuild b/app-pda/plptools/plptools-0.12.ebuild index f03f7412e086..e2abc0d6d417 100644 --- a/app-pda/plptools/plptools-0.12.ebuild +++ b/app-pda/plptools/plptools-0.12.ebuild @@ -1,23 +1,28 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/plptools/plptools-0.12.ebuild,v 1.2 2004/06/24 21:44:42 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/plptools/plptools-0.12.ebuild,v 1.3 2004/06/26 23:09:25 liquidx Exp $ + +inherit eutils DESCRIPTION="Libraries and utilities to communicate with a Psion palmtop via serial." HOMEPAGE="http://plptools.sourceforge.net" -SRC_URI="http://unc.dl.sourceforge.net/sourceforge/plptools/${P}.tar.gz" -LICENSE="as-is" +SRC_URI="mirror://sourceforge/plptools/${P}.tar.gz" +LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86" -DEPEND="virtual/glibc - kde? ( >=kde-base/kdelibs-3.1* )" +DEPEND="kde? ( >=kde-base/kdelibs-3.1* )" -S="${WORKDIR}/${P}" IUSE="kde" -src_compile() { - patch -p1 < ${FILESDIR}/${P}-gentoo.patch || die "Patch failed!" +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-gentoo.patch + epatch ${FILESDIR}/${P}-assert.h.patch +} +src_compile() { local myconf if use kde |