diff options
| author |   Joshua Kinard <kumba@gentoo.org> | 2003-10-02 07:56:26 +0000 |
|---|---|---|
| committer | Joshua Kinard <kumba@gentoo.org> | 2003-10-02 07:56:26 +0000 |
| commit | 36b75c5aa2fc2572e5c5c9445d48c026362eefd3 (patch) | |
| tree | 3686c59af13af5aa6251224530353e2eeeffb279 /app-cdr/arson | |
| parent | Added a patch that fixes a multi-line string issue with gcc-3.3.x; Closes Bug... (diff) | |
| download | historical-36b75c5aa2fc2572e5c5c9445d48c026362eefd3.tar.gz historical-36b75c5aa2fc2572e5c5c9445d48c026362eefd3.tar.bz2 historical-36b75c5aa2fc2572e5c5c9445d48c026362eefd3.zip | |
Added a patch that fixes a multi-line string issue with gcc-3.3.x; Closes Bug #28236
Diffstat (limited to 'app-cdr/arson')
| -rw-r--r-- | app-cdr/arson/Manifest | 4 | ||||
| -rw-r--r-- | app-cdr/arson/arson-0.9.7-r3.ebuild | 3 | ||||
| -rw-r--r-- | app-cdr/arson/files/arson-0.9.7-gcc33-multiline-string-fix.patch | 47 |
3 files changed, 51 insertions, 3 deletions
diff --git a/app-cdr/arson/Manifest b/app-cdr/arson/Manifest index 57cabfddf0ef..9cee639bb28a 100644 --- a/app-cdr/arson/Manifest +++ b/app-cdr/arson/Manifest @@ -1,7 +1,7 @@ -MD5 5e127d538e180a209ba361cbd1d0ee11 ChangeLog 1956 +MD5 5dbc330c7fa70f0ebf110369c5b36d6e ChangeLog 1957 MD5 81a821827f535fca95b6b28e30c41d41 arson-0.9.7-r1.ebuild 906 MD5 d41ad78be02d4b7e3e5ac56de3262262 arson-0.9.7-r2.ebuild 949 -MD5 85cac8abc3ab86983a8e762c5e35363f arson-0.9.7-r3.ebuild 1046 +MD5 e29a77b61503f314a73d5919e1d61c45 arson-0.9.7-r3.ebuild 1043 MD5 ceedb2cdf1b1c9ee6a946ef373d4b6e8 arson-0.9.7.ebuild 825 MD5 dbcb408efd85de0535addf120954d78d files/arson-0.9.7-crashfix.diff 404 MD5 36dfe8c597aa471beb98dc30e3606d47 files/arson-0.9.7-write-img-fix.diff 1689 diff --git a/app-cdr/arson/arson-0.9.7-r3.ebuild b/app-cdr/arson/arson-0.9.7-r3.ebuild index 09019effec87..e22974e9bf29 100644 --- a/app-cdr/arson/arson-0.9.7-r3.ebuild +++ b/app-cdr/arson/arson-0.9.7-r3.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/app-cdr/arson/arson-0.9.7-r3.ebuild,v 1.3 2003/09/05 22:57:43 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/arson-0.9.7-r3.ebuild,v 1.4 2003/10/02 07:56:23 kumba Exp $ inherit kde-base inherit eutils @@ -31,4 +31,5 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${P}-write-img-fix.diff epatch ${FILESDIR}/${P}-crashfix.diff + epatch ${FILESDIR}/${P}-gcc33-multiline-string-fix.patch } diff --git a/app-cdr/arson/files/arson-0.9.7-gcc33-multiline-string-fix.patch b/app-cdr/arson/files/arson-0.9.7-gcc33-multiline-string-fix.patch new file mode 100644 index 000000000000..d2a4317bddd7 --- /dev/null +++ b/app-cdr/arson/files/arson-0.9.7-gcc33-multiline-string-fix.patch @@ -0,0 +1,47 @@ +--- arson-0.9.7-orig/src/programpage.cpp 2002-10-31 09:50:07.000000000 +0900 ++++ arson-0.9.7-kde3/src/programpage.cpp 2003-09-09 12:57:01.000000000 +0900 +@@ -50,42 +50,7 @@ + * the PROGGRP_ and *SEQ_ enums. + */ + const char *program_sequence = +-"<?xml version='1.0'?><programs> +- <group desc='%1'> +- <program name='cdrdao'/> +- <program name='cdrecord'/> +- </group> +- +- <group desc='%2'> +- <program name='cdrecord'/> +- <program name='cdrdao'/> +- </group> +- +- <group desc='%3'> +- <program name='cdrdao'/> +- <program name='readcd -> cdrecord'/> +- </group> +- +- <group desc='%4'> +- <program name='bladeenc'/> +- <program name='LAME'/> +- </group> +- +- <group desc='%5'> +- <program name='cdrecord'/> +- <program name='cdrdao'/> +- </group> +- +- <group desc='%6'> +- <program name='cdda2wav'/> +- <program name='cdparanoia'/> +- </group> +- +- <group desc='%7'> +- <program name='cdrecord'/> +- <program name='cdrdao'/> +- </group> +-</programs>"; ++"<?xml version='1.0'?><programs><group desc='%1'><program name='cdrdao'/><program name='cdrecord'/></group><group desc='%2'><program name='cdrecord'/><program name='cdrdao'/></group><group desc='%3'><program name='cdrdao'/><program name='readcd -> cdrecord'/></group><group desc='%4'><program name='bladeenc'/><program name='LAME'/></group><group desc='%5'><program name='cdrecord'/><program name='cdrdao'/></group><group desc='%6'><program name='cdda2wav'/><program name='cdparanoia'/></group><group desc='%7'><program name='cdrecord'/><program name='cdrdao'/></group></programs>"; + + ArsonProgramPage::ArsonProgramPage (ArsonConfig &config, ArsonConfigDlg *pd, QWidget *parent) + : ArsonProgramPageBase(parent), ArsonConfigPage(config), + |