summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2008-01-20 14:22:04 +0000
committerSamuli Suominen <drac@gentoo.org>2008-01-20 14:22:04 +0000
commitf4790b48be65df5e1423dc90bf7595f25c26584f (patch)
treed26907294ee256ba2faa04fa1b66f7fbb9d12fe3 /media-sound/bmpx
parentMarking libassuan-1.0.4 ppc64 for bug 206683 (diff)
downloadgentoo-2-f4790b48be65df5e1423dc90bf7595f25c26584f.tar.gz
gentoo-2-f4790b48be65df5e1423dc90bf7595f25c26584f.tar.bz2
gentoo-2-f4790b48be65df5e1423dc90bf7595f25c26584f.zip
fix build
(Portage version: 2.1.4)
Diffstat (limited to 'media-sound/bmpx')
-rw-r--r--media-sound/bmpx/ChangeLog7
-rw-r--r--media-sound/bmpx/bmpx-0.40.13.ebuild10
-rw-r--r--media-sound/bmpx/files/bmpx-0.40.13-const-gchar.patch12
3 files changed, 26 insertions, 3 deletions
diff --git a/media-sound/bmpx/ChangeLog b/media-sound/bmpx/ChangeLog
index 09cc85e6d1d0..a850aa3dfa47 100644
--- a/media-sound/bmpx/ChangeLog
+++ b/media-sound/bmpx/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/bmpx
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/ChangeLog,v 1.72 2008/01/20 13:49:25 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/ChangeLog,v 1.73 2008/01/20 14:22:03 drac Exp $
+
+ 20 Jan 2008; Samuli Suominen <drac@gentoo.org>
+ +files/bmpx-0.40.13-const-gchar.patch, bmpx-0.40.13.ebuild:
+ Replace gchar with const gchar to build again wrt #206488, thanks to
+ beigetangerine.
20 Jan 2008; Samuli Suominen <drac@gentoo.org>
-files/bmpx-0.40.10-boost-m4.patch, -bmpx-0.40.10.ebuild,
diff --git a/media-sound/bmpx/bmpx-0.40.13.ebuild b/media-sound/bmpx/bmpx-0.40.13.ebuild
index 87b6e1d8664a..682c0ecbb347 100644
--- a/media-sound/bmpx/bmpx-0.40.13.ebuild
+++ b/media-sound/bmpx/bmpx-0.40.13.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/bmpx-0.40.13.ebuild,v 1.2 2008/01/20 13:49:25 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/bmpx-0.40.13.ebuild,v 1.3 2008/01/20 14:22:03 drac Exp $
-inherit fdo-mime gnome2-utils versionator
+inherit eutils fdo-mime gnome2-utils versionator
MY_PR="$(get_version_component_range 1-2 ${PV})"
@@ -48,6 +48,12 @@ DEPEND="${RDEPEND}
>=x11-proto/xproto-7.0.10
doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt )"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-const-gchar.patch
+}
+
src_compile() {
econf --with-tr1 --enable-ld-workaround \
$(use_enable modplug) \
diff --git a/media-sound/bmpx/files/bmpx-0.40.13-const-gchar.patch b/media-sound/bmpx/files/bmpx-0.40.13-const-gchar.patch
new file mode 100644
index 000000000000..548bf545304f
--- /dev/null
+++ b/media-sound/bmpx/files/bmpx-0.40.13-const-gchar.patch
@@ -0,0 +1,12 @@
+diff -ur bmpx-0.40.13.orig/src/sanity.cc bmpx-0.40.13/src/sanity.cc
+--- bmpx-0.40.13.orig/src/sanity.cc 2007-10-18 20:17:08.000000000 +0300
++++ bmpx-0.40.13/src/sanity.cc 2008-01-20 16:07:27.000000000 +0200
+@@ -69,7 +69,7 @@
+ }
+
+ C_FUNCTION
+-gchar *
++const gchar *
+ sanity_check_gtk (void)
+ {
+ return gtk_check_version (GTK_REQUIRED_MAJOR_VER,