diff options
| author |   Joshua Kinard <kumba@gentoo.org> | 2003-10-05 04:14:49 +0000 |
|---|---|---|
| committer | Joshua Kinard <kumba@gentoo.org> | 2003-10-05 04:14:49 +0000 |
| commit | d9a73ed0702f082bb92c24fe003f636b928311f2 (patch) | |
| tree | d23113b52abde81c3e361565d04bc35e0c7b4430 /media-video | |
| parent | Added a patch to resolv a gcc-3.3.x multi-line string issue; Closes Bug #30292 (diff) | |
| download | historical-d9a73ed0702f082bb92c24fe003f636b928311f2.tar.gz historical-d9a73ed0702f082bb92c24fe003f636b928311f2.tar.bz2 historical-d9a73ed0702f082bb92c24fe003f636b928311f2.zip | |
Added a patch to resolv a gcc-3.3.x multi-line string issue; Closes Bug #30292
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/camstream/Manifest | 4 | ||||
| -rw-r--r-- | media-video/camstream/camstream-0.26.2.ebuild | 11 | ||||
| -rw-r--r-- | media-video/camstream/files/camstream-0.26.2-gcc33-multiline-string-fix.patch | 34 |
3 files changed, 46 insertions, 3 deletions
diff --git a/media-video/camstream/Manifest b/media-video/camstream/Manifest index b7a5adc73385..93e34e78cdba 100644 --- a/media-video/camstream/Manifest +++ b/media-video/camstream/Manifest @@ -1,5 +1,5 @@ -MD5 494623a816e7648e387dabc09e9852f9 ChangeLog 822 -MD5 1fce9def0374d33d74eaa248cfc58e17 camstream-0.26.2.ebuild 932 +MD5 a070e011c99a3b24fda8f95465a38cf8 ChangeLog 819 +MD5 d0d2003a7b592156dddad1b53669380d camstream-0.26.2.ebuild 929 MD5 5ef11878179d451985ee7157a416c27e metadata.xml 222 MD5 16c80fafcb4c0feffe28ec968596af68 files/digest-camstream-0.26.2 69 MD5 442c06ba3d78db581784e3f1e3410fce files/camstream-0.26.2-gcc33-multiline-string-fix.patch 922 diff --git a/media-video/camstream/camstream-0.26.2.ebuild b/media-video/camstream/camstream-0.26.2.ebuild index 22614be09583..160debfe535b 100644 --- a/media-video/camstream/camstream-0.26.2.ebuild +++ b/media-video/camstream/camstream-0.26.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/camstream/camstream-0.26.2.ebuild,v 1.3 2003/09/07 00:08:12 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/camstream/camstream-0.26.2.ebuild,v 1.4 2003/10/05 04:14:46 kumba Exp $ DESCRIPTION="Collection of tools for webcams and other video devices" HOMEPAGE="http://www.smcc.demon.nl/camstream/" @@ -14,6 +14,15 @@ DEPEND="virtual/x11 virtual/glibc >=x11-libs/qt-2.2.2* " + +src_unpack() { + unpack ${A} + + # Patch to fix an instance of a multi-line string which gcc-3.3.x dislikes greatly. + # Closes Bug #30292 + epatch ${FILESDIR}/${P}-gcc33-multiline-string-fix.patch +} + src_install () { dobin camstream/camstream camstream/caminfo camstream/ftpput dodir /usr/share/${PN}/icons diff --git a/media-video/camstream/files/camstream-0.26.2-gcc33-multiline-string-fix.patch b/media-video/camstream/files/camstream-0.26.2-gcc33-multiline-string-fix.patch new file mode 100644 index 000000000000..ded6899887d2 --- /dev/null +++ b/media-video/camstream/files/camstream-0.26.2-gcc33-multiline-string-fix.patch @@ -0,0 +1,34 @@ +--- ./camstream-0.26.2/camstream/ftpput.cc 2002-05-01 01:23:20.000000000 +0100 ++++ ./camstream-0.26.2/camstream/ftpput.cc.patched 2003-10-04 05:26:00.000000000 +0100 +@@ -35,18 +35,19 @@ + + void CFTPPut::Usage() + { +- qDebug(" +-Not enough/wrong arguments. Syntax: ++ qDebug("\n" ++"Not enough/wrong arguments. Syntax:\n" ++"\n\t" ++"ftpput file [options] [file ...] user:password@server[/path]\n" ++"\n" ++"The file is uploaded to the server using the FTP protocol. Path can be\n" ++"relative to the user's directory or absolute (use a double /).\n" ++"\n" ++"Options:\n\t" ++"--passive Use passive FTP to upload data\n" ++"\n" + +- ftpput file [options] [file ...] user:password@server[/path] +- +-The file is uploaded to the server using the FTP protocol. Path can be +-relative to the user's directory or absolute (use a double /). +- +-Options: +- --passive Use passive FTP to upload data +- +-"); ++); + } + + /** + |