summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Dawson <pkdawson@gentoo.org>2004-10-05 00:05:56 +0000
committerPatrick Dawson <pkdawson@gentoo.org>2004-10-05 00:05:56 +0000
commitf22992bf66ff053976ded843dbb0f615ba74d19b (patch)
tree118c88836e106f801de4bb7e05dbcef2974d334a
parentadded gnustep-libs/smbkit package; gworkspace can now depend on samba/smbkit;... (diff)
downloadgentoo-2-f22992bf66ff053976ded843dbb0f615ba74d19b.tar.gz
gentoo-2-f22992bf66ff053976ded843dbb0f615ba74d19b.tar.bz2
gentoo-2-f22992bf66ff053976ded843dbb0f615ba74d19b.zip
gcc-3.4 fix
-rw-r--r--media-video/dvdstyler/ChangeLog6
-rw-r--r--media-video/dvdstyler/dvdstyler-1.05-r1.ebuild3
-rw-r--r--media-video/dvdstyler/files/1.05-gcc34.patch21
3 files changed, 28 insertions, 2 deletions
diff --git a/media-video/dvdstyler/ChangeLog b/media-video/dvdstyler/ChangeLog
index 02282eda2b32..30f109799664 100644
--- a/media-video/dvdstyler/ChangeLog
+++ b/media-video/dvdstyler/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/dvdstyler
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.3 2004/08/05 01:50:43 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.4 2004/10/05 00:05:56 pkdawson Exp $
+
+ 04 Oct 2004; Patrick Dawson <pkdawson@gentoo.org> +files/1.05-gcc34.patch,
+ dvdstyler-1.05-r1.ebuild:
+ gcc-3.4 fix, closes bug #65983.
*dvdstyler-1.05-r1 (05 Aug 2004)
diff --git a/media-video/dvdstyler/dvdstyler-1.05-r1.ebuild b/media-video/dvdstyler/dvdstyler-1.05-r1.ebuild
index 59ca01cbeb13..e9622b3e24b3 100644
--- a/media-video/dvdstyler/dvdstyler-1.05-r1.ebuild
+++ b/media-video/dvdstyler/dvdstyler-1.05-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/media-video/dvdstyler/dvdstyler-1.05-r1.ebuild,v 1.1 2004/08/05 01:50:43 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.05-r1.ebuild,v 1.2 2004/10/05 00:05:56 pkdawson Exp $
inherit eutils
@@ -48,6 +48,7 @@ src_unpack() {
unpack ${A}
epatch ${FILESDIR}/${PV}-AutoMakefile.patch
epatch ${FILESDIR}/${PV}-code.patch
+ epatch ${FILESDIR}/${PV}-gcc34.patch
sed -i -e "s:-O3::g" -e "s:wxXML/expat/Makefile::g" ${S}/configure.in ${S}/configure
cd ${S}
diff --git a/media-video/dvdstyler/files/1.05-gcc34.patch b/media-video/dvdstyler/files/1.05-gcc34.patch
new file mode 100644
index 000000000000..b50642df3946
--- /dev/null
+++ b/media-video/dvdstyler/files/1.05-gcc34.patch
@@ -0,0 +1,21 @@
+diff -ur DVDStyler-1.05.orig/src/Config.h DVDStyler-1.05/src/Config.h
+--- DVDStyler-1.05.orig/src/Config.h 2004-10-04 19:48:20.715719055 -0400
++++ DVDStyler-1.05/src/Config.h 2004-10-04 19:48:57.723904668 -0400
+@@ -85,7 +85,7 @@
+
+ CONFIG_PROP(Version, _T("Version"), DEF_VERSION)
+ CONFIG_PROP(Language, _T("Interface/Language"), DEF_LANGUAGE)
+- CONFIG_PROP_INT(DefMenuFormat, _T("Interface/DefMenuFormat"), DEF_MENU_FORMAT)
++ CONFIG_PROP_INT(DefMenuFormat, _T("Interface/DefMenuFormat"), (long)DEF_MENU_FORMAT)
+ CONFIG_PROP(LogFile, _T("Generate/LogFile"), DEF_LOG_FILE)
+ CONFIG_PROP(GenerateTemp, _T("Generate/TempDir"), DEF_GEN_TEMP_DIR)
+ CONFIG_PROP(Jpeg2MpegCmd, _T("Generate/Jpeg2MpegCmd"), DEF_JPEG2MPEG_CMD)
+@@ -99,7 +99,7 @@
+ CONFIG_PROP_BOOL(PreviewDo, _T("Preview/Do"), DEF_PREVIEW_DO)
+ CONFIG_PROP(PreviewCmd, _T("Preview/Cmd"), DEF_PREVIEW_CMD)
+
+- CONFIG_PROP_BOOL(IsoDo, _T("Iso/Do"), DEF_ISO_DO)
++ CONFIG_PROP_BOOL(IsoDo, _T("Iso/Do"), (long)DEF_ISO_DO)
+ CONFIG_PROP(IsoCmd, _T("Iso/Cmd"), DEF_ISO_CMD)
+ CONFIG_PROP(IsoSaveTo, _T("Iso/SaveTo"), DEF_ISO_SAVETO)
+