projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6b71171)
Don't set G_DISABLE_DEPRECATED; it breaks builds
authorDaniel Gryniewicz <dang@gentoo.org>
Wed, 5 Mar 2008 00:59:56 +0000 (00:59 +0000)
committerDaniel Gryniewicz <dang@gentoo.org>
Wed, 5 Mar 2008 00:59:56 +0000 (00:59 +0000)
Package-Manager: portage-2.1.4.4

gnome-extra/gtkhtml/ChangeLog patch | blob | history
gnome-extra/gtkhtml/Manifest patch | blob | history
gnome-extra/gtkhtml/files/gtkhtml-3.12.3-allow-deprecated.patch [new file with mode: 0644] patch | blob
gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild patch | blob | history

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 61b5639e500bf0c5e776600455fcb9064440604a..38e0319230aad6d1ded1b51d41ef1ca483c6ee63 100644 (file)
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,10 @@
 # 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.148 2008/02/04 04:32:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.149 2008/03/05 00:59:56 dang Exp $
+
+  05 Mar 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gtkhtml-3.12.3-allow-deprecated.patch, gtkhtml-3.12.3.ebuild:
+  Don't set G_DISABLE_DEPRECATED; it breaks builds
 
   04 Feb 2008; Jeroen Roovers <jer@gentoo.org> gtkhtml-3.16.3.ebuild:
   Stable for HPPA (bug #208366).
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index c25d3ead92642c54c6fc8cb81796798549c7aff0..37955624c98719c538e5632f8c7a4479be5858fb 100644 (file)
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gtkhtml-3.0.10-no-extern-cluealigned.diff 423 RMD160 9d1018a40aabae678306c0a62421d2102c9d8c29 SHA1 c542562df8491cd3d90ed1a713bd98fd46919ea0 SHA256 d618e6c7b1fe7bd49a344c8de8b34aee49dbbbd2ea667b2d30bb8d0bfe7aed2c
+AUX gtkhtml-3.12.3-allow-deprecated.patch 3692 RMD160 69b435430e50024ec6f806300b6d394075cb0a08 SHA1 b5a0c94e0904b3111ed49e4743a5986b5bb90137 SHA256 0f0ff710a473a0867615badc396b499385c0ba3a48947c934886a61366bf5af6
 AUX gtkhtml-3.14.3-get_left_margin-fix.patch 921 RMD160 a5ec7fcfc9303d6af2fd678d64b3ff7032123f83 SHA1 fabdf86dc71d36fc293491712ef249da53ba0333 SHA256 31273d61b5488296dba96f70c53fa04048718f82657eb1b8c90a72e803dfc9bc
 AUX gtkhtml-3.2-gi18n.patch 2103 RMD160 7685c7b603d425f47b9d3c4ef89fea7c389048a8 SHA1 5ef8c097e0b52d8ce272a4d73279cd4d75226daf SHA256 c86caa3617685172c775fc084dcb28872b5b660770203e4b76b35f83074fa8ce
 AUX gtkhtml-3.2-i18n.patch 1411 RMD160 27fd26f798c0294da7fee1fa26cef95546afb283 SHA1 d7f9050512d63a3a1ac4be2a3bbcdf553ca5088f SHA256 45c7763730b3a886ba6dd4b69d20cb83dcc5c918385971e48905e7ad6e8849f7
@@ -16,18 +14,11 @@ DIST libgtkhtml-2.11.1.tar.bz2 597923 RMD160 4f3a65b616c0fbfaaa487d11c8749718708
 DIST libgtkhtml-2.6.3.tar.bz2 392127 RMD160 153d2f0e49f7a633e3129f625a7b705f87b0b950 SHA1 b5022ac2faf87e79ea5a687880f5ff7081b46bf5 SHA256 c84aab9dfe4211a0aa5459d0ef4cf2bc290dfc73d0a506cb273f91b16f102e73
 EBUILD gtkhtml-2.11.1.ebuild 1266 RMD160 29abf3b3832cc5b953f73f6a3ef15aadc5e93c58 SHA1 a7e273e444e2e25763ee74384ad61a1094a0ea88 SHA256 02c3c8a2b650596c218d34c11f3b3ee08c2c2353ebeaba888b7d5328c510343f
 EBUILD gtkhtml-2.6.3.ebuild 1250 RMD160 8559044cc5973be72385502644634cbb04b80f75 SHA1 5479f57a09555a452d0867348101b36735149c22 SHA256 b08cb348b25da20462211ea53e151072355b68aae18ae882973e6f116c5031a4
-EBUILD gtkhtml-3.12.3.ebuild 1261 RMD160 dc1176e122a19b678a247bc7428f2d08da5012ef SHA1 5dd6ba6c943caa8b2eb4b0e76f8ddf0411a6fc7c SHA256 3fb2a17a63ddd622ff6846fe88d8117d13f3748b5381beb41c708944dc329572
+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.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 20544 RMD160 bf097bb18149eae711ce50b4c8ebeb837eb5fd6c SHA1 f7d3ebd1f746e64072562a747cbf2c59e5379a07 SHA256 8ba8e013b4d1b991534ee9d61e6f7acb96cef8a97c7d3818b3e1997feda9ee26
+MISC ChangeLog 20719 RMD160 47e36e003852d8cf28251186ccd99e8039cb979b SHA1 f0a1e7a18a9f089db415e4524a48669e6c569078 SHA256 addd6f28ad0710d9a16ca1714ec7ea9e25eb02491f5b9b9839e849e1c48e3c92
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkfJb5EACgkQkeYb6olFHJeazgCfapF4d+C3g1R2fMuF4Xt4ZSm4
-U34An0fDdujHhEyxua2V0GzSd8+UgqEk
-=pzFZ
------END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.12.3-allow-deprecated.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.12.3-allow-deprecated.patch
new file mode 100644 (file)
index 0000000..92d3e1d
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/gtkhtml-3.12.3-allow-deprecated.patch
@@ -0,0 +1,68 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/a11y/Makefile.am gtkhtml-3.12.3/a11y/Makefile.am
+--- gtkhtml-3.12.3.orig/a11y/Makefile.am       2007-01-29 04:51:00.000000000 -0500
++++ gtkhtml-3.12.3/a11y/Makefile.am    2008-03-04 19:56:35.000000000 -0500
+@@ -2,7 +2,7 @@ END=
+ 
+ INCLUDES = -I$(top_srcdir)/src $(GTKHTML_CFLAGS) $(I18N_LIB_CFLAGS)
+ 
+-AM_CFLAGS = $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
++AM_CFLAGS = $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
+ 
+ noinst_LTLIBRARIES = libgtkhtml-a11y.la
+ 
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/a11y/Makefile.in gtkhtml-3.12.3/a11y/Makefile.in
+--- gtkhtml-3.12.3.orig/a11y/Makefile.in       2007-01-29 10:12:48.000000000 -0500
++++ gtkhtml-3.12.3/a11y/Makefile.in    2008-03-04 19:56:38.000000000 -0500
+@@ -251,7 +251,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ END = 
+ INCLUDES = -I$(top_srcdir)/src $(GTKHTML_CFLAGS) $(I18N_LIB_CFLAGS)
+-AM_CFLAGS = $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
++AM_CFLAGS = $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
+ noinst_LTLIBRARIES = libgtkhtml-a11y.la
+ libgtkhtml_a11y_la_SOURCES = \
+       cell.h                                          \
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/components/html-editor/Makefile.am gtkhtml-3.12.3/components/html-editor/Makefile.am
+--- gtkhtml-3.12.3.orig/components/html-editor/Makefile.am     2007-01-29 04:50:53.000000000 -0500
++++ gtkhtml-3.12.3/components/html-editor/Makefile.am  2008-03-04 19:56:21.000000000 -0500
+@@ -23,7 +23,6 @@ AM_CFLAGS = \
+         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"\
+       -DGLADE_DATADIR=\"$(gladedir)\"                 \
+       -DGDK_DISABLE_DEPRECATED=1                      \
+-      -DG_DISABLE_DEPRECATED=1                        \
+       -DPREFIX=\""$(prefix)"\"                        \
+       -DSYSCONFDIR=\""$(sysconfdir)"\"                \
+       -DDATADIR=\""$(datadir)"\"                      \
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/components/html-editor/Makefile.in gtkhtml-3.12.3/components/html-editor/Makefile.in
+--- gtkhtml-3.12.3.orig/components/html-editor/Makefile.in     2007-01-29 10:12:49.000000000 -0500
++++ gtkhtml-3.12.3/components/html-editor/Makefile.in  2008-03-04 19:56:23.000000000 -0500
+@@ -325,7 +325,6 @@ AM_CFLAGS = \
+         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"\
+       -DGLADE_DATADIR=\"$(gladedir)\"                 \
+       -DGDK_DISABLE_DEPRECATED=1                      \
+-      -DG_DISABLE_DEPRECATED=1                        \
+       -DPREFIX=\""$(prefix)"\"                        \
+       -DSYSCONFDIR=\""$(sysconfdir)"\"                \
+       -DDATADIR=\""$(datadir)"\"                      \
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/src/Makefile.am gtkhtml-3.12.3/src/Makefile.am
+--- gtkhtml-3.12.3.orig/src/Makefile.am        2007-01-29 04:50:59.000000000 -0500
++++ gtkhtml-3.12.3/src/Makefile.am     2008-03-04 19:56:26.000000000 -0500
+@@ -20,7 +20,6 @@ INCLUDES =                           \
+ 
+ AM_CFLAGS =                                           \
+       -DGDK_DISABLE_DEPRECATED=1                      \
+-      -DG_DISABLE_DEPRECATED=1                        \
+       -DGNOME_DISABLE_DEPRECATED=1                    \
+       -DPREFIX=\""$(prefix)"\"                        \
+       -DLIBDIR=\""$(datadir)"\"                       \
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/src/Makefile.in gtkhtml-3.12.3/src/Makefile.in
+--- gtkhtml-3.12.3.orig/src/Makefile.in        2007-01-29 10:12:49.000000000 -0500
++++ gtkhtml-3.12.3/src/Makefile.in     2008-03-04 19:56:28.000000000 -0500
+@@ -379,7 +379,6 @@ INCLUDES = \
+ 
+ AM_CFLAGS = \
+       -DGDK_DISABLE_DEPRECATED=1                      \
+-      -DG_DISABLE_DEPRECATED=1                        \
+       -DGNOME_DISABLE_DEPRECATED=1                    \
+       -DPREFIX=\""$(prefix)"\"                        \
+       -DLIBDIR=\""$(datadir)"\"                       \
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild
index 98269a2c1851ff9f7fd819315bc0e5c103f5acc6..6fc26e73db48336fee5e8431d6fe5611057a1ff8 100644 (file)
--- a/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.12.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.12.3.ebuild,v 1.12 2008/01/29 18:13:06 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild,v 1.13 2008/03/05 00:59:56 dang Exp $
 EAPI="1"
 
 inherit gnome2 eutils
@@ -41,4 +41,6 @@ src_unpack() {
        # Fix tests. Upstream has fix in gnome 2.19 only at this time
        echo "components/html-editor/GNOME_GtkHTML_Editor-emacs.xml" >> "${S}/po/POTFILES.skip"
        echo "components/html-editor/GNOME_GtkHTML_Editor.xml" >> "${S}/po/POTFILES.skip"
+       # Don't set G_DISABLE_DEPRECATED; it breaks builds
+       epatch "${FILESDIR}"/${P}-allow-deprecated.patch
 }
Unnamed repository; edit this file 'description' to name the repository.