commit: 309134fc720fb1b16f6666736bb78b4fa590e2c6 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Sun Dec 7 15:15:23 2014 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Sun Dec 7 15:15:48 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/eva.git;a=commit;h=309134fc
app-office/dates: obsolete New alternatives are coming up for Gnome3 like california. --- app-office/dates/ChangeLog | 10 -- app-office/dates/Manifest | 11 -- app-office/dates/dates-0.4.11-r1.ebuild | 40 ------ .../files/dates-0.4.11-eds-api-usage-fix.patch | 155 --------------------- app-office/dates/metadata.xml | 8 -- 5 files changed, 224 deletions(-) diff --git a/app-office/dates/ChangeLog b/app-office/dates/ChangeLog deleted file mode 100644 index 23b9acf..0000000 --- a/app-office/dates/ChangeLog +++ /dev/null @@ -1,10 +0,0 @@ -# ChangeLog for app-office/dates -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header$ - -*dates-0.4.11 (18 Apr 2010) - - 18 Apr 2010; Gilles Dartiguelongue <[email protected]> +dates-0.4.11.ebuild, - +metadata.xml: - Initial commit, bug #165213. - diff --git a/app-office/dates/Manifest b/app-office/dates/Manifest deleted file mode 100644 index 13ad213..0000000 --- a/app-office/dates/Manifest +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -DIST dates-0.4.11.tar.bz2 425726 SHA256 60b0cfe1fa6dee684e255c2a0cd02febafb9d16607ba4b05196e983cd8012c03 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iEYEAREKAAYFAlCumyUACgkQ1fmVwcYIWAaMBwCdFwDr9huFld3df5D0SZhYFNEC -kLEAn10q7hViJWxNbA+EMbcGtZdZJ6wC -=xIMV ------END PGP SIGNATURE----- diff --git a/app-office/dates/dates-0.4.11-r1.ebuild b/app-office/dates/dates-0.4.11-r1.ebuild deleted file mode 100644 index e9c388e..0000000 --- a/app-office/dates/dates-0.4.11-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit eutils gnome2 - -DESCRIPTION="A small, lightweight calendar for Gnome" -HOMEPAGE="http://pimlico-project.org/dates.html"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2:2 - >=x11-libs/gtk+-2.6:2 - >=gnome-extra/evolution-data-server-2.32 - gnome-base/gconf:2 -" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.35.0 - virtual/pkgconfig -" - -DOCS="AUTHORS ChangeLog INSTALL NEWS README" - -src_prepare() { - # Fix build with gmake-3.82 - sed 's/^ /\t/g' -i Makefile.am Makefile.in || die "sed failed" - - # Fix build against >=evolution-data-server-2.32, upstream #631081 - epatch "${FILESDIR}/${PN}-0.4.11-eds-api-usage-fix.patch" - - gnome2_src_prepare -} diff --git a/app-office/dates/files/dates-0.4.11-eds-api-usage-fix.patch b/app-office/dates/files/dates-0.4.11-eds-api-usage-fix.patch deleted file mode 100644 index e7fce46..0000000 --- a/app-office/dates/files/dates-0.4.11-eds-api-usage-fix.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 7771e0b3d75b4ba04756d6c6ffc03d644df2db5f Mon Sep 17 00:00:00 2001 -From: Lucas Hermann Negri <[email protected]> -Date: Wed, 13 Oct 2010 18:49:20 -0300 -Subject: [PATCH] Replaced the calls to the deprecated functions e_source_{set,get}_color - with the new API (e_source_{set,peek}_color_spec). - ---- - src/dates_gtk.c | 40 ++++++++++++---------------------------- - src/dates_main.c | 2 +- - src/dates_view.c | 10 ++++------ - 3 files changed, 17 insertions(+), 35 deletions(-) - -diff --git a/src/dates_gtk.c b/src/dates_gtk.c -index 78e71bb..403bc25 100644 ---- a/src/dates_gtk.c -+++ b/src/dates_gtk.c -@@ -1016,7 +1016,6 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) - GtkTreeIter iter; - GError *error = NULL; - const gchar *relative_uri; -- guint32 new_colour; - - #ifdef WITH_HILDON - GdkColor *hildon_color; -@@ -1055,7 +1054,8 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) - source = e_source_new (name, relative_uri); - - #ifdef USE_OWL -- new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); -+ guint32 new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); -+ e_source_set_color (source, new_colour); - #else - - #ifdef WITH_HILDON -@@ -1063,17 +1063,11 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) - #else - gtk_color_button_get_color (GTK_COLOR_BUTTON(color_button), &colour); - #endif -- new_colour = (guint8)(colour.red >> 8); -- new_colour <<= 8; -- new_colour |= (guint8)(colour.green >> 8); -- new_colour <<= 8; -- new_colour |= (guint8)(colour.blue >> 8); -- new_colour <<= 8; -+ gchar *n_color = gdk_color_to_string (&colour); -+ e_source_set_color_spec (source, n_color); -+ g_free(n_color); - #endif - -- /* Set the colour */ -- e_source_set_color (source, new_colour); -- - /* Set the group for the source */ - e_source_set_group (source, group); - e_source_group_add_source (group, source, 0); -@@ -1169,7 +1163,6 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) - ESourceGroup *group; - - GdkColor colour; -- guint32 raw_colour; - - const gchar *name = NULL; - const gchar *uri = NULL; -@@ -1335,12 +1328,8 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - - /* Get the colour from the the source */ -- e_source_get_color (source, &raw_colour); -- -- /* Munge this into something usable */ -- colour.red = (guint16)(((raw_colour & 0xff0000) >> 16) << 8); -- colour.green = (guint16)(((raw_colour & 0xff00) >> 8) << 8); -- colour.blue = (guint16)(((raw_colour & 0xff) << 8)); -+ const gchar* spec = e_source_peek_color_spec(source); -+ gdk_color_parse(spec, &colour); - - /* Now we need to allocate the colour */ - gdk_colormap_alloc_color (gdk_colormap_get_system (), &colour, TRUE, TRUE); -@@ -1440,26 +1429,21 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) - * Next we need to pack the GDK colour into guint32 - * for eds - */ -- guint32 new_colour = 0; - - GError *error = NULL; - #ifdef USE_OWL -- new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); -+ guint32 new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); -+ e_source_set_color (source, new_colour); - #else - #ifdef WITH_HILDON - hildon_color_button_get_color (HILDON_COLOR_BUTTON(color_button), &colour); - #else - gtk_color_button_get_color (GTK_COLOR_BUTTON(color_button), &colour); - #endif -- new_colour = (guint8)(colour.red >> 8); -- new_colour <<= 8; -- new_colour |= (guint8)(colour.green >> 8); -- new_colour <<= 8; -- new_colour |= (guint8)(colour.blue >> 8); -- new_colour <<= 8; -+ gchar *n_color = gdk_color_to_string (&colour); -+ e_source_set_color_spec (source, n_color); -+ g_free(n_color); - #endif -- /* Update the colour */ -- e_source_set_color (source, new_colour); - - /* And the name */ - e_source_set_name (source, (gtk_entry_get_text (GTK_ENTRY (name_entry)))); -diff --git a/src/dates_main.c b/src/dates_main.c -index ce05fe8..1f7770d 100644 ---- a/src/dates_main.c -+++ b/src/dates_main.c -@@ -112,7 +112,7 @@ dates_load_calendars (DatesData *d) - system_source = e_source_new (_("Personal"), "system"); - - /* Default Evolution colour */ -- e_source_set_color (system_source, 0xBECEDD); -+ e_source_set_color_spec (system_source, "#BECEDD"); - - /* Set the group for the source and put it in the group */ - e_source_set_group (system_source, local_group); -diff --git a/src/dates_view.c b/src/dates_view.c -index d65db2f..9d28a15 100644 ---- a/src/dates_view.c -+++ b/src/dates_view.c -@@ -4846,7 +4846,6 @@ dates_view_add_calendar (DatesView *view, ECal *ecal) - DatesViewPrivate *priv = DATES_VIEW_GET_PRIVATE (view); - DatesViewCalendar *cal; - ESource *source; -- guint32 colour; - /* GError *error = NULL;*/ - - g_return_if_fail (E_IS_CAL (ecal)); -@@ -4876,12 +4875,11 @@ dates_view_add_calendar (DatesView *view, ECal *ecal) - cal->text_gc = gdk_gc_new ( - GDK_DRAWABLE (priv->main->window)); - -- if (e_source_get_color (source, &colour)) { -+ const gchar* spec = e_source_peek_color_spec (source); -+ if (spec) { - GdkColor gcolour, dgcolour, tgcolour; -- gcolour.red = ((colour & 0xFF0000) >> 16) * 0x101; -- gcolour.green = ((colour & 0xFF00) >> 8) * 0x101; -- gcolour.blue = (colour & 0xFF) * 0x101; -- -+ gdk_color_parse(spec, &gcolour); -+ - /* This is simplified sRGB -> LAB conversion; we do not need it - * entirely precise, as we are only going to chose between - * black or white text based on the L value. --- -1.7.3.1 - diff --git a/app-office/dates/metadata.xml b/app-office/dates/metadata.xml deleted file mode 100644 index 23310c6..0000000 --- a/app-office/dates/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer> - <email>[email protected]</email> - <name>Gilles Dartiguelongue</name> -</maintainer> -</pkgmetadata>
