* [gentoo-commits] proj/gnome:master commit in: app-office/planner/, app-office/planner/files/
@ 2012-12-29 16:36 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-29 16:36 UTC (permalink / raw
To: gentoo-commits
commit: 32c6dbf7d3e4d00e314bd65bcbaa53c68a271c6b
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 16:35:31 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 16:35:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=32c6dbf7
app-office/planner: add live ebuild fix tentative eds-3.6 patches
---
.../0001-Speed-up-python-path-detection.patch | 33 ++
.../0002-Fix-build-failures-with-Werror.patch | 61 ++++
.../files/0003-Port-GValueArray-to-GArray.patch | 109 +++++++
...ld-failure-with-evolution-data-server-3.6.patch | 338 ++++++++++++++++++++
app-office/planner/files/0005-Run-autoupdate.patch | 85 +++++
app-office/planner/metadata.xml | 5 +
app-office/planner/planner-9999.ebuild | 103 ++++++
7 files changed, 734 insertions(+), 0 deletions(-)
diff --git a/app-office/planner/files/0001-Speed-up-python-path-detection.patch b/app-office/planner/files/0001-Speed-up-python-path-detection.patch
new file mode 100644
index 0000000..8e7256c
--- /dev/null
+++ b/app-office/planner/files/0001-Speed-up-python-path-detection.patch
@@ -0,0 +1,33 @@
+From 118f49adf7d65b09163808abce786cce5895e2f2 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 29 Dec 2012 17:13:05 +0100
+Subject: [PATCH 1/5] Speed up python path detection
+
+---
+ acinclude.m4 | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index c4996ee..fadbf2c 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -85,14 +85,8 @@ CPPFLAGS="$save_CPPFLAGS"
+
+ # Check for Python library path
+ AC_MSG_CHECKING([for Python library path])
+- python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
+- for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
+- python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
+- if test -n "$python_path" ; then
+- break
+- fi
+- done
+- python_path=`echo $python_path | sed "s,/libpython.*$,,"`
++ [python_path=`$PYTHON -c 'import distutils.sysconfig, os; \
++ print(os.path.sep.join(distutils.sysconfig.get_python_lib(standard_lib=True).split(os.path.sep)[:-1]))'`]
+ AC_MSG_RESULT([$python_path])
+ if test -z "$python_path" ; then
+ AC_MSG_ERROR([cannot find Python library path])
+--
+1.8.0.2
+
diff --git a/app-office/planner/files/0002-Fix-build-failures-with-Werror.patch b/app-office/planner/files/0002-Fix-build-failures-with-Werror.patch
new file mode 100644
index 0000000..d2abe56
--- /dev/null
+++ b/app-office/planner/files/0002-Fix-build-failures-with-Werror.patch
@@ -0,0 +1,61 @@
+From 9e3361bea793519682b073823b6ae284c476fe66 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 29 Dec 2012 00:12:46 +0100
+Subject: [PATCH 2/5] Fix build failures with -Werror
+
+---
+ src/planner-python-plugin.c | 4 +---
+ tests/calendar-test.c | 1 +
+ tests/time-test.c | 1 +
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/planner-python-plugin.c b/src/planner-python-plugin.c
+index 61dc077..bd717d6 100644
+--- a/src/planner-python-plugin.c
++++ b/src/planner-python-plugin.c
+@@ -148,7 +148,7 @@ plugin_execute_scripts(PlannerPlugin *plugin, const gchar *dirname)
+ filename = g_dir_read_name (dir);
+ }
+
+- g_free (dirname);
++ g_free ((gpointer) dirname);
+ g_dir_close (dir);
+ }
+
+@@ -156,9 +156,7 @@ G_MODULE_EXPORT void
+ plugin_init (PlannerPlugin *plugin)
+ {
+ PlannerPluginPriv *priv;
+- GDir *dir;
+ gchar *dirname;
+- const gchar *filename;
+
+ priv = g_new0 (PlannerPluginPriv, 1);
+ plugin->priv = priv;
+diff --git a/tests/calendar-test.c b/tests/calendar-test.c
+index a73b569..fa8c4ba 100644
+--- a/tests/calendar-test.c
++++ b/tests/calendar-test.c
+@@ -168,6 +168,7 @@ main (gint argc, gchar **argv)
+ CHECK_INTEGER_RESULT (mrp_day_get_id (day_a),
+ mrp_day_get_id (day_b));
+
++ g_object_unref (app);
+ return EXIT_SUCCESS;
+ }
+
+diff --git a/tests/time-test.c b/tests/time-test.c
+index 37a1540..abb0d45 100644
+--- a/tests/time-test.c
++++ b/tests/time-test.c
+@@ -22,6 +22,7 @@ main (gint argc, gchar **argv)
+ t = mrp_time_compose (2002, 3, 31, 0, 0, 0);
+
+ /* Test mrp_time_new_from_string */
++ CHECK_STRING_RESULT (mrp_time_to_string (t), "20020331T000000Z");
+ CHECK_STRING_RESULT (STRING (mrp_time_from_string ("20020329", NULL)), "20020329T000000Z");
+ CHECK_STRING_RESULT (STRING (mrp_time_from_string ("19991231", NULL)), "19991231T000000Z");
+ CHECK_STRING_RESULT (STRING (mrp_time_from_string ("invalid", NULL)), "19700101T000000Z");
+--
+1.8.0.2
+
diff --git a/app-office/planner/files/0003-Port-GValueArray-to-GArray.patch b/app-office/planner/files/0003-Port-GValueArray-to-GArray.patch
new file mode 100644
index 0000000..9d19839
--- /dev/null
+++ b/app-office/planner/files/0003-Port-GValueArray-to-GArray.patch
@@ -0,0 +1,109 @@
+From 18077d98a73ac6bb6f2ecf9e32a1c8cd99a4941d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 29 Dec 2012 00:13:07 +0100
+Subject: [PATCH 3/5] Port GValueArray to GArray
+
+GValueArray has been deprecated since glib-2.32.
+---
+ libplanner/mrp-old-xml.c | 13 +++++++------
+ libplanner/mrp-parser.c | 10 +++++-----
+ 2 files changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/libplanner/mrp-old-xml.c b/libplanner/mrp-old-xml.c
+index be4b9c7..8b79bc2 100644
+--- a/libplanner/mrp-old-xml.c
++++ b/libplanner/mrp-old-xml.c
+@@ -774,11 +774,11 @@ old_xml_read_project_properties (MrpParser *parser)
+ g_free (phase);
+ }
+
+-static GValueArray *
++static GArray *
+ old_xml_read_string_list (xmlNodePtr node,
+ MrpObject *object)
+ {
+- GValueArray *array;
++ GArray *array;
+ GValue value = { 0 };
+ xmlNodePtr child;
+ gchar *str;
+@@ -787,7 +787,8 @@ old_xml_read_string_list (xmlNodePtr node,
+ return NULL;
+ }
+
+- array = g_value_array_new (0);
++ array = g_array_new (TRUE, TRUE, sizeof(GValue *));
++ g_array_set_clear_func (array, (GDestroyNotify) g_value_unset);
+
+ g_value_init (&value, G_TYPE_STRING);
+
+@@ -798,7 +799,7 @@ old_xml_read_string_list (xmlNodePtr node,
+
+ if (str && str[0]) {
+ g_value_set_string (&value, str);
+- g_value_array_append (array, &value);
++ g_array_append_val (array, value);
+ }
+
+ g_free (str);
+@@ -1352,7 +1353,7 @@ old_xml_set_property_from_node (MrpProject *project,
+ gfloat f;
+ gchar *name;
+ gchar *str;
+- GValueArray *array;
++ GArray *array;
+ GList *phases;
+
+ name = old_xml_get_string (node, "name");
+@@ -1401,7 +1402,7 @@ old_xml_set_property_from_node (MrpProject *project,
+ array = old_xml_read_string_list (node, object);
+ if (array) {
+ mrp_object_set (object, name, array, NULL);
+- g_value_array_free (array);
++ g_array_free (array, TRUE);
+ }
+ break;
+ case MRP_PROPERTY_TYPE_INT:
+diff --git a/libplanner/mrp-parser.c b/libplanner/mrp-parser.c
+index 81099a7..f4448e3 100644
+--- a/libplanner/mrp-parser.c
++++ b/libplanner/mrp-parser.c
+@@ -178,7 +178,7 @@ mpp_property_to_string (MrpObject *object,
+ gint i;
+ gfloat f;
+ mrptime date;
+- GValueArray *array;
++ GArray *array;
+
+ name = mrp_property_get_name (property);
+
+@@ -411,7 +411,7 @@ mpp_write_string_list (xmlNodePtr node,
+ MrpObject *object)
+ {
+ xmlNodePtr child;
+- GValueArray *array;
++ GArray *array;
+ GValue *value;
+ gint i;
+
+@@ -420,14 +420,14 @@ mpp_write_string_list (xmlNodePtr node,
+ return;
+ }
+
+- for (i = 0; i < array->n_values; i++) {
+- value = g_value_array_get_nth (array, i);
++ for (i = 0; i < array->len; i++) {
++ value = g_array_index (array, GValue *, i);
+
+ child = xmlNewChild (node, NULL, "list-item", NULL);
+ xmlSetProp (child, "value", g_value_get_string (value));
+ }
+
+- g_value_array_free (array);
++ g_array_free (array, TRUE);
+ }
+
+ static void
+--
+1.8.0.2
+
diff --git a/app-office/planner/files/0004-Fix-build-failure-with-evolution-data-server-3.6.patch b/app-office/planner/files/0004-Fix-build-failure-with-evolution-data-server-3.6.patch
new file mode 100644
index 0000000..503da7c
--- /dev/null
+++ b/app-office/planner/files/0004-Fix-build-failure-with-evolution-data-server-3.6.patch
@@ -0,0 +1,338 @@
+From 5e6162f78e72c60130638061ed8b94a3cb4aa352 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 29 Dec 2012 16:48:30 +0100
+Subject: [PATCH 4/5] Fix build failure with evolution-data-server-3.6
+
+Only cover plugin code enabled through --enable-eds.
+EDS backend has been broken for a long time and needs more work.
+---
+ configure.ac | 2 +-
+ src/planner-eds-plugin.c | 112 +++++++++++++++++++++++------------------------
+ 2 files changed, 57 insertions(+), 57 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9f3d112..7e0cd8a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,7 +245,7 @@ dnl -----------------------------
+ AC_ARG_ENABLE(eds, [ --enable-eds build evolution-data-server support [default=no]], enable_eds="$enableval", enable_eds=no)
+
+ if test "x$enable_eds" = "xyes" ; then
+- EDS_REQUIRED=1.1.0
++ EDS_REQUIRED=3.6
+ EDS_PACKAGE=1.2
+ PKG_CHECK_MODULES(EDS,
+ [
+diff --git a/src/planner-eds-plugin.c b/src/planner-eds-plugin.c
+index 4eb060c..ad4473b 100644
+--- a/src/planner-eds-plugin.c
++++ b/src/planner-eds-plugin.c
+@@ -30,7 +30,6 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <glade/glade.h>
+ #include <gtk/gtk.h>
+-#include <gconf/gconf-client.h>
+ #include <libplanner/mrp-object.h>
+ #include <libplanner/mrp-property.h>
+ #include "libplanner/mrp-paths.h"
+@@ -39,13 +38,11 @@
+ #include "planner-resource-cmd.h"
+
+ /* Evolution Data Server sources */
+-#include <libedataserver/e-source-list.h>
+-#include <libedataserver/e-source-group.h>
+-#include <libedataserver/e-uid.h>
++#include <libedataserver/libedataserver.h>
+ /* Calendar */
+-#include <libecal/e-cal.h>
++#include <libecal/libecal.h>
+ /* Addressbook */
+-#include <libebook/e-book.h>
++#include <libebook/libebook.h>
+
+ struct _PlannerPluginPriv {
+ MrpProject *project;
+@@ -66,7 +63,8 @@ struct _PlannerPluginPriv {
+ gchar *current_query_id;
+ GList *queries_cancelled;
+ /* Books open */
+- GList *books;
++ ESourceRegistry *registry;
++ GList *books;
+
+ GtkActionGroup *actions;
+ };
+@@ -95,7 +93,7 @@ enum {
+ static void eds_plugin_import (GtkAction *action,
+ gpointer user_data,
+ const gchar *cname);
+-static void eds_create_groups_model (GSList *groups,
++static void eds_create_groups_model (GList *groups,
+ PlannerPlugin *plugin);
+ static void eds_ok_button_clicked (GtkButton *button,
+ PlannerPlugin *plugin);
+@@ -130,15 +128,15 @@ static MrpResource * eds_find_resource (PlannerPlugin *plugin,
+ const gchar *uid,
+ GList *resources_orig);
+ static gboolean eds_create_uid_property (PlannerPlugin *plugin);
+-static void eds_load_resources (ESourceGroup *group,
++static void eds_load_resources (ESource *source,
+ PlannerPlugin *plugin,
+ const gchar *search);
+ static void eds_receive_contacts_cb (EBook *book,
+ EBookStatus status,
+ GList *contacts,
+ gpointer plugin);
+-static void eds_receive_book_cb (EBook *book,
+- EBookStatus status,
++static void eds_receive_book_cb (EBookClient *book,
++ GAsyncResult *result,
+ gpointer user_data);
+ static void eds_plugin_busy (PlannerPlugin *plugin,
+ gboolean busy);
+@@ -236,9 +234,7 @@ eds_plugin_import (GtkAction *action,
+ PlannerPlugin *plugin;
+ PlannerPluginPriv *priv;
+ GtkCellRenderer *renderer;
+- GConfClient *gconf_client;
+- ESourceList *source_list;
+- GSList *groups;
++ GList *groups;
+ gchar *filename;
+
+ plugin = PLANNER_PLUGIN (user_data);
+@@ -293,11 +289,9 @@ eds_plugin_import (GtkAction *action,
+ gtk_widget_show (priv->dialog_get_resources);
+
+
+- gconf_client = gconf_client_get_default ();
+- source_list = e_source_list_new_for_gconf (gconf_client,
+- "/apps/evolution/addressbook/sources");
+ /* List with addressbook groups */
+- groups = e_source_list_peek_groups (source_list);
++ groups = e_source_registry_list_sources (priv->registry,
++ E_SOURCE_EXTENSION_ADDRESS_BOOK);
+ eds_create_groups_model (groups, plugin);
+ gtk_combo_box_set_model (priv->select_group, priv->groups_model);
+ renderer = gtk_cell_renderer_text_new ();
+@@ -305,16 +299,16 @@ eds_plugin_import (GtkAction *action,
+ renderer, TRUE);
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv->select_group),
+ renderer, "text", 0, NULL);
+- /* g_object_unref (source_list); */
++ g_list_free_full (groups, g_object_unref);
+ }
+
+ static void
+-eds_create_groups_model (GSList *groups,
++eds_create_groups_model (GList *groups,
+ PlannerPlugin *plugin)
+ {
+ GtkListStore *model;
+ GtkTreeIter iter;
+- GSList *sl;
++ GList *sl;
+ const gchar *name;
+
+ if (groups == NULL) {
+@@ -324,7 +318,7 @@ eds_create_groups_model (GSList *groups,
+ model = gtk_list_store_new (NUM_GROUP_COLS, G_TYPE_STRING, G_TYPE_OBJECT);
+
+ for (sl = groups; sl; sl = sl->next) {
+- name = e_source_group_peek_name (sl->data);
++ name = e_source_get_display_name (sl->data);
+ gtk_list_store_append (model, &iter);
+ gtk_list_store_set (model, &iter,
+ COL_GROUP_NAME, name,
+@@ -334,23 +328,21 @@ eds_create_groups_model (GSList *groups,
+ }
+
+ /* For now we show all the sources from a group in a List.
+- Later we will us a Tree to show them usings groups. */
++ Later we will use a Tree to show them usings groups. */
+ static void
+-eds_load_resources (ESourceGroup *group,
+- PlannerPlugin *plugin,
+- const gchar *search)
++eds_load_resources (ESource *source,
++ PlannerPlugin *plugin,
++ const gchar *search)
+ {
+ GtkListStore *model;
+- GSList *sources, *sl;
+- PlannerPluginPriv *priv;
++ GList *sources, *sl;
++ PlannerPluginPriv *priv = NULL;
+
+- g_return_if_fail (E_IS_SOURCE_GROUP (group));
+- sources = e_source_group_peek_sources (group);
++ g_return_if_fail (E_IS_SOURCE (source));
+
+- priv = plugin->priv;
+ model = GTK_LIST_STORE (priv->resources_model);
+
+- if (sources == NULL) {
++ if (source == NULL) {
+ if (model) {
+ gtk_list_store_clear (model);
+ }
+@@ -439,9 +431,13 @@ eds_load_resources (ESourceGroup *group,
+ gtk_tree_view_set_headers_clickable (priv->resources_tree_view, TRUE);
+ }
+
++ priv = plugin->priv;
++ sources = e_source_registry_list_sources (priv->registry,
++ E_SOURCE_EXTENSION_ADDRESS_BOOK);
++
+ for (sl = sources; sl; sl = sl->next) {
+- EBook *client;
+- AsyncQuery *async_query = g_new0 (AsyncQuery, 1);
++ EBookClient *client;
++ AsyncQuery *async_query = g_new0 (AsyncQuery, 1);
+
+ g_free (plugin->priv->current_query_id);
+ plugin->priv->current_query_id = e_uid_new ();
+@@ -450,11 +446,12 @@ eds_load_resources (ESourceGroup *group,
+ async_query->uid = plugin->priv->current_query_id;
+ async_query->search = search;
+
+- client = e_book_new (sl->data, NULL);
++ client = e_book_client_new (sl->data, NULL);
+ g_message ("Open book async query: %s", async_query->uid);
+- e_book_async_open (client, TRUE, eds_receive_book_cb, async_query);
++ e_client_open (E_CLIENT (client), TRUE, NULL, (GAsyncReadyCallback) eds_receive_book_cb, async_query);
+ eds_plugin_busy (plugin, TRUE);
+ }
++ g_list_free_full (sources, g_object_unref);
+ }
+
+ static gboolean
+@@ -478,16 +475,17 @@ eds_query_cancelled (PlannerPlugin *plugin,
+ }
+
+ static void
+-eds_receive_book_cb (EBook *client,
+- EBookStatus status,
++eds_receive_book_cb (EBookClient *client,
++ GAsyncResult *result,
+ gpointer user_data)
+ {
+ PlannerPlugin *plugin;
+ EBookQuery *query;
+ AsyncQuery *async_query;
+ const gchar *search;
++ const gchar *sexp;
+ const gchar *uid;
+- const gchar *book_uri;
++ const gchar *book_uid;
+ GtkListStore *model;
+
+ async_query = user_data;
+@@ -499,25 +497,25 @@ eds_receive_book_cb (EBook *client,
+ gtk_list_store_clear (model);
+ g_free (async_query);
+
+- book_uri = e_book_get_uri (client);
++ book_uid = e_source_get_uid(e_client_get_source(E_CLIENT (client)));
+
+ if (eds_query_cancelled (plugin, uid)) {
+- g_message ("Open book query cancelled: %s (%s)", book_uri, uid);
++ g_message ("Open book query cancelled: %s (%s)", book_uid, uid);
+ gtk_widget_set_sensitive (glade_xml_get_widget (plugin->priv->glade,
+ "search_box"), TRUE);
+ eds_plugin_busy (plugin, FALSE);
+ return;
+ }
+
+- if (status != E_BOOK_ERROR_OK) {
+- g_warning ("Problems opening: %s", book_uri);
++ if (!e_client_open_finish(E_CLIENT (client), result, NULL)) {
++ g_warning ("Problems opening: %s", book_uid);
+ gtk_widget_set_sensitive (glade_xml_get_widget (plugin->priv->glade,
+ "search_box"), TRUE);
+ eds_plugin_busy (plugin, FALSE);
+ return;
+ }
+
+- g_message ("Looking the book: %s", book_uri);
++ g_message ("Looking the book: %s", book_uid);
+ plugin->priv->books = g_list_append (plugin->priv->books, client);
+
+ async_query = g_new0 (AsyncQuery, 1);
+@@ -527,9 +525,10 @@ eds_receive_book_cb (EBook *client,
+ async_query->plugin = plugin;
+
+ query = e_book_query_any_field_contains (search);
+- e_book_async_get_contacts (client, query,
+- eds_receive_contacts_cb,
+- (gpointer) async_query);
++ sexp = e_book_query_to_string(query);
++ e_book_client_get_contacts (client, sexp, NULL,
++ (GAsyncReadyCallback) eds_receive_contacts_cb,
++ (gpointer) async_query);
+
+ eds_plugin_busy (plugin, TRUE);
+ e_book_query_unref (query);
+@@ -697,13 +696,13 @@ eds_group_selected (GtkComboBox *select_group,
+ {
+ GtkTreeIter iter;
+ PlannerPluginPriv *priv = plugin->priv;
+- ESourceGroup *group;
++ ESource *source;
+
+ gtk_widget_set_sensitive (glade_xml_get_widget (priv->glade, "search_box"), TRUE);
+
+ if (gtk_combo_box_get_active_iter (select_group, &iter)) {
+- gtk_tree_model_get (priv->groups_model, &iter, COL_GROUP_OBJECT, &group, -1);
+- eds_load_resources (group, plugin, "");
++ gtk_tree_model_get (priv->groups_model, &iter, COL_GROUP_OBJECT, &source, -1);
++ eds_load_resources (source, plugin, "");
+ }
+ }
+
+@@ -805,14 +804,14 @@ eds_search_button_clicked (GtkButton *button,
+ const gchar *search;
+ PlannerPluginPriv *priv = plugin->priv;
+ GtkTreeIter iter;
+- ESourceGroup *group;
++ ESource *source;
+
+ search = gtk_entry_get_text (GTK_ENTRY
+ (glade_xml_get_widget (priv->glade,"search_entry")));
+
+ if (gtk_combo_box_get_active_iter (priv->select_group, &iter)) {
+- gtk_tree_model_get (priv->groups_model, &iter, COL_GROUP_OBJECT, &group, -1);
+- eds_load_resources (group, plugin, search);
++ gtk_tree_model_get (priv->groups_model, &iter, COL_GROUP_OBJECT, &source, -1);
++ eds_load_resources (source, plugin, search);
+ }
+ }
+
+@@ -823,13 +822,13 @@ eds_search_key_pressed (GtkEntry *entry,
+ {
+ PlannerPluginPriv *priv = plugin->priv;
+ GtkTreeIter iter;
+- ESourceGroup *group;
++ ESource *source;
+
+ if (event->keyval == GDK_Return) {
+ if (gtk_combo_box_get_active_iter (priv->select_group, &iter)) {
+ gtk_tree_model_get (priv->groups_model, &iter,
+- COL_GROUP_OBJECT, &group, -1);
+- eds_load_resources (group, plugin, gtk_entry_get_text (entry));
++ COL_GROUP_OBJECT, &source, -1);
++ eds_load_resources (source, plugin, gtk_entry_get_text (entry));
+ }
+ }
+ return FALSE;
+@@ -935,6 +934,7 @@ plugin_init (PlannerPlugin *plugin)
+ plugin->priv = priv;
+ priv->project = planner_window_get_project (plugin->main_window);
+
++ priv->registry = e_source_registry_new_sync(NULL, NULL);
+ priv->actions = gtk_action_group_new ("EDS plugin actions");
+ gtk_action_group_set_translation_domain (priv->actions, GETTEXT_PACKAGE);
+
+--
+1.8.0.2
+
diff --git a/app-office/planner/files/0005-Run-autoupdate.patch b/app-office/planner/files/0005-Run-autoupdate.patch
new file mode 100644
index 0000000..bf6922c
--- /dev/null
+++ b/app-office/planner/files/0005-Run-autoupdate.patch
@@ -0,0 +1,85 @@
+From f84e26a52707ab42b26a01516a59783301937ea8 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 29 Dec 2012 17:08:33 +0100
+Subject: [PATCH 5/5] Run autoupdate
+
+---
+ Makefile.am | 6 ------
+ configure.ac | 27 ++++++++++++++-------------
+ 2 files changed, 14 insertions(+), 19 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 128551f..4c81a31 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -43,12 +43,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
+ --disable-scrollkeeper \
+ --disable-update-mimedb
+
+-# Workaround broken scrollkeeper that doesn't remove its files on
+-# uninstall. Same with the shared mime info, the generated files
+-# aren't empty when there is no mime data
+-distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper' | \
+- grep -v '/share/mime/' | grep -v '/share/omf/planner'
+-
+ DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+
+ dist-hook:
+diff --git a/configure.ac b/configure.ac
+index 7e0cd8a..b512cad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,17 +1,18 @@
+ # Process this file with autoconf to produce a configure script.
+-# require autoconf 2.54
+-AC_PREREQ(2.54)
++# require autoconf 2.69
++AC_PREREQ([2.69])
+
+-AC_INIT(AUTHORS)
+-AM_INIT_AUTOMAKE(planner, 0.14.6)
+-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+-AM_CONFIG_HEADER(config.h)
++AC_INIT([planner], [0.14.6])
++AM_INIT_AUTOMAKE([-Wall 1.11])
++AM_SILENT_RULES([yes])
++AC_CONFIG_HEADERS([config.h])
++AC_CONFIG_SRCDIR([AUTHORS])
+
+-AC_ISC_POSIX
++AC_SEARCH_LIBS([strerror],[cposix])
+ AC_PROG_CC
+-AC_STDC_HEADERS
+-AM_DISABLE_STATIC
+-AM_PROG_LIBTOOL
++AC_HEADER_STDC
++AC_DISABLE_STATIC([])
++LT_INIT
+
+ AM_PATH_GLIB_2_0
+
+@@ -29,8 +30,7 @@ AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, true)
+ AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, true)
+
+ AC_ARG_ENABLE(update-mimedb,
+- AC_HELP_STRING([--disable-update-mimedb],
+- [disable the update-mime-database after install [default=no]]),,
++ AS_HELP_STRING([--disable-update-mimedb],[disable the update-mime-database after install [default=no]]),,
+ enable_update_mimedb=yes)
+ AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
+
+@@ -336,9 +336,10 @@ eds-backend/utils/Makefile
+ libplanner-1.pc
+ ])
+
+-AC_OUTPUT([
++AC_CONFIG_FILES([
+ data/planner.desktop.in
+ ])
++AC_OUTPUT
+
+ echo
+ echo "Planner prefix : $prefix"
+--
+1.8.0.2
+
diff --git a/app-office/planner/metadata.xml b/app-office/planner/metadata.xml
new file mode 100644
index 0000000..20d13ee
--- /dev/null
+++ b/app-office/planner/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome-office</herd>
+</pkgmetadata>
diff --git a/app-office/planner/planner-9999.ebuild b/app-office/planner/planner-9999.ebuild
new file mode 100644
index 0000000..58721b9
--- /dev/null
+++ b/app-office/planner/planner-9999.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{5,6,7} )
+
+inherit autotools eutils gnome2 python-single-r1
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+fi
+
+DESCRIPTION="Project manager for Gnome"
+HOMEPAGE="http://live.gnome.org/Planner/"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="eds examples python"
+if [[ ${PV} = 9999 ]]; then
+ IUSE="${IUSE} doc"
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+fi
+
+RDEPEND="
+ >=dev-libs/glib-2.6:2
+ >=x11-libs/gtk+-2.14:2
+ >=gnome-base/libgnomecanvas-2.10
+ >=gnome-base/libgnomeui-2.10
+ >=gnome-base/libglade-2.4:2.0
+ >=gnome-base/gconf-2.6:2
+ >=dev-libs/libxml2-2.6.27:2
+ >=dev-libs/libxslt-1.1.23
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygtk-2.6:2 )
+ eds? (
+ >=gnome-extra/evolution-data-server-3.6
+ >=mail-client/evolution-3.6 )"
+
+DEPEND="${RDEPEND}
+ app-text/scrollkeeper
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.35.5
+ gnome-base/gnome-common
+ virtual/pkgconfig
+"
+
+if [[ ${PV} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ doc? ( >=dev-util/gtk-doc-1 )"
+fi
+
+src_prepare() {
+ # Find python in a faster way, bug #344231, upstream bug #654044
+ epatch "${FILESDIR}"/0001-Speed-up-python-path-detection.patch
+
+ # Fix build failures
+ epatch "${FILESDIR}"/0002-Fix-build-failures-with-Werror.patch
+
+ # Switch from GValueArray to GArray
+ epatch "${FILESDIR}"/0003-Port-GValueArray-to-GArray.patch
+
+ # Fix build with eds-3.6
+ epatch "${FILESDIR}"/0004-Fix-build-failure-with-evolution-data-server-3.6.patch
+
+ # Fix eautoreconf failures
+ epatch "${FILESDIR}"/0005-Run-autoupdate.patch
+
+ [[ ${PV} != 9999 ]] && eautoreconf
+
+ # Somehow needs this even if macro is not present
+ [[ ${PV} = 9999 ]] && gnome-doc-common
+ gnome2_src_prepare
+
+}
+
+src_configure() {
+ # FIXME: disable eds backend for now, it fails, upstream bug #654005
+ G2CONF="${G2CONF}
+ $(use_enable python)
+ $(use_enable python python-plugin)
+ $(use_enable eds)
+ --disable-eds-backend
+ --with-database=no
+ --disable-update-mimedb"
+ #$(use_enable eds eds-backend)
+ gnome2_src_configure
+}
+
+src_install() {
+ DOCS="AUTHORS COPYING ChangeLog NEWS README"
+ gnome2_src_install \
+ sqldocdir="\$(datadir)/doc/${PF}" \
+ sampledir="\$(datadir)/doc/${PF}/examples"
+
+ if ! use examples; then
+ rm -rf "${D}/usr/share/doc/${PF}/examples"
+ fi
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: app-office/planner/, app-office/planner/files/
@ 2013-05-20 11:33 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2013-05-20 11:33 UTC (permalink / raw
To: gentoo-commits
commit: 84b9e3967ed8466ab68f6d6260753e4e6a621409
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 11:31:17 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon May 20 11:31:34 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=84b9e396
app-office/planner: update wrt upstream commits
---
.../0001-Speed-up-python-path-detection.patch | 8 +-
...d-failure-with-evolution-data-server-3.6.patch} | 405 +-------------------
.../0002-Fix-build-failures-with-Werror.patch | 61 ---
.../files/0003-Port-GValueArray-to-GArray.patch | 109 ------
app-office/planner/files/0005-Run-autoupdate.patch | 85 ----
app-office/planner/planner-9999.ebuild | 33 +-
6 files changed, 24 insertions(+), 677 deletions(-)
diff --git a/app-office/planner/files/0001-Speed-up-python-path-detection.patch b/app-office/planner/files/0001-Speed-up-python-path-detection.patch
index 8e7256c..43e349b 100644
--- a/app-office/planner/files/0001-Speed-up-python-path-detection.patch
+++ b/app-office/planner/files/0001-Speed-up-python-path-detection.patch
@@ -1,7 +1,7 @@
-From 118f49adf7d65b09163808abce786cce5895e2f2 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
+From 750f1489360a34b80f963eddb5af77b1cc51a1c3 Mon Sep 17 00:00:00 2001
+From: Pacho Ramos <pacho@condmat1.ciencias.uniovi.es>
Date: Sat, 29 Dec 2012 17:13:05 +0100
-Subject: [PATCH 1/5] Speed up python path detection
+Subject: [PATCH 1/2] Speed up python path detection
---
acinclude.m4 | 10 ++--------
@@ -29,5 +29,5 @@ index c4996ee..fadbf2c 100644
if test -z "$python_path" ; then
AC_MSG_ERROR([cannot find Python library path])
--
-1.8.0.2
+1.8.2.1
diff --git a/app-office/planner/files/0004-Fix-build-failure-with-evolution-data-server-3.6.patch b/app-office/planner/files/0002-Fix-build-failure-with-evolution-data-server-3.6.patch
similarity index 56%
rename from app-office/planner/files/0004-Fix-build-failure-with-evolution-data-server-3.6.patch
rename to app-office/planner/files/0002-Fix-build-failure-with-evolution-data-server-3.6.patch
index 7edbdfe..1bb1076 100644
--- a/app-office/planner/files/0004-Fix-build-failure-with-evolution-data-server-3.6.patch
+++ b/app-office/planner/files/0002-Fix-build-failure-with-evolution-data-server-3.6.patch
@@ -1,35 +1,20 @@
-From 8cfd2056e1e630b1702fe238e389ad3a4f37a8ad Mon Sep 17 00:00:00 2001
+From 60ff192322517ca26e33da36c4a9ec03ae4f3539 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Sat, 29 Dec 2012 16:48:30 +0100
-Subject: [PATCH 4/5] Fix build failure with evolution-data-server-3.6
+Subject: [PATCH 2/2] Fix build failure with evolution-data-server-3.6
Only cover plugin code enabled through --enable-eds.
EDS backend has been broken for a long time and needs more work.
---
- configure.ac | 2 +-
- docs/libplanner/tmpl/libplanner-unused.sgml | 8 --
- docs/libplanner/tmpl/mrp-application.sgml | 4 +
- docs/libplanner/tmpl/mrp-assignment.sgml | 6 +-
- docs/libplanner/tmpl/mrp-calendar.sgml | 11 +--
- docs/libplanner/tmpl/mrp-day.sgml | 6 ++
- docs/libplanner/tmpl/mrp-error.sgml | 3 +
- docs/libplanner/tmpl/mrp-group.sgml | 4 +
- docs/libplanner/tmpl/mrp-object.sgml | 7 +-
- docs/libplanner/tmpl/mrp-project.sgml | 5 +-
- docs/libplanner/tmpl/mrp-property.sgml | 3 +
- docs/libplanner/tmpl/mrp-relation.sgml | 3 +
- docs/libplanner/tmpl/mrp-resource.sgml | 4 +
- docs/libplanner/tmpl/mrp-task.sgml | 7 +-
- docs/libplanner/tmpl/mrp-time.sgml | 13 +++
- docs/libplanner/tmpl/planner.sgml | 3 +
- src/planner-eds-plugin.c | 141 +++++++++++++++-------------
- 17 files changed, 139 insertions(+), 91 deletions(-)
+ configure.ac | 2 +-
+ src/planner-eds-plugin.c | 141 +++++++++++++++++++++++++----------------------
+ 2 files changed, 75 insertions(+), 68 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 9f3d112..7e0cd8a 100644
+index 77127c3..5c995d8 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -245,7 +245,7 @@ dnl -----------------------------
+@@ -243,7 +243,7 @@ dnl -----------------------------
AC_ARG_ENABLE(eds, [ --enable-eds build evolution-data-server support [default=no]], enable_eds="$enableval", enable_eds=no)
if test "x$enable_eds" = "xyes" ; then
@@ -38,380 +23,6 @@ index 9f3d112..7e0cd8a 100644
EDS_PACKAGE=1.2
PKG_CHECK_MODULES(EDS,
[
-diff --git a/docs/libplanner/tmpl/libplanner-unused.sgml b/docs/libplanner/tmpl/libplanner-unused.sgml
-index e8bee74..a389b98 100644
---- a/docs/libplanner/tmpl/libplanner-unused.sgml
-+++ b/docs/libplanner/tmpl/libplanner-unused.sgml
-@@ -131,14 +131,6 @@ mrproject
-
- @Returns:
-
--<!-- ##### FUNCTION mrp_time_from_tm ##### -->
--<para>
--
--</para>
--
--@tm:
--@Returns:
--
- <!-- ##### MACRO textdomain ##### -->
- <para>
-
-diff --git a/docs/libplanner/tmpl/mrp-application.sgml b/docs/libplanner/tmpl/mrp-application.sgml
-index 6511324..1e2e794 100644
---- a/docs/libplanner/tmpl/mrp-application.sgml
-+++ b/docs/libplanner/tmpl/mrp-application.sgml
-@@ -17,6 +17,9 @@ the main project application object.
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
- <!-- ##### STRUCT MrpApplicationPriv ##### -->
- <para>
- A private struct for internal use only. The definition of this
-@@ -39,6 +42,7 @@ libmrproject.
-
- </para>
-
-+@void:
- @Returns:
-
-
-diff --git a/docs/libplanner/tmpl/mrp-assignment.sgml b/docs/libplanner/tmpl/mrp-assignment.sgml
-index 178bf2c..29f367e 100644
---- a/docs/libplanner/tmpl/mrp-assignment.sgml
-+++ b/docs/libplanner/tmpl/mrp-assignment.sgml
-@@ -17,6 +17,9 @@ MrpAssignment
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
- <!-- ##### STRUCT MrpAssignmentPriv ##### -->
- <para>
- A private struct for internal use only. The definition of this
-@@ -50,6 +53,7 @@ Represents an assignment, i.e. the assignment of a task to a resource.
-
- </para>
-
-+@void:
- @Returns:
-
-
-@@ -78,7 +82,5 @@ Represents an assignment, i.e. the assignment of a task to a resource.
-
- @assignment:
- @Returns:
--<!-- # Unused Parameters # -->
--@assignemnt:
-
-
-diff --git a/docs/libplanner/tmpl/mrp-calendar.sgml b/docs/libplanner/tmpl/mrp-calendar.sgml
-index 5de7f6f..cda9da4 100644
---- a/docs/libplanner/tmpl/mrp-calendar.sgml
-+++ b/docs/libplanner/tmpl/mrp-calendar.sgml
-@@ -25,6 +25,9 @@ can be overridden to use another day type as well.
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
- <!-- ##### STRUCT MrpCalendarPriv ##### -->
- <para>
- A private struct for internal use only. The definition of this
-@@ -166,8 +169,6 @@ Represents a time interval.
- @date:
- @check_ancestors:
- @Returns:
--<!-- # Unused Parameters # -->
--@time:
-
-
- <!-- ##### FUNCTION mrp_calendar_get_default_day ##### -->
-@@ -178,8 +179,6 @@ Represents a time interval.
- @calendar:
- @week_day:
- @Returns:
--<!-- # Unused Parameters # -->
--@time:
-
-
- <!-- ##### FUNCTION mrp_calendar_set_default_days ##### -->
-@@ -189,7 +188,7 @@ Represents a time interval.
-
- @calendar:
- @week_day:
--@Varargs:
-+@...:
-
-
- <!-- ##### FUNCTION mrp_calendar_set_days ##### -->
-@@ -199,7 +198,7 @@ Represents a time interval.
-
- @calendar:
- @date:
--@Varargs:
-+@...:
-
-
- <!-- ##### FUNCTION mrp_calendar_get_parent ##### -->
-diff --git a/docs/libplanner/tmpl/mrp-day.sgml b/docs/libplanner/tmpl/mrp-day.sgml
-index 1ae4601..1d5751c 100644
---- a/docs/libplanner/tmpl/mrp-day.sgml
-+++ b/docs/libplanner/tmpl/mrp-day.sgml
-@@ -18,6 +18,9 @@ day. Other examples might be custom types like half day, or a holiday.
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
- <!-- ##### STRUCT MrpDay ##### -->
- <para>
- Object representing a day in the project.
-@@ -120,6 +123,7 @@ Object representing a day in the project.
-
- </para>
-
-+@void:
- @Returns:
-
-
-@@ -128,6 +132,7 @@ Object representing a day in the project.
-
- </para>
-
-+@void:
- @Returns:
-
-
-@@ -136,6 +141,7 @@ Object representing a day in the project.
-
- </para>
-
-+@void:
- @Returns:
-
-
-diff --git a/docs/libplanner/tmpl/mrp-error.sgml b/docs/libplanner/tmpl/mrp-error.sgml
-index 19c170c..31ebf03 100644
---- a/docs/libplanner/tmpl/mrp-error.sgml
-+++ b/docs/libplanner/tmpl/mrp-error.sgml
-@@ -17,6 +17,9 @@ MrpError
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
- <!-- ##### MACRO MRP_ERROR ##### -->
- <para>
- Error domain for libmrproject.
-diff --git a/docs/libplanner/tmpl/mrp-group.sgml b/docs/libplanner/tmpl/mrp-group.sgml
-index 7075576..b1be5ad 100644
---- a/docs/libplanner/tmpl/mrp-group.sgml
-+++ b/docs/libplanner/tmpl/mrp-group.sgml
-@@ -17,6 +17,9 @@ MrpGroup
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
- <!-- ##### STRUCT MrpGroupPriv ##### -->
- <para>
- A private struct for internal use only. The definition of this
-@@ -55,6 +58,7 @@ Object representing a resource group.
-
- </para>
-
-+@void:
- @Returns:
-
-
-diff --git a/docs/libplanner/tmpl/mrp-object.sgml b/docs/libplanner/tmpl/mrp-object.sgml
-index 50a3f23..3aff517 100644
---- a/docs/libplanner/tmpl/mrp-object.sgml
-+++ b/docs/libplanner/tmpl/mrp-object.sgml
-@@ -17,6 +17,9 @@ MrpObject
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
- <!-- ##### STRUCT MrpObjectPriv ##### -->
- <para>
- A private struct for internal use only. The definition of this
-@@ -74,7 +77,7 @@ The base class for objects in libmrproject.
-
- @object:
- @first_property_name:
--@Varargs:
-+@...:
-
-
- <!-- ##### FUNCTION mrp_object_get ##### -->
-@@ -84,7 +87,7 @@ The base class for objects in libmrproject.
-
- @object:
- @first_property_name:
--@Varargs:
-+@...:
-
-
- <!-- ##### FUNCTION mrp_object_set_valist ##### -->
-diff --git a/docs/libplanner/tmpl/mrp-project.sgml b/docs/libplanner/tmpl/mrp-project.sgml
-index bac078d..a88d923 100644
---- a/docs/libplanner/tmpl/mrp-project.sgml
-+++ b/docs/libplanner/tmpl/mrp-project.sgml
-@@ -17,6 +17,9 @@ MrpProject
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
- <!-- ##### STRUCT MrpProjectPriv ##### -->
- <para>
- A private struct for internal use only. The definition of this
-@@ -505,8 +508,6 @@ mrp_project_task_traverse(). The traversal can be stopped by returning
- @start:
- @finish:
- @Returns:
--<!-- # Unused Parameters # -->
--@duration:
-
-
- <!-- ##### FUNCTION mrp_project_get_properties_from_type ##### -->
-diff --git a/docs/libplanner/tmpl/mrp-property.sgml b/docs/libplanner/tmpl/mrp-property.sgml
-index 01585a8..f09425e 100644
---- a/docs/libplanner/tmpl/mrp-property.sgml
-+++ b/docs/libplanner/tmpl/mrp-property.sgml
-@@ -19,6 +19,9 @@ GUI application, or plugins that add functionality.
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
- <!-- ##### TYPEDEF MrpProperty ##### -->
- <para>
- Object representing a custom property in the project.
-diff --git a/docs/libplanner/tmpl/mrp-relation.sgml b/docs/libplanner/tmpl/mrp-relation.sgml
-index 7c651ad..fd790c7 100644
---- a/docs/libplanner/tmpl/mrp-relation.sgml
-+++ b/docs/libplanner/tmpl/mrp-relation.sgml
-@@ -20,6 +20,9 @@ finished, plus a lag time.
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
- <!-- ##### STRUCT MrpRelationPriv ##### -->
- <para>
- A private struct for internal use only. The definition of this
-diff --git a/docs/libplanner/tmpl/mrp-resource.sgml b/docs/libplanner/tmpl/mrp-resource.sgml
-index 528459c..2ceaab3 100644
---- a/docs/libplanner/tmpl/mrp-resource.sgml
-+++ b/docs/libplanner/tmpl/mrp-resource.sgml
-@@ -17,6 +17,9 @@ represents a resource in the project.
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
- <!-- ##### STRUCT MrpResourcePriv ##### -->
- <para>
- A private struct for internal use only. The definition of this
-@@ -105,6 +108,7 @@ The type of the resource, work or material.
-
- </para>
-
-+@void:
- @Returns:
-
-
-diff --git a/docs/libplanner/tmpl/mrp-task.sgml b/docs/libplanner/tmpl/mrp-task.sgml
-index 6f27c03..7928ae0 100644
---- a/docs/libplanner/tmpl/mrp-task.sgml
-+++ b/docs/libplanner/tmpl/mrp-task.sgml
-@@ -17,6 +17,9 @@ represents a task in the project.
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
- <!-- ##### STRUCT MrpTaskPriv ##### -->
- <para>
- A private struct for internal use only. The definition of this
-@@ -179,6 +182,7 @@ The type of constraint for the task. The default is %MRP_CONSTRAINT_ASAP.
-
- </para>
-
-+@void:
- @Returns:
-
-
-@@ -278,9 +282,6 @@ The type of constraint for the task. The default is %MRP_CONSTRAINT_ASAP.
- @task_a:
- @task_b:
- @Returns:
--<!-- # Unused Parameters # -->
--@a:
--@b:
-
-
- <!-- ##### FUNCTION mrp_task_has_relation ##### -->
-diff --git a/docs/libplanner/tmpl/mrp-time.sgml b/docs/libplanner/tmpl/mrp-time.sgml
-index 346bf68..bce9a34 100644
---- a/docs/libplanner/tmpl/mrp-time.sgml
-+++ b/docs/libplanner/tmpl/mrp-time.sgml
-@@ -17,6 +17,9 @@ mrptime
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
- <!-- ##### TYPEDEF mrptime ##### -->
- <para>
- Corresponds to the standard C <type>time_t</type> type.
-@@ -49,6 +52,16 @@ Represents the maximium value for #mrptime.
-
- </para>
-
-+@void:
-+@Returns:
-+
-+
-+<!-- ##### FUNCTION mrp_time_from_tm ##### -->
-+<para>
-+
-+</para>
-+
-+@tm:
- @Returns:
-
-
-diff --git a/docs/libplanner/tmpl/planner.sgml b/docs/libplanner/tmpl/planner.sgml
-index 5397496..8179208 100644
---- a/docs/libplanner/tmpl/planner.sgml
-+++ b/docs/libplanner/tmpl/planner.sgml
-@@ -17,3 +17,6 @@ planner
- <!-- ##### SECTION Stability_Level ##### -->
-
-
-+<!-- ##### SECTION Image ##### -->
-+
-+
diff --git a/src/planner-eds-plugin.c b/src/planner-eds-plugin.c
index 4eb060c..a8229c9 100644
--- a/src/planner-eds-plugin.c
@@ -786,5 +397,5 @@ index 4eb060c..a8229c9 100644
gtk_action_group_set_translation_domain (priv->actions, GETTEXT_PACKAGE);
--
-1.8.0.2
+1.8.2.1
diff --git a/app-office/planner/files/0002-Fix-build-failures-with-Werror.patch b/app-office/planner/files/0002-Fix-build-failures-with-Werror.patch
deleted file mode 100644
index d2abe56..0000000
--- a/app-office/planner/files/0002-Fix-build-failures-with-Werror.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 9e3361bea793519682b073823b6ae284c476fe66 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 29 Dec 2012 00:12:46 +0100
-Subject: [PATCH 2/5] Fix build failures with -Werror
-
----
- src/planner-python-plugin.c | 4 +---
- tests/calendar-test.c | 1 +
- tests/time-test.c | 1 +
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/planner-python-plugin.c b/src/planner-python-plugin.c
-index 61dc077..bd717d6 100644
---- a/src/planner-python-plugin.c
-+++ b/src/planner-python-plugin.c
-@@ -148,7 +148,7 @@ plugin_execute_scripts(PlannerPlugin *plugin, const gchar *dirname)
- filename = g_dir_read_name (dir);
- }
-
-- g_free (dirname);
-+ g_free ((gpointer) dirname);
- g_dir_close (dir);
- }
-
-@@ -156,9 +156,7 @@ G_MODULE_EXPORT void
- plugin_init (PlannerPlugin *plugin)
- {
- PlannerPluginPriv *priv;
-- GDir *dir;
- gchar *dirname;
-- const gchar *filename;
-
- priv = g_new0 (PlannerPluginPriv, 1);
- plugin->priv = priv;
-diff --git a/tests/calendar-test.c b/tests/calendar-test.c
-index a73b569..fa8c4ba 100644
---- a/tests/calendar-test.c
-+++ b/tests/calendar-test.c
-@@ -168,6 +168,7 @@ main (gint argc, gchar **argv)
- CHECK_INTEGER_RESULT (mrp_day_get_id (day_a),
- mrp_day_get_id (day_b));
-
-+ g_object_unref (app);
- return EXIT_SUCCESS;
- }
-
-diff --git a/tests/time-test.c b/tests/time-test.c
-index 37a1540..abb0d45 100644
---- a/tests/time-test.c
-+++ b/tests/time-test.c
-@@ -22,6 +22,7 @@ main (gint argc, gchar **argv)
- t = mrp_time_compose (2002, 3, 31, 0, 0, 0);
-
- /* Test mrp_time_new_from_string */
-+ CHECK_STRING_RESULT (mrp_time_to_string (t), "20020331T000000Z");
- CHECK_STRING_RESULT (STRING (mrp_time_from_string ("20020329", NULL)), "20020329T000000Z");
- CHECK_STRING_RESULT (STRING (mrp_time_from_string ("19991231", NULL)), "19991231T000000Z");
- CHECK_STRING_RESULT (STRING (mrp_time_from_string ("invalid", NULL)), "19700101T000000Z");
---
-1.8.0.2
-
diff --git a/app-office/planner/files/0003-Port-GValueArray-to-GArray.patch b/app-office/planner/files/0003-Port-GValueArray-to-GArray.patch
deleted file mode 100644
index 9d19839..0000000
--- a/app-office/planner/files/0003-Port-GValueArray-to-GArray.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 18077d98a73ac6bb6f2ecf9e32a1c8cd99a4941d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 29 Dec 2012 00:13:07 +0100
-Subject: [PATCH 3/5] Port GValueArray to GArray
-
-GValueArray has been deprecated since glib-2.32.
----
- libplanner/mrp-old-xml.c | 13 +++++++------
- libplanner/mrp-parser.c | 10 +++++-----
- 2 files changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/libplanner/mrp-old-xml.c b/libplanner/mrp-old-xml.c
-index be4b9c7..8b79bc2 100644
---- a/libplanner/mrp-old-xml.c
-+++ b/libplanner/mrp-old-xml.c
-@@ -774,11 +774,11 @@ old_xml_read_project_properties (MrpParser *parser)
- g_free (phase);
- }
-
--static GValueArray *
-+static GArray *
- old_xml_read_string_list (xmlNodePtr node,
- MrpObject *object)
- {
-- GValueArray *array;
-+ GArray *array;
- GValue value = { 0 };
- xmlNodePtr child;
- gchar *str;
-@@ -787,7 +787,8 @@ old_xml_read_string_list (xmlNodePtr node,
- return NULL;
- }
-
-- array = g_value_array_new (0);
-+ array = g_array_new (TRUE, TRUE, sizeof(GValue *));
-+ g_array_set_clear_func (array, (GDestroyNotify) g_value_unset);
-
- g_value_init (&value, G_TYPE_STRING);
-
-@@ -798,7 +799,7 @@ old_xml_read_string_list (xmlNodePtr node,
-
- if (str && str[0]) {
- g_value_set_string (&value, str);
-- g_value_array_append (array, &value);
-+ g_array_append_val (array, value);
- }
-
- g_free (str);
-@@ -1352,7 +1353,7 @@ old_xml_set_property_from_node (MrpProject *project,
- gfloat f;
- gchar *name;
- gchar *str;
-- GValueArray *array;
-+ GArray *array;
- GList *phases;
-
- name = old_xml_get_string (node, "name");
-@@ -1401,7 +1402,7 @@ old_xml_set_property_from_node (MrpProject *project,
- array = old_xml_read_string_list (node, object);
- if (array) {
- mrp_object_set (object, name, array, NULL);
-- g_value_array_free (array);
-+ g_array_free (array, TRUE);
- }
- break;
- case MRP_PROPERTY_TYPE_INT:
-diff --git a/libplanner/mrp-parser.c b/libplanner/mrp-parser.c
-index 81099a7..f4448e3 100644
---- a/libplanner/mrp-parser.c
-+++ b/libplanner/mrp-parser.c
-@@ -178,7 +178,7 @@ mpp_property_to_string (MrpObject *object,
- gint i;
- gfloat f;
- mrptime date;
-- GValueArray *array;
-+ GArray *array;
-
- name = mrp_property_get_name (property);
-
-@@ -411,7 +411,7 @@ mpp_write_string_list (xmlNodePtr node,
- MrpObject *object)
- {
- xmlNodePtr child;
-- GValueArray *array;
-+ GArray *array;
- GValue *value;
- gint i;
-
-@@ -420,14 +420,14 @@ mpp_write_string_list (xmlNodePtr node,
- return;
- }
-
-- for (i = 0; i < array->n_values; i++) {
-- value = g_value_array_get_nth (array, i);
-+ for (i = 0; i < array->len; i++) {
-+ value = g_array_index (array, GValue *, i);
-
- child = xmlNewChild (node, NULL, "list-item", NULL);
- xmlSetProp (child, "value", g_value_get_string (value));
- }
-
-- g_value_array_free (array);
-+ g_array_free (array, TRUE);
- }
-
- static void
---
-1.8.0.2
-
diff --git a/app-office/planner/files/0005-Run-autoupdate.patch b/app-office/planner/files/0005-Run-autoupdate.patch
deleted file mode 100644
index f02fcfa..0000000
--- a/app-office/planner/files/0005-Run-autoupdate.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 93f39fce452e874f1240b3580e242fefb8c7c5c3 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 29 Dec 2012 17:08:33 +0100
-Subject: [PATCH 5/5] Run autoupdate
-
----
- Makefile.am | 6 ------
- configure.ac | 27 ++++++++++++++-------------
- 2 files changed, 14 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 128551f..4c81a31 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -43,12 +43,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
- --disable-scrollkeeper \
- --disable-update-mimedb
-
--# Workaround broken scrollkeeper that doesn't remove its files on
--# uninstall. Same with the shared mime info, the generated files
--# aren't empty when there is no mime data
--distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper' | \
-- grep -v '/share/mime/' | grep -v '/share/omf/planner'
--
- DISTCLEANFILES = intltool-extract intltool-merge intltool-update
-
- dist-hook:
-diff --git a/configure.ac b/configure.ac
-index 7e0cd8a..b512cad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,17 +1,18 @@
- # Process this file with autoconf to produce a configure script.
--# require autoconf 2.54
--AC_PREREQ(2.54)
-+# require autoconf 2.69
-+AC_PREREQ([2.69])
-
--AC_INIT(AUTHORS)
--AM_INIT_AUTOMAKE(planner, 0.14.6)
--m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
--AM_CONFIG_HEADER(config.h)
-+AC_INIT([planner], [0.14.6])
-+AM_INIT_AUTOMAKE([-Wall 1.11])
-+AM_SILENT_RULES([yes])
-+AC_CONFIG_HEADERS([config.h])
-+AC_CONFIG_SRCDIR([AUTHORS])
-
--AC_ISC_POSIX
-+AC_SEARCH_LIBS([strerror],[cposix])
- AC_PROG_CC
--AC_STDC_HEADERS
--AM_DISABLE_STATIC
--AM_PROG_LIBTOOL
-+AC_HEADER_STDC
-+AC_DISABLE_STATIC([])
-+LT_INIT
-
- AM_PATH_GLIB_2_0
-
-@@ -29,8 +30,7 @@ AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, true)
- AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, true)
-
- AC_ARG_ENABLE(update-mimedb,
-- AC_HELP_STRING([--disable-update-mimedb],
-- [disable the update-mime-database after install [default=no]]),,
-+ AS_HELP_STRING([--disable-update-mimedb],[disable the update-mime-database after install [default=no]]),,
- enable_update_mimedb=yes)
- AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
-
-@@ -336,9 +336,10 @@ eds-backend/utils/Makefile
- libplanner-1.pc
- ])
-
--AC_OUTPUT([
-+AC_CONFIG_FILES([
- data/planner.desktop.in
- ])
-+AC_OUTPUT
-
- echo
- echo "Planner prefix : $prefix"
---
-1.8.0.2
-
diff --git a/app-office/planner/planner-9999.ebuild b/app-office/planner/planner-9999.ebuild
index 58721b9..fe3c504 100644
--- a/app-office/planner/planner-9999.ebuild
+++ b/app-office/planner/planner-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
inherit autotools eutils gnome2 python-single-r1
if [[ ${PV} = 9999 ]]; then
@@ -36,7 +36,7 @@ RDEPEND="
>=dev-libs/libxslt-1.1.23
python? (
${PYTHON_DEPS}
- >=dev-python/pygtk-2.6:2 )
+ >=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}] )
eds? (
>=gnome-extra/evolution-data-server-3.6
>=mail-client/evolution-3.6 )"
@@ -58,17 +58,8 @@ src_prepare() {
# Find python in a faster way, bug #344231, upstream bug #654044
epatch "${FILESDIR}"/0001-Speed-up-python-path-detection.patch
- # Fix build failures
- epatch "${FILESDIR}"/0002-Fix-build-failures-with-Werror.patch
-
- # Switch from GValueArray to GArray
- epatch "${FILESDIR}"/0003-Port-GValueArray-to-GArray.patch
-
# Fix build with eds-3.6
- epatch "${FILESDIR}"/0004-Fix-build-failure-with-evolution-data-server-3.6.patch
-
- # Fix eautoreconf failures
- epatch "${FILESDIR}"/0005-Run-autoupdate.patch
+ epatch "${FILESDIR}"/0002-Fix-build-failure-with-evolution-data-server-3.6.patch
[[ ${PV} != 9999 ]] && eautoreconf
@@ -80,15 +71,15 @@ src_prepare() {
src_configure() {
# FIXME: disable eds backend for now, it fails, upstream bug #654005
- G2CONF="${G2CONF}
- $(use_enable python)
- $(use_enable python python-plugin)
- $(use_enable eds)
- --disable-eds-backend
- --with-database=no
- --disable-update-mimedb"
+ gnome2_src_configure \
+ $(use_enable python) \
+ $(use_enable python python-plugin) \
+ $(use_enable eds) \
+ --disable-eds-backend \
+ --with-database=no \
+ --disable-update-mimedb \
+ --enable-compile-warnings=yes
#$(use_enable eds eds-backend)
- gnome2_src_configure
}
src_install() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-20 11:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-20 11:33 [gentoo-commits] proj/gnome:master commit in: app-office/planner/, app-office/planner/files/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2012-12-29 16:36 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox