summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/pimlico/dates
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-08 22:51:41 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-08 22:51:41 +0200
commit1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch)
treea21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-gnome/recipes-gnome/pimlico/dates
downloadmeta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/pimlico/dates')
-rw-r--r--meta-gnome/recipes-gnome/pimlico/dates/0001-Update-to-new-evolution-data-server-e_source_-color-.patch72
-rw-r--r--meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch44
-rw-r--r--meta-gnome/recipes-gnome/pimlico/dates/make-382.patch18
-rw-r--r--meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch37
4 files changed, 171 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/pimlico/dates/0001-Update-to-new-evolution-data-server-e_source_-color-.patch b/meta-gnome/recipes-gnome/pimlico/dates/0001-Update-to-new-evolution-data-server-e_source_-color-.patch
new file mode 100644
index 0000000000..4550d298d9
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/dates/0001-Update-to-new-evolution-data-server-e_source_-color-.patch
@@ -0,0 +1,72 @@
1From a8ddfc4b91f2ab3d955fe528ddb98ce2c5545795 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 4 Aug 2013 13:44:50 +0200
4Subject: [PATCH] Update to new evolution-data-server e_source_*color APIs
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 src/dates_gtk.c | 6 +++---
9 src/dates_main.c | 2 +-
10 src/dates_view.c | 6 +++++-
11 3 files changed, 9 insertions(+), 5 deletions(-)
12
13diff --git a/src/dates_gtk.c b/src/dates_gtk.c
14index 78e71bb..ac539d2 100644
15--- a/src/dates_gtk.c
16+++ b/src/dates_gtk.c
17@@ -1072,7 +1072,7 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d)
18 #endif
19
20 /* Set the colour */
21- e_source_set_color (source, new_colour);
22+ e_source_set_color_spec (source, new_colour);
23
24 /* Set the group for the source */
25 e_source_set_group (source, group);
26@@ -1335,7 +1335,7 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d)
27 gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
28
29 /* Get the colour from the the source */
30- e_source_get_color (source, &raw_colour);
31+ raw_colour = e_source_peek_color_spec (source);
32
33 /* Munge this into something usable */
34 colour.red = (guint16)(((raw_colour & 0xff0000) >> 16) << 8);
35@@ -1459,7 +1459,7 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d)
36 new_colour <<= 8;
37 #endif
38 /* Update the colour */
39- e_source_set_color (source, new_colour);
40+ e_source_set_color_spec (source, new_colour);
41
42 /* And the name */
43 e_source_set_name (source, (gtk_entry_get_text (GTK_ENTRY (name_entry))));
44diff --git a/src/dates_main.c b/src/dates_main.c
45index ce05fe8..7273c63 100644
46--- a/src/dates_main.c
47+++ b/src/dates_main.c
48@@ -112,7 +112,7 @@ dates_load_calendars (DatesData *d)
49 system_source = e_source_new (_("Personal"), "system");
50
51 /* Default Evolution colour */
52- e_source_set_color (system_source, 0xBECEDD);
53+ e_source_set_color_spec (system_source, 0xBECEDD);
54
55 /* Set the group for the source and put it in the group */
56 e_source_set_group (system_source, local_group);
57diff --git a/src/dates_view.c b/src/dates_view.c
58index d65db2f..f8efb9c 100644
59--- a/src/dates_view.c
60+++ b/src/dates_view.c
61@@ -4876,7 +4880,7 @@ dates_view_add_calendar (DatesView *view, ECal *ecal)
62 cal->text_gc = gdk_gc_new (
63 GDK_DRAWABLE (priv->main->window));
64
65- if (e_source_get_color (source, &colour)) {
66+ if (colour = e_source_peek_color_spec (source)) {
67 GdkColor gcolour, dgcolour, tgcolour;
68 gcolour.red = ((colour & 0xFF0000) >> 16) * 0x101;
69 gcolour.green = ((colour & 0xFF00) >> 8) * 0x101;
70--
711.8.3.2
72
diff --git a/meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch b/meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch
new file mode 100644
index 0000000000..649d59d916
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch
@@ -0,0 +1,44 @@
1after gcc linking has changed, all the libraries must be explicitely specified
2This patch avoids these linking errors:
3
4
5| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/dates-0.4.11+git0+514185dc1f6588085fda41eb59898b93d0487dd4-r2/git/src'^M
6...
7| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: e: invalid DSO for symbol `pow@@GLIBC_2.0' definition^M
8| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libm.so: could not read symbols: Bad value^M
9| collect2: ld returned 1 exit status^M
10| make[2]: *** [dates] Error 1
11
12
13
14| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: z: invalid DSO for symbol `pango_layout_get_extents' definition
15| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpango-1.0.so: could not read symbols: Bad value
16| collect2: ld returned 1 exit status
17| make[2]: *** [dates] Error 1
18
19
20Nitin A Kamble <nitin.a.kamble@intel.com>
21Date: 2011/01/11
22
23Update:
24This is identified as a libtool issue. While creating the libgtkdatesview.la
25file, libtool should have added these needed libraries in there.
26 A bug has been created for this issue:
27 http://bugzilla.pokylinux.org/show_bug.cgi?id=664
28Nitin A Kamble <nitin.a.kamble@intel.com>
29Date: 2011/01/19
30
31Upstream-Status: Pending
32
33Index: git/src/Makefile.am
34===================================================================
35--- git.orig/src/Makefile.am
36+++ git/src/Makefile.am
37@@ -34,6 +34,6 @@ dates_SOURCES = $(platform) \
38 gconf-bridge.h \
39 gconf-bridge.c
40
41-dates_LDADD = $(DATES_LIBS) $(OWL_LIBS) libgtkdatesview.la
42+dates_LDADD = $(DATES_LIBS) $(OWL_LIBS) libgtkdatesview.la -lm -lpango-1.0
43
44 MAINTAINERCLEANFILES = config.h.in Makefile.in
diff --git a/meta-gnome/recipes-gnome/pimlico/dates/make-382.patch b/meta-gnome/recipes-gnome/pimlico/dates/make-382.patch
new file mode 100644
index 0000000000..fad3c5826e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/dates/make-382.patch
@@ -0,0 +1,18 @@
1Make 3.82 is offended by the use of spaces instead of tabs. This has been fixed
2in upstream git.
3
4JL - 15/12/10
5
6Upstream-Status: Accepted
7
8Index: git/Makefile.am
9===================================================================
10--- git.orig/Makefile.am
11+++ git/Makefile.am
12@@ -7,5 +7,5 @@ DISTCLEANFILES = intltool-extract intlto
13 MAINTAINERCLEANFILES = $(DISTCLEANFILES) aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
14
15 snapshot:
16- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
17+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
18
diff --git a/meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch b/meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
new file mode 100644
index 0000000000..6ade4708f2
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
@@ -0,0 +1,37 @@
1uclibc has langinfo.h but it does not define _NL_TIME_FIRST_WEEKDAY
2therefore we introduce a check in configure for the this define
3and then we make sure that we use it when it really exists
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Upstream-Status: Pending
8
9Index: git/configure.ac
10===================================================================
11--- git.orig/configure.ac 2011-07-18 10:34:15.000000000 -0700
12+++ git/configure.ac 2011-07-18 10:54:26.403798188 -0700
13@@ -98,6 +98,8 @@
14 src/libgtkdatesview.pc
15 ])
16
17+AC_CHECK_DECLS([_NL_TIME_FIRST_WEEKDAY],[],[],[[#include <langinfo.h>]])
18+
19 AC_OUTPUT
20
21 echo " "
22Index: git/src/dates_view.c
23===================================================================
24--- git.orig/src/dates_view.c 2011-07-18 10:34:15.000000000 -0700
25+++ git/src/dates_view.c 2011-07-18 10:58:46.093798136 -0700
26@@ -1505,7 +1505,11 @@
27 priv->days = 1;
28 priv->months = 0;
29 priv->months_in_row = 4;
30+#if HAVE_DECL__NL_TIME_FIRST_WEEKDAY
31 priv->week_start = *nl_langinfo (_NL_TIME_FIRST_WEEKDAY) - 1;
32+#else
33+ priv->week_start = 0;
34+#endif
35 priv->dragbox = TRUE;
36 priv->single_click = TRUE;
37 priv->double_click = FALSE;