Be compatible with newer glib, bug 210657

Package-Manager: portage-2.1.4.4

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 2f0d5306cdaa9225a8647bcadf1375d450ed0792..47c0783a57c3c9c8030f4040f75bb01bd71bc831 100644 (file)
--- 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/Manifest b/gnome-extra/gtkhtml/Manifest
index 3721214da3b5b23548dcf71c0a97be4339a856ac..9a873173d7a3174749349f31fd4dfd4c4a81647b 100644 (file)
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -20,15 +20,15 @@ EBUILD gtkhtml-2.6.3.ebuild 1250 RMD160 8559044cc5973be72385502644634cbb04b80f75
 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.16.3.ebuild 947 RMD160 0997485f28f241a516c51f93fabb663c067a9f5d SHA1 4a882fcdc1cc3d0f21d17800f14340653199a05c SHA256 18034e83548ad5065d02bed674dc60b03072bf837d4608e716e8a1c7c555fc3a
+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 20829 RMD160 d1e0ec0975f9058b2270b78379c74f9cddfb5028 SHA1 e1bb56f720f754b0d743ee860813df821dddbbe6 SHA256 4ade692ec824b588ec8927898800aa81439df2d25f91449d26d454bd68f6789a
+MISC ChangeLog 20941 RMD160 55b5432d248f3d0745d6e686ea6043f2d70be4d6 SHA1 66812501c22dc2c96c4e5a2d257ab634b2c8d6b4 SHA256 339faf4049e290d1e1536552a41f130682e8739146d22b308b8116ab62da8f87
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFH0cB4KhnDs22gwa8RAr7SAJ9AQQtkZKzh0t6wNwEwOLY5tkaenQCfS/Jo
-ORTtegMgsCWLi9zcaPgIVzA=
-=y9o8
+iEYEARECAAYFAkfcCGgACgkQkeYb6olFHJei4wCgvV9VVaP3ACFbpfNvpCbbxYUW
+V9oAnjja0l5D964Dg8fHbb+w3HQRgRid
+=xfaP
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/gtkhtml/gtkhtml-3.16.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.16.3.ebuild
index 164ea7cb41f6825306db0df40a40141501f6a835..440a2d038ac1c50bca91f7d333eb8bb7261a2909 100644 (file)
--- 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"
+}