Be compatible with newer glib and more future-proof in the old versions as well, bug 210657

Package-Manager: portage-2.1.4.4

6 files changed, 58 insertions, 13 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 47c0783a57c3..a14606a0f187 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,11 @@
 # 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.151 2008/03/15 17:33:18 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.152 2008/03/17 02:13:58 leio Exp $
+
+  17 Mar 2008; Mart Raudsepp <leio@gentoo.org> gtkhtml-3.2.5.ebuild,
+  gtkhtml-3.6.2.ebuild, gtkhtml-3.14.3.ebuild, gtkhtml-3.14.3-r1.ebuild:
+  Be compatible with newer glib and more future-proof in the old versions as
+  well, bug 210657
 
   15 Mar 2008; Mart Raudsepp <leio@gentoo.org> gtkhtml-3.16.3.ebuild:
   Be compatible with newer glib, bug 210657
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 9a873173d7a3..53e1f622cb81 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -18,17 +18,17 @@ DIST libgtkhtml-2.6.3.tar.bz2 392127 RMD160 153d2f0e49f7a633e3129f625a7b705f87b0
 EBUILD gtkhtml-2.11.1.ebuild 1265 RMD160 88ad8ec288a62a28569cbadf7f5c51971e85615d SHA1 43c60a418516fbd4e16faed0fafb2f8ccb192256 SHA256 97a95ddb34071c2ec26b18cddff3a544d8306785c1aabb333bcb157bb44937f6
 EBUILD gtkhtml-2.6.3.ebuild 1250 RMD160 8559044cc5973be72385502644634cbb04b80f75 SHA1 5479f57a09555a452d0867348101b36735149c22 SHA256 b08cb348b25da20462211ea53e151072355b68aae18ae882973e6f116c5031a4
 EBUILD gtkhtml-3.12.3.ebuild 1363 RMD160 9f54d0d1baffffb777930456eda10ff9146c2dd0 SHA1 f323a7097123e338c6fdbd21a42482e8ca858047 SHA256 2d822594dbd08326428373c4c2acb7e605fae31b763d8dbea067462f71cff475
-EBUILD gtkhtml-3.14.3-r1.ebuild 1136 RMD160 37960986a9bffa7f33b8d9420f0660a69451581f SHA1 4ec553b8af5050efb1a34e04094f39f6248e6ae1 SHA256 a5dabf117638c60ffccd254f9d02d7e81de6842e5120f7e037acd3209ec9e595
-EBUILD gtkhtml-3.14.3.ebuild 975 RMD160 d6ea43ec29ac11966f0dc39479aa3091ece1ef64 SHA1 3fb298551c187b3d6970c0a8c63039fb3b81a87e SHA256 a7eb33089f2e437ec17c2646685a05bf842e8a6a99ef190c860794d10a1b6196
+EBUILD gtkhtml-3.14.3-r1.ebuild 1621 RMD160 1eefc9d58e957de534e6ef352e227d51ea2029cf SHA1 7e83a530f832f47eb5de00a344dbe2d0b913ed97 SHA256 b492670c7fb220c6b1d7a9672dccf2f7bef23799d7c7243c4584dc8b7c9df4e2
+EBUILD gtkhtml-3.14.3.ebuild 1460 RMD160 ef887595a575c577edd5ba5369f01951af921ea1 SHA1 52df261dc57729ecc3a54e12840aa9a0a5b812ef SHA256 e92cad55b3689eadb90ebe8e16d527b25df2ed79fb6d4bf8b1db3a6751f4a655
 EBUILD gtkhtml-3.16.3.ebuild 1432 RMD160 337ca338a8bc0cca84609538e4bb8459fc162fd5 SHA1 de432aa40970d7b734d61b8c9a3f5b533c749b20 SHA256 b0437aef0ba2844b6abf40131909bd0a934e86dd74face65b2eba5741b04cf21
-EBUILD gtkhtml-3.2.5.ebuild 1163 RMD160 d1891c353779fd56c9ed97c3363a339ce28963d4 SHA1 b972a6d5c86b510c30c3bc0d0af6a58583e17d88 SHA256 9d539f6bbcf6f98b869ac2a10e274e43f98236648b92feecba590f0ffa950ecf
-EBUILD gtkhtml-3.6.2.ebuild 1111 RMD160 fc2b70311170902fa9c8b6a9592007fb08dd589b SHA1 b1b008def0414a8282711086a14a94a0bcf1979f SHA256 c7995f9e64724d1a392f3d798ceff58f264a7352db2aa2f22afc02f9f6983996
-MISC ChangeLog 20941 RMD160 55b5432d248f3d0745d6e686ea6043f2d70be4d6 SHA1 66812501c22dc2c96c4e5a2d257ab634b2c8d6b4 SHA256 339faf4049e290d1e1536552a41f130682e8739146d22b308b8116ab62da8f87
+EBUILD gtkhtml-3.2.5.ebuild 1609 RMD160 f247f183a31d56f81345372eff93525aed6aba70 SHA1 e779c0a9452416decf69563066a74d86a7d0d200 SHA256 064ad9d14d4db9a4f7927793e1ed82e129f949c9e20fe0033bff7e3278464111
+EBUILD gtkhtml-3.6.2.ebuild 1558 RMD160 691ae09fae87f310b0f0211ec47a3ee531ac926c SHA1 d37e5ec644bbe8ae9712b3e52fb66f692a9bc0ce SHA256 f9b45b3411e345c4b41ead10b478385fce264bfff4c1c8629538ebe1de434a0d
+MISC ChangeLog 21180 RMD160 9b0c04393d775798296a8375174ea472b47c794f SHA1 24cdf593dcf9e2c1d26b88e7b9240b7f1b2063ef SHA256 36476d45509b5d72d775569ac2bc3f01d024908b59e2d5f9fb78d5b710939874
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkfcCGgACgkQkeYb6olFHJei4wCgvV9VVaP3ACFbpfNvpCbbxYUW
-V9oAnjja0l5D964Dg8fHbb+w3HQRgRid
-=xfaP
+iEYEARECAAYFAkfd0+oACgkQkeYb6olFHJcUugCgoHrHGnQlfruiOUZeYtc9Jt13
+o10An1xUQTSzrCGKMbeUZv9yDSq2DAMM
+=idvy
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild
index 83cf130bca28..63dfb2aedc00 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.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.14.3-r1.ebuild,v 1.9 2008/01/29 18:13:06 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3-r1.ebuild,v 1.10 2008/03/17 02:13:58 leio Exp $
 EAPI="1"
 
 inherit gnome2 eutils
@@ -42,3 +42,15 @@ src_unpack() {
 	# A fix for a html_object_get_left_margin related crashes
 	epatch "${FILESDIR}/${P}-get_left_margin-fix.patch"
 }
+
+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"
+}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild
index 9a32c19a79b1..62dd0de354ee 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.14.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.14.3.ebuild,v 1.9 2008/01/29 18:13:06 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild,v 1.10 2008/03/17 02:13:58 leio Exp $
 EAPI="1"
 
 inherit gnome2
@@ -35,3 +35,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"
+}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
index 524694351ef7..40e709d0f2ad 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.2.5.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.2.5.ebuild,v 1.10 2008/01/30 12:23:13 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild,v 1.11 2008/03/17 02:13:58 leio Exp $
 EAPI="1"
 
 inherit gnome2 eutils
@@ -41,4 +41,12 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-3.2-i18n.patch" || die "gettext fix"
 	# bug 193458
 	epatch "${FILESDIR}/${PN}-3.2-gi18n.patch" || die
+
+	# 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"
 }
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild
index ef40b2bd0712..733775b2a778 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.6.2.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.6.2.ebuild,v 1.8 2008/01/29 18:13:06 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild,v 1.9 2008/03/17 02:13:58 leio Exp $
 EAPI="1"
 
 inherit gnome2 eutils
@@ -42,4 +42,12 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-fbsd.patch"
+
+	# 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"
 }