summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Weiler <pylon@gentoo.org>2004-01-23 11:50:57 +0000
committerLars Weiler <pylon@gentoo.org>2004-01-23 11:50:57 +0000
commit361f947ddd274e7847ba39d68aecdc39452800a4 (patch)
tree9af36662a208d49b7eb406d728e0e02698b03f7e /app-cdr
parentVersion bump (diff)
downloadgentoo-2-361f947ddd274e7847ba39d68aecdc39452800a4.tar.gz
gentoo-2-361f947ddd274e7847ba39d68aecdc39452800a4.tar.bz2
gentoo-2-361f947ddd274e7847ba39d68aecdc39452800a4.zip
Inserted upstream-patch for amd64. See bug #36676.
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/xcdroast/ChangeLog3
-rw-r--r--app-cdr/xcdroast/Manifest5
-rw-r--r--app-cdr/xcdroast/files/64bit_gsize.patch20
-rw-r--r--app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild3
4 files changed, 28 insertions, 3 deletions
diff --git a/app-cdr/xcdroast/ChangeLog b/app-cdr/xcdroast/ChangeLog
index 56eec52a3e26..85c399e8a41a 100644
--- a/app-cdr/xcdroast/ChangeLog
+++ b/app-cdr/xcdroast/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
# /space/gentoo/cvsroot/gentoo-x86/app-cdr/xcdroast/ChangeLog,v 1.7 2002/06/05 02:39:55 lostlogic Exp
+ 23 Jan 2004; Lars Weiler <pylon@gentoo.org> xcdroast-0.98_alpha15-r3.ebuild:
+ Inserted upstream-patch for amd64. See bug #36676.
+
*xcdroast-0.98_alpha15-r3 (17 Jan 2004)
17 Jan 2004; Lars Weiler <pylon@gentoo.org> xcdroast-0.98_alpha15-r2.ebuild,
diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
index f25cdae1f187..cdba69b91a18 100644
--- a/app-cdr/xcdroast/Manifest
+++ b/app-cdr/xcdroast/Manifest
@@ -1,8 +1,9 @@
-MD5 5ce891e397b756564633827f7471dac9 ChangeLog 6262
+MD5 d93ab686f2c7f720bcb174cdd340c1f4 ChangeLog 6396
MD5 af9852b249b8e0fab9bd0d55dbea4455 metadata.xml 400
MD5 a5fa515dfcd61de15821f076abb535e8 xcdroast-0.98_alpha15-r2.ebuild 2915
-MD5 feeb216e60b689be5879213294183425 xcdroast-0.98_alpha15-r3.ebuild 2638
+MD5 15d01f031fcadc09d7d9b4270886a7e2 xcdroast-0.98_alpha15-r3.ebuild 2689
MD5 cea69309a5dc72515300ef5bd2c898f8 files/digest-xcdroast-0.98_alpha15-r2 335
MD5 ccb3a30dc25ffa6c7d78b64ea8cb7f75 files/gtk2locale.patch 643
MD5 26768959e3621b77b59f887551742eba files/xcdroast-0.98alpha15-dvd.patch 15532
MD5 c74d0c61a25d9eefcba4401b5ffdfa0d files/digest-xcdroast-0.98_alpha15-r3 159
+MD5 338ab17aa57cc9e59e4c27a511a3371c files/64bit_gsize.patch 471
diff --git a/app-cdr/xcdroast/files/64bit_gsize.patch b/app-cdr/xcdroast/files/64bit_gsize.patch
new file mode 100644
index 000000000000..eecec78bd8ca
--- /dev/null
+++ b/app-cdr/xcdroast/files/64bit_gsize.patch
@@ -0,0 +1,20 @@
+--- xtools.c.org 2003-11-06 11:19:10.000000000 +0100
++++ xtools.c2 2004-01-04 14:48:09.000000000 +0100
+@@ -3635,7 +3635,7 @@
+ return str;
+ #else
+ gchar *locstr;
+-gint in, out;
++gsize in, out;
+
+ locstr = g_locale_from_utf8(str, strlen(str), &in, &out, NULL);
+ if (locstr) {
+@@ -3655,7 +3655,7 @@
+ return str;
+ #else
+ gchar *locstr;
+-gint in, out;
++gsize in, out;
+
+ /* ok, if your filesystem is already UTF8 we are not
+ allowed to change the filenames here. */
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild
index 6cf01f7a4c92..57eeba104897 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild,v 1.2 2004/01/21 02:55:38 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild,v 1.3 2004/01/23 11:50:57 pylon Exp $
inherit eutils
@@ -35,6 +35,7 @@ src_unpack() {
cd ${S}/src
use gtk2 && epatch ${FILESDIR}/gtk2locale.patch
+ use amd64 && epatch ${FILESDIR}/64bit_gsize.patch
}
src_compile() {