From 79c5e81aeb16a06d59dc131e5da17d531703c7fc Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Mon, 12 Feb 2007 17:30:36 +0000 Subject: [PATCH] docs are not optional anymore: bug #165681; Fix build on fbsd: bug #158021 --- gnome-base/gnome-applets/ChangeLog | 6 +++- gnome-base/gnome-applets/Manifest | 30 ++++++++----------- .../files/gnome-applets-2.16.2-malloc.patch | 12 ++++++++ .../gnome-applets/gnome-applets-2.16.2.ebuild | 14 ++++----- 4 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 gnome-base/gnome-applets/files/gnome-applets-2.16.2-malloc.patch diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog index da76794a832d..6252ef52fa6d 100644 --- a/gnome-base/gnome-applets/ChangeLog +++ b/gnome-base/gnome-applets/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/gnome-applets # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.206 2007/02/01 18:16:39 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.207 2007/02/12 17:30:36 dang Exp $ + + 12 Feb 2007; Daniel Gryniewicz + +files/gnome-applets-2.16.2-malloc.patch, gnome-applets-2.16.2.ebuild: + docs are not optional anymore: bug #165681; Fix build on fbsd: bug #158021 01 Feb 2007; Daniel Gryniewicz gnome-applets-2.16.2.ebuild: diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest index c11c0164a12b..1ee69b1df210 100644 --- a/gnome-base/gnome-applets/Manifest +++ b/gnome-base/gnome-applets/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX gnome-applets-2.14.0-prefs_startup-r1.patch 776 RMD160 d29eadd0748d95f2d0743669114956df10095b0a SHA1 70ac81b01e32bda71147ed80bb2905c065bd0c61 SHA256 54218c81861a721708194738f8933ebdb0f450b0d8d8ecdc4f7514732a8d7213 MD5 029ed267b1c47fdf2275b1cc71700b62 files/gnome-applets-2.14.0-prefs_startup-r1.patch 776 RMD160 d29eadd0748d95f2d0743669114956df10095b0a files/gnome-applets-2.14.0-prefs_startup-r1.patch 776 @@ -13,6 +10,10 @@ AUX gnome-applets-2.16.1-dbus-version.patch 1028 RMD160 8c20fe5bae5767c91525053a MD5 956fd95fc03154f7267692c23586b83b files/gnome-applets-2.16.1-dbus-version.patch 1028 RMD160 8c20fe5bae5767c91525053a1e19cd7a42dc9aab files/gnome-applets-2.16.1-dbus-version.patch 1028 SHA256 8a88c2c60c7ed9eef3830e4079e3dcdbb246ea904daf411d0ebf4a356cf293f5 files/gnome-applets-2.16.1-dbus-version.patch 1028 +AUX gnome-applets-2.16.2-malloc.patch 402 RMD160 3ef843723f5da945aebef66a6860a2f5111a7f69 SHA1 aac701256de7e26d9ab6cfb6a402de1cfc2223f1 SHA256 b0e118b53942d12d4104ec8bc6434ea81d7178a5d6e8ccf6a8a71c6280a4d1fa +MD5 8a32ffde190dbd0f381635fdac03310b files/gnome-applets-2.16.2-malloc.patch 402 +RMD160 3ef843723f5da945aebef66a6860a2f5111a7f69 files/gnome-applets-2.16.2-malloc.patch 402 +SHA256 b0e118b53942d12d4104ec8bc6434ea81d7178a5d6e8ccf6a8a71c6280a4d1fa files/gnome-applets-2.16.2-malloc.patch 402 DIST gnome-applets-2.14.2.tar.bz2 6601120 RMD160 34f263b64407514cb65f0ecb3654ee8fc294b219 SHA1 88f58242601b3762cb665e2f30b8459ae89f4ff1 SHA256 4bdd52b47649cfa6dc5d065201124ae02d3da593531cd0defa1a9cf7a761f1df DIST gnome-applets-2.16.2.tar.bz2 7127753 RMD160 b8706c57b37702b0bfc64cb549fc594b05da5e5b SHA1 8b912c21e7c390c9aae96bb81fe017fa1f9bf006 SHA256 de3c9d92c5da1597dbcdc5d4a7554235006d0bf6432f97ab7b0a6a5a47dbb67b EBUILD gnome-applets-2.14.2-r1.ebuild 2458 RMD160 d2501beaab92aafe709e19406376007fb690989f SHA1 b20468a33ccd3d8a924f39b10a7de66ec46fefe0 SHA256 dd0c00150849c39112589dc3c0550b471016024fabdef50ea71bc491673bed93 @@ -23,14 +24,14 @@ EBUILD gnome-applets-2.14.2.ebuild 2332 RMD160 f8f1df726661f249c361773d286cab4be MD5 79127e5c8a879acdd0bb330d71bed9a4 gnome-applets-2.14.2.ebuild 2332 RMD160 f8f1df726661f249c361773d286cab4be28779d4 gnome-applets-2.14.2.ebuild 2332 SHA256 ac5fc7957d33d1c0ea7a4c5d8711d1be9e22e525b9d90888c71db61235669b16 gnome-applets-2.14.2.ebuild 2332 -EBUILD gnome-applets-2.16.2.ebuild 2603 RMD160 f4fa437c2b980d1cfddffc208975dd9c6dc66ee3 SHA1 ad65fe5a839860dc503e9ad205a006b71914799c SHA256 825fb31debe6da35f15efa33e2d23139af55daaee1f09c1a82e933e72c130bd2 -MD5 ec36ddc46bb4ba4718aea3443c588187 gnome-applets-2.16.2.ebuild 2603 -RMD160 f4fa437c2b980d1cfddffc208975dd9c6dc66ee3 gnome-applets-2.16.2.ebuild 2603 -SHA256 825fb31debe6da35f15efa33e2d23139af55daaee1f09c1a82e933e72c130bd2 gnome-applets-2.16.2.ebuild 2603 -MISC ChangeLog 28555 RMD160 c0208934d46d493e128685d3615fb77cda729c33 SHA1 dea1be2d23ab3bec9474195554bb65888eae7688 SHA256 4fe7f1bf06056943665145728b76b8261a285eb8ddb4e36d4f074d8e35d9ff08 -MD5 bf70ad5e1eda97e1b6c0bfc8255a83b3 ChangeLog 28555 -RMD160 c0208934d46d493e128685d3615fb77cda729c33 ChangeLog 28555 -SHA256 4fe7f1bf06056943665145728b76b8261a285eb8ddb4e36d4f074d8e35d9ff08 ChangeLog 28555 +EBUILD gnome-applets-2.16.2.ebuild 2589 RMD160 617f4b4eb64219118118b539d5959ec653ee0b81 SHA1 69c57010e5113e767ecd039ba8b0d09e46aa3220 SHA256 6b309278efafe311aada280ca7d2c08fd1d938e0182324d7c1fb819936f8c6ed +MD5 8b420cbd12d5e56f3ab32597ad5cd76c gnome-applets-2.16.2.ebuild 2589 +RMD160 617f4b4eb64219118118b539d5959ec653ee0b81 gnome-applets-2.16.2.ebuild 2589 +SHA256 6b309278efafe311aada280ca7d2c08fd1d938e0182324d7c1fb819936f8c6ed gnome-applets-2.16.2.ebuild 2589 +MISC ChangeLog 28757 RMD160 c32e2f4b41d54a3de263c75538262d8b93084538 SHA1 909e869d86fc17e190f54f52ecd790851533fc4f SHA256 6f34f8009161177764ad74dd4963dea477e0367413c4e76bfefe21744bd104b0 +MD5 df3ee0f13611e1e3a22ee8de6183c0b7 ChangeLog 28757 +RMD160 c32e2f4b41d54a3de263c75538262d8b93084538 ChangeLog 28757 +SHA256 6f34f8009161177764ad74dd4963dea477e0367413c4e76bfefe21744bd104b0 ChangeLog 28757 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -44,10 +45,3 @@ SHA256 0ca7cbacc88a45c24e7ae3efc467ef2bf0a7cf20550dd4b73e062052f49707e6 files/di MD5 460b94bf82a21fc99a2e6c1df3f884d3 files/digest-gnome-applets-2.16.2 268 RMD160 8ace2b5e73c68ebfc68e9f8c03b25e285ffa93d9 files/digest-gnome-applets-2.16.2 268 SHA256 753267861fe4c73102dc09d66bcb41cdac6f39a26cd3c21a6ad95a7b5d100440 files/digest-gnome-applets-2.16.2 268 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFwi6MomPajV0RnrERAh20AJ9HJtvoWaqjEsAE/dsWIt9nOTnPrwCcDa04 -Shl7IXHLZQX6JJ/lqQOi8Eg= -=HHY0 ------END PGP SIGNATURE----- diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.16.2-malloc.patch b/gnome-base/gnome-applets/files/gnome-applets-2.16.2-malloc.patch new file mode 100644 index 000000000000..edd67e07a6d7 --- /dev/null +++ b/gnome-base/gnome-applets/files/gnome-applets-2.16.2-malloc.patch @@ -0,0 +1,12 @@ +diff -ur gnome-applets-2.16.2.orig/libgweather/weather-met.c gnome-applets-2.16.2/libgweather/weather-met.c +--- gnome-applets-2.16.2.orig/libgweather/weather-met.c 2006-08-07 15:05:56 +0100 ++++ gnome-applets-2.16.2/libgweather/weather-met.c 2006-12-13 13:10:37 +0000 +@@ -15,7 +15,7 @@ + #endif + + #include +-#include ++#include + #include + #include + diff --git a/gnome-base/gnome-applets/gnome-applets-2.16.2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.16.2.ebuild index 26f955aaea2b..cd725384ca6e 100644 --- a/gnome-base/gnome-applets/gnome-applets-2.16.2.ebuild +++ b/gnome-base/gnome-applets/gnome-applets-2.16.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.16.2.ebuild,v 1.10 2007/02/01 18:16:39 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.16.2.ebuild,v 1.11 2007/02/12 17:30:36 dang Exp $ inherit eutils gnome2 autotools @@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2 FDL-1.1 LGPL-2" SLOT="2" KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" -IUSE="acpi apm doc gstreamer hal ipv6" +IUSE="acpi apm gstreamer hal ipv6" RDEPEND=">=x11-libs/gtk+-2.6 >=dev-libs/glib-2.6 @@ -48,11 +48,9 @@ DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.19 >=dev-util/intltool-0.35 dev-libs/libxslt - doc? ( - app-text/docbook-sgml-utils - >=app-text/gnome-doc-utils-0.3.2 - ~app-text/docbook-xml-dtd-4.3 - )" + app-text/docbook-sgml-utils + >=app-text/gnome-doc-utils-0.3.2 + ~app-text/docbook-xml-dtd-4.3" DOCS="AUTHORS ChangeLog NEWS README" @@ -62,6 +60,7 @@ src_unpack() { gnome2_src_unpack epatch "${FILESDIR}/${PN}-2.16.1-dbus-version.patch" + use x86-fbsd && epatch "${FILESDIR}"/${P}-malloc.patch } pkg_setup() { @@ -80,7 +79,6 @@ pkg_setup() { if use ppc && ! use apm; then G2CONF="${G2CONF} --disable-battstat" fi - G2CONF="${G2CONF} $(use_enable doc gtk-doc)" } src_install() { -- 2.26.2