From: Daniel Goller Date: Thu, 4 Nov 2004 05:16:51 +0000 (+0000) Subject: Fixed 1.1.8-r1 and 1.1.9 for USE=gnome and gcc 3.4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0134166e1b78edb55fb83cf37e66167ee19d8995;p=gentoo.git Fixed 1.1.8-r1 and 1.1.9 for USE=gnome and gcc 3.4 --- 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 + +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 -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/Manifest b/app-cdr/cdrdao/Manifest index 4029ff49d5d0..4812cfd4783d 100644 --- a/app-cdr/cdrdao/Manifest +++ b/app-cdr/cdrdao/Manifest @@ -1,28 +1,19 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 68fe0f45cedbcce80d324390503b33c5 ChangeLog 7257 +MD5 26f576efab51d88dbcf3b3b3005f2061 cdrdao-1.1.8-r1.ebuild 2183 +MD5 5107216fa0ff39009639e99cc026fbb0 cdrdao-1.1.9.ebuild 2019 MD5 d87b0cbda90a7fdf26ae63d7782d7e76 cdrdao-1.1.7-r3.ebuild 3007 -MD5 bab69ebf527bd1791f4969f30c35cb38 metadata.xml 417 MD5 df255d82a3e8056cf504461d0ff38275 cdrdao-1.1.8.ebuild 1830 -MD5 8599aaeb31bfe0b4482f233920201969 cdrdao-1.1.8-r1.ebuild 2408 -MD5 25582edee462d879d7185cb042b65699 cdrdao-1.1.9.ebuild 2245 -MD5 3ea011fa1308fc478529300a80443aab files/cdrdao-1.1.5-c++.patch 1622 -MD5 3a9cce439930ba175e84bf2b82c61df5 files/cdrdao-1.1.5-gentoo.diff 19479 -MD5 46fb619628173aa68a337e7d49dd25b6 files/cdrdao-1.1.7-gentoo-version.patch 753 +MD5 88551890f9cab21766ceb685af4b5458 ChangeLog 7448 +MD5 bab69ebf527bd1791f4969f30c35cb38 metadata.xml 417 MD5 4982087a6a964cb6f399cef0b52ab638 files/digest-cdrdao-1.1.8 65 +MD5 2c45c0fc635b97b04317d564cb810c41 files/digest-cdrdao-1.1.9 65 +MD5 6f398aabdbd1ed1aa966f460fdbac3d2 files/1.1.8-gcc34.patch 10476 +MD5 3ea011fa1308fc478529300a80443aab files/cdrdao-1.1.5-c++.patch 1622 +MD5 af6e60d9309156e8c64fafebfdd79e97 files/cdrdao-1.1.8-cast.patch 351 +MD5 1fd823e821f7407e5a49d410b1cf238a files/cdrdao-1.1.9-cast.patch 347 MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff 779 MD5 bfcab12a6211829eb71aa6ee3d0245be files/gcdmaster.desktop 127 +MD5 46fb619628173aa68a337e7d49dd25b6 files/cdrdao-1.1.7-gentoo-version.patch 753 +MD5 26ca1675cea490f4807b4f365b923d51 files/cdrdao-Project.h-gcc3.4.patch 753 +MD5 3a9cce439930ba175e84bf2b82c61df5 files/cdrdao-1.1.5-gentoo.diff 19479 MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r3 69 MD5 4982087a6a964cb6f399cef0b52ab638 files/digest-cdrdao-1.1.8-r1 65 -MD5 6f398aabdbd1ed1aa966f460fdbac3d2 files/1.1.8-gcc34.patch 10476 -MD5 af6e60d9309156e8c64fafebfdd79e97 files/cdrdao-1.1.8-cast.patch 351 -MD5 1fd823e821f7407e5a49d410b1cf238a files/cdrdao-1.1.9-cast.patch 347 -MD5 2c45c0fc635b97b04317d564cb810c41 files/digest-cdrdao-1.1.9 65 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) - -iD8DBQFBhHDtHTu7gpaalycRAjLmAJwOSh48A3sGRhv67PPFjAKVxrTnHgCg9HZW -sv8/XsHqAo7MqA1192KJMIM= -=8OYZ ------END PGP SIGNATURE----- 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;