diff options
| -rw-r--r-- | app-cdr/cdrdao/ChangeLog | 7 | ||||
| -rw-r--r-- | app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild | 17 | ||||
| -rw-r--r-- | app-cdr/cdrdao/cdrdao-1.1.9.ebuild | 16 | ||||
| -rw-r--r-- | app-cdr/cdrdao/files/cdrdao-Project.h-gcc3.4.patch | 25 |
4 files changed, 44 insertions, 21 deletions
diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog index f32f63fbe319..02b0ad5f07b0 100644 --- a/app-cdr/cdrdao/ChangeLog +++ b/app-cdr/cdrdao/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-cdr/cdrdao # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.52 2004/10/31 01:18:43 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.53 2004/11/04 05:16:51 morfic Exp $ + + 03 Nov 2004; Daniel Goller <morfic@gentoo.org> + +files/cdrdao-Project.h-gcc3.4.patch, cdrdao-1.1.8-r1.ebuild, + cdrdao-1.1.9.ebuild: + Fixed 1.1.8-r1 and 1.1.9 for USE=gnome and gcc 3.4 31 Oct 2004; Lars Weiler <pylon@gentoo.org> -cdrdao-1.1.5-r1.ebuild, -cdrdao-1.1.7-r2.ebuild, -cdrdao-1.1.7.ebuild, cdrdao-1.1.8-r1.ebuild, diff --git a/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild index 336ca6385f1a..5f0924cfb19a 100644 --- a/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild +++ b/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild,v 1.11 2004/10/31 01:18:43 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild,v 1.12 2004/11/04 05:16:51 morfic Exp $ inherit flag-o-matic eutils gcc @@ -26,18 +26,15 @@ DEPEND=">=dev-util/pccts-1.33.24-r1 >=sys-apps/sed-4" src_unpack() { - if ([ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] && use gnome); then - eerror "xdao current will not compile using gcc 3.4. in order to compile" - eerror "and install cdrdao, you will have to USE="-gnome". a simple way" - eerror "to do this via portage is to:" - einfo "mkdir -p /etc/portage" - einfo "echo \"app-cdr/cdrdao -gnome\" >> /etc/portage/package.use" - die "xdao wont compile using gcc 3.4" - fi unpack ${A} - cd ${S} + + #apply patch to allow xdao to be compiled with gcc3.4 + if ([ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] && use gnome); then + epatch ${FILESDIR}/cdrdao-Project.h-gcc3.4.patch + fi + epatch ${FILESDIR}/${PV}-gcc34.patch # Add gentoo to version diff --git a/app-cdr/cdrdao/cdrdao-1.1.9.ebuild b/app-cdr/cdrdao/cdrdao-1.1.9.ebuild index f5b2bbb0fd2e..9f24a5fb60f4 100644 --- a/app-cdr/cdrdao/cdrdao-1.1.9.ebuild +++ b/app-cdr/cdrdao/cdrdao-1.1.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.9.ebuild,v 1.5 2004/10/31 01:18:43 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.9.ebuild,v 1.6 2004/11/04 05:16:51 morfic Exp $ inherit flag-o-matic eutils gcc @@ -25,19 +25,15 @@ DEPEND=">=dev-util/pccts-1.33.24-r1 ${RDEPEND}" src_unpack() { - if ([ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] && use gnome); then - eerror "xdao current will not compile using gcc 3.4. in order to compile" - eerror "and install cdrdao, you will have to USE="-gnome". a simple way" - eerror "to do this via portage is to:" - einfo "mkdir -p /etc/portage" - einfo "echo \"app-cdr/cdrdao -gnome\" >> /etc/portage/package.use" - die "xdao wont compile using gcc 3.4" - fi unpack ${A} - cd ${S} + #apply patch to allow xdao to be compiled with gcc3.4 + if ([ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] && use gnome); then + epatch ${FILESDIR}/cdrdao-Project.h-gcc3.4.patch + fi + # Add gentoo to version sed -i -e "s:^PACKAGE_STRING='cdrdao 1.1.9':PACKAGE_STRING='cdrdao 1.1.9 gentoo':" configure diff --git a/app-cdr/cdrdao/files/cdrdao-Project.h-gcc3.4.patch b/app-cdr/cdrdao/files/cdrdao-Project.h-gcc3.4.patch new file mode 100644 index 000000000000..2c6b606338cd --- /dev/null +++ b/app-cdr/cdrdao/files/cdrdao-Project.h-gcc3.4.patch @@ -0,0 +1,25 @@ +--- xdao/Project.h.orig 2004-11-03 22:45:18.272202304 -0600 ++++ xdao/Project.h 2004-11-03 22:45:28.360668624 -0600 +@@ -51,20 +51,20 @@ + virtual void createToolbar() = 0; + virtual void createStatusbar(); + void updateWindowTitle(); +- void saveProject(); + void saveAsProject(); + Gtk::FileSelection *saveFileSelector_; + void saveFileSelectorOKCB(); + void saveFileSelectorCancelCB(); + + virtual bool on_delete_event(GdkEventAny *event); +- virtual void recordToc2CD() = 0; + virtual void projectInfo() = 0; + + public: + Project(); + ++ void saveProject(); + void readToc(char *name); ++ virtual void recordToc2CD() = 0; + void statusMessage(const char *fmt, ...); + void tocBlockedMsg(const char *); + virtual bool closeProject() = 0; |