summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2008-03-15 17:33:18 +0000
committerMart Raudsepp <leio@gentoo.org>2008-03-15 17:33:18 +0000
commit97d16233025cee32f02b6fcd53ea6bfe97d9372d (patch)
tree340d3b30882e176e9fa8d9d046574b77a4b5e422 /gnome-extra
parentMasked sci-electronics/lard for removal in 30 days. (diff)
downloadgentoo-2-97d16233025cee32f02b6fcd53ea6bfe97d9372d.tar.gz
gentoo-2-97d16233025cee32f02b6fcd53ea6bfe97d9372d.tar.bz2
gentoo-2-97d16233025cee32f02b6fcd53ea6bfe97d9372d.zip
Be compatible with newer glib, bug 210657
(Portage version: 2.1.4.4)
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/gtkhtml/ChangeLog5
-rw-r--r--gnome-extra/gtkhtml/gtkhtml-3.16.3.ebuild14
2 files changed, 17 insertions, 2 deletions
diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 2f0d5306cdaa..47c0783a57c3 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for gnome-extra/gtkhtml
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.150 2008/03/07 22:23:46 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.151 2008/03/15 17:33:18 leio Exp $
+
+ 15 Mar 2008; Mart Raudsepp <leio@gentoo.org> gtkhtml-3.16.3.ebuild:
+ Be compatible with newer glib, bug 210657
07 Mar 2008; Christoph Mende <angelos@gentoo.org> gtkhtml-2.11.1.ebuild:
Stable on amd64, bug #207154
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.16.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.16.3.ebuild
index 164ea7cb41f6..440a2d038ac1 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.16.3.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.16.3.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/gnome-extra/gtkhtml/gtkhtml-3.16.3.ebuild,v 1.8 2008/02/04 04:32:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.16.3.ebuild,v 1.9 2008/03/15 17:33:18 leio Exp $
EAPI="1"
inherit gnome2
@@ -33,3 +33,15 @@ pkg_setup() {
ELTCONF="--reverse-deps"
G2CONF="$(use_enable static) --enable-file-chooser"
}
+
+src_unpack() {
+ gnome2_src_unpack
+
+ # Fix deprecated API disabling in used glib library - this is not future-proof, bug 210657
+ sed -i -e '/G_DISABLE_DEPRECATED/d' \
+ "${S}/src/Makefile.am" "${S}/src/Makefile.in" \
+ "${S}/components/html-editor/Makefile.am" "${S}/components/html-editor/Makefile.in"
+
+ sed -i -e 's:-DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1::g' \
+ "${S}/a11y/Makefile.am" "${S}/a11y/Makefile.in"
+}