On Fri, 2011-03-11 at 19:45 +0100, Julien Cristau wrote: > > #614086, #615706: dates FTBFS > > pochu says this one can be removed Attached nmu seems to fix the problem. First patch is for the dso linking (basically the simplest I found, just putting the .la first and adding -lm), the second is stolen from ubuntu/gentoo to port to the new eds api. The thing is, latter is not applied upstream, I'm not sure it's really maintained upstream and the debian maintainer doesn't seem to care so in the end maybe removing is the way forward... Regards, -- Yves-Alexis
Reading package lists...
Building dependency tree...
Reading state information...
Need to get 481 kB of source archives.
Get:1 http://ftp.fr.debian.org/debian/ sid/main dates 0.4.8-1 (dsc) [1,119 B]
Get:2 http://ftp.fr.debian.org/debian/ sid/main dates 0.4.8-1 (tar) [476 kB]
Get:3 http://ftp.fr.debian.org/debian/ sid/main dates 0.4.8-1 (diff) [3,241 B]
dpkg-source: info: extracting dates in dates-0.4.8
dpkg-source: info: unpacking dates_0.4.8.orig.tar.gz
dpkg-source: info: applying dates_0.4.8-1.diff.gz
Fetched 481 kB in 0s (3,285 kB/s)
Differences in dates between 0.4.8-1 and 0.4.8-1.1
diff -u dates-0.4.8/debian/changelog dates-0.4.8/debian/changelog
--- dates-0.4.8/debian/changelog
+++ dates-0.4.8/debian/changelog
@@ -1,3 +1,17 @@
+dates (0.4.8-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches:
+ - 02_fix-dso-linking added, fixing FTBFS with new linker. closes: #614086
+ - 03_eds-api-usage-fix added, stolen from Ubuntu, port to new EDS api.
+ * debian/rules:
+ - includes autoreconf rule to regenerate Makefiles.
+ * debian/control:
+ - add build-dep on dh-autoreconf.
+ -
+
+ -- Yves-Alexis Perez <corsac@debian.org> Wed, 16 Mar 2011 22:04:55 +0100
+
dates (0.4.8-1) unstable; urgency=low
* New upstream release, acknowlege NMUs
diff -u dates-0.4.8/debian/control dates-0.4.8/debian/control
--- dates-0.4.8/debian/control
+++ dates-0.4.8/debian/control
@@ -3,7 +3,7 @@
Maintainer: Ross Burton <ross@debian.org>
Uploaders: Rob Bradford <robster@debian.org>
Priority: optional
-Build-Depends: debhelper (>= 4.0.0), cdbs, autotools-dev, intltool, libgtk2.0-dev, libgconf2-dev, libecal1.2-dev (>= 1.8), libhildon-1-dev (>= 0.12.0), libdbus-1-dev, libosso-dev
+Build-Depends: debhelper (>= 4.0.0), cdbs, autotools-dev, intltool, libgtk2.0-dev, libgconf2-dev, libecal1.2-dev (>= 1.8), libhildon-1-dev (>= 0.12.0), libdbus-1-dev, libosso-dev, dh-autoreconf
Standards-Version: 3.8.2
Package: dates
diff -u dates-0.4.8/debian/rules dates-0.4.8/debian/rules
--- dates-0.4.8/debian/rules
+++ dates-0.4.8/debian/rules
@@ -6,6 +6,7 @@
DEB_BUILDDIR_dates-hildon := $(BUILDBASEDIR)/hildon
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
only in patch2:
unchanged:
--- dates-0.4.8.orig/debian/patches/02_fix-dso-linking.patch
+++ dates-0.4.8/debian/patches/02_fix-dso-linking.patch
@@ -0,0 +1,15 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5b3f588..02d895c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -35,7 +35,9 @@ dates_SOURCES = $(platform) \
+ gconf-bridge.h \
+ gconf-bridge.c
+
+-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la
++dates_LDADD = libgtkdatesview.la \
++ $(DATES_LIBS) \
++ -lm
+
+ if USE_OWL
+ dates_LDADD += $(top_builddir)/libowl/libowl.la
only in patch2:
unchanged:
--- dates-0.4.8.orig/debian/patches/03_eds-api-usage-fix.patch
+++ dates-0.4.8/debian/patches/03_eds-api-usage-fix.patch
@@ -0,0 +1,155 @@
+From: Lucas Hermann Negri <lucashnegri@gmail.com>
+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).
+Origin: vendor, http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=blob;f=app-office/dates/files/dates-0.4.11-eds-api-usage-fix.patch;h=e7fce46f39ade95ef4d173fb2286c07a60f30953;hb=40ec7f5bb8a1338242048215587796c4618b4fb6
+
+---
+ 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
+
Attachment:
signature.asc
Description: This is a digitally signed message part