From 0ac411b9dbcb070d240b6c00cac032984b947582 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 18 Jul 2008 09:14:12 +0000 Subject: remove broken patch from 2.14.2, drop x86-fbsd keyword, we should go with 2.16.4, bug #199546. (Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64) --- dev-cpp/glibmm/ChangeLog | 7 ++++- dev-cpp/glibmm/files/glibmm-2.14.0-date.patch | 42 --------------------------- dev-cpp/glibmm/glibmm-2.14.2.ebuild | 7 ++--- 3 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 dev-cpp/glibmm/files/glibmm-2.14.0-date.patch (limited to 'dev-cpp/glibmm') diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog index 74d017d9124a..127c69f3eefa 100644 --- a/dev-cpp/glibmm/ChangeLog +++ b/dev-cpp/glibmm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-cpp/glibmm # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.116 2008/07/10 15:12:31 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.117 2008/07/18 09:14:12 aballier Exp $ + + 18 Jul 2008; Alexis Ballier + -files/glibmm-2.14.0-date.patch, glibmm-2.14.2.ebuild: + remove broken patch from 2.14.2, drop x86-fbsd keyword, we should go with + 2.16.4, bug #199546. 10 Jul 2008; Rémi Cardona glibmm-2.8.4.ebuild, glibmm-2.14.2.ebuild, glibmm-2.16.0.ebuild, glibmm-2.16.1.ebuild, diff --git a/dev-cpp/glibmm/files/glibmm-2.14.0-date.patch b/dev-cpp/glibmm/files/glibmm-2.14.0-date.patch deleted file mode 100644 index f72d7f6c3b0d..000000000000 --- a/dev-cpp/glibmm/files/glibmm-2.14.0-date.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur a/glib/glibmm/date.cc b/glib/glibmm/date.cc ---- a/glib/glibmm/date.cc 2007-08-13 11:51:09 +0100 -+++ b/glib/glibmm/date.cc 2007-10-19 10:02:22 +0100 -@@ -71,16 +71,6 @@ - g_date_set_parse(&gobject_, str.c_str()); - } - --#ifndef GLIBMM_DISABLE_DEPRECATED -- --void Date::set_time(GTime time) --{ -- //This method, and the C function that it wraps, are deprecated. -- g_date_set_time(&gobject_, time); --} --#endif // GLIBMM_DISABLE_DEPRECATED -- -- - void Date::set_time(time_t timet) - { - g_date_set_time_t(&gobject_, timet); -diff -ur a/glib/glibmm/date.h b/glib/glibmm/date.h ---- a/glib/glibmm/date.h 2007-08-13 11:51:09 +0100 -+++ b/glib/glibmm/date.h 2007-10-19 10:02:08 +0100 -@@ -119,18 +119,6 @@ - */ - void set_parse (const Glib::ustring& str); - -- #ifndef GLIBMM_DISABLE_DEPRECATED -- -- /** Sets the value of a date from a GTime (time_t) value. -- * -- * @param time GTime value to set. -- * -- * @deprecated Please use set_time(time_t) or set_time(const GTimeVal&). -- */ -- void set_time(GTime time); -- #endif // GLIBMM_DISABLE_DEPRECATED -- -- - /** Sets the value of a date from a time_t value. - * - * @param timet time_t value to set diff --git a/dev-cpp/glibmm/glibmm-2.14.2.ebuild b/dev-cpp/glibmm/glibmm-2.14.2.ebuild index 648fa8602cf3..fc3d19ed9eb3 100644 --- a/dev-cpp/glibmm/glibmm-2.14.2.ebuild +++ b/dev-cpp/glibmm/glibmm-2.14.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/dev-cpp/glibmm/glibmm-2.14.2.ebuild,v 1.11 2008/07/10 15:12:31 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.14.2.ebuild,v 1.12 2008/07/18 09:14:12 aballier Exp $ inherit gnome2 eutils @@ -9,7 +9,7 @@ HOMEPAGE="http://www.gtkmm.org" LICENSE="LGPL-2.1" SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86" IUSE="doc examples" RDEPEND=">=dev-libs/libsigc++-2.0.11 @@ -28,9 +28,6 @@ src_unpack() { sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \ die "sed Makefile.in failed" fi - - # GTime and time_t are equivalent on fbsd, so we cannot define both - use x86-fbsd && epatch "${FILESDIR}/${P}-date.patch" } src_install() { -- cgit v1.2.3-65-gdbad