summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2008-07-05 06:58:53 +0000
committerSamuli Suominen <drac@gentoo.org>2008-07-05 06:58:53 +0000
commitbe24250a2e79cb5e5874288777155eabc5344560 (patch)
treea3b07be639d99e74f0b3092734c77f0c8c709ab8
parentfix ChangeLog header (diff)
downloadgentoo-2-be24250a2e79cb5e5874288777155eabc5344560.tar.gz
gentoo-2-be24250a2e79cb5e5874288777155eabc5344560.tar.bz2
gentoo-2-be24250a2e79cb5e5874288777155eabc5344560.zip
Fix default configuration layout (upstream), thanks to Emil Karlson and Silvence, bug 230395.
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc3 x86_64)
-rw-r--r--media-sound/moc/ChangeLog8
-rw-r--r--media-sound/moc/files/moc-2.5.0_alpha3-fix_default_configuration_layout.patch13
-rw-r--r--media-sound/moc/moc-2.5.0_alpha3-r2.ebuild5
3 files changed, 23 insertions, 3 deletions
diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index 262ad4926770..928a35a5f7a6 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-sound/moc
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.57 2008/05/08 18:27:17 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.58 2008/07/05 06:58:53 drac Exp $
+
+ 05 Jul 2008; Samuli Suominen <drac@gentoo.org>
+ +files/moc-2.5.0_alpha3-fix_default_configuration_layout.patch,
+ moc-2.5.0_alpha3-r2.ebuild:
+ Fix default configuration layout (upstream), thanks to Emil Karlson and
+ Silvence, bug 230395.
*moc-2.5.0_alpha3-r2 (08 May 2008)
diff --git a/media-sound/moc/files/moc-2.5.0_alpha3-fix_default_configuration_layout.patch b/media-sound/moc/files/moc-2.5.0_alpha3-fix_default_configuration_layout.patch
new file mode 100644
index 000000000000..3818e127747c
--- /dev/null
+++ b/media-sound/moc/files/moc-2.5.0_alpha3-fix_default_configuration_layout.patch
@@ -0,0 +1,13 @@
+Index: interface_elements.c
+===================================================================
+--- interface_elements.c (revision 2091)
++++ interface_elements.c (revision 2092)
+@@ -736,7 +736,7 @@
+ const int max)
+ {
+ long v;
+- const char *e;
++ const char *e = fmt;
+
+ if (!strncasecmp(fmt, "FILL", sizeof("FILL") - 1)) {
+ *val = LAYOUT_SIZE_FILL;
diff --git a/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild b/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild
index ae8c9afaeb6b..776602b64d32 100644
--- a/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild
+++ b/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild,v 1.1 2008/05/08 18:27:17 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild,v 1.2 2008/07/05 06:58:53 drac Exp $
inherit autotools eutils
@@ -45,7 +45,8 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/${P}-faad2.patch \
"${FILESDIR}"/${P}-ffmpegheaders.patch \
- "${FILESDIR}"/${P}-libtool22.patch
+ "${FILESDIR}"/${P}-libtool22.patch \
+ "${FILESDIR}"/${P}-fix_default_configuration_layout.patch
cp -f "${WORKDIR}"/m4/* m4/
AT_M4DIR="m4" eautoreconf
}