diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-07-18 15:55:21 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-20 15:27:38 +0100 |
commit | 3eb49d2492a20695df4219edeb26f3530ac29e9f (patch) | |
tree | f58f7e7767d339a5b9f1a8569e55e891748c2a0c | |
parent | 59da55b9f1103980c9c38b9de6c928eb41d939cd (diff) | |
download | poky-3eb49d2492a20695df4219edeb26f3530ac29e9f.tar.gz |
pimlico/dates: Fix build on uclibc
uclibc does not have NL_TIME_FIRST_WEEKDAY
(From OE-Core rev: 0387faee9cf869fd8b9f9e1f5b7a5e23bd37e97e)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-sato/pimlico/dates.inc | 2 | ||||
-rw-r--r-- | meta/recipes-sato/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch | 37 | ||||
-rw-r--r-- | meta/recipes-sato/pimlico/dates_git.bb | 6 |
3 files changed, 42 insertions, 3 deletions
diff --git a/meta/recipes-sato/pimlico/dates.inc b/meta/recipes-sato/pimlico/dates.inc index 01ab409625..b3be6b6b00 100644 --- a/meta/recipes-sato/pimlico/dates.inc +++ b/meta/recipes-sato/pimlico/dates.inc | |||
@@ -8,7 +8,7 @@ SECTION = "x11" | |||
8 | DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" | 8 | DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" |
9 | RDEPENDS_${PN} = "libedata-cal" | 9 | RDEPENDS_${PN} = "libedata-cal" |
10 | 10 | ||
11 | inherit autotools pkgconfig gtk-icon-cache | 11 | inherit autotools gettext pkgconfig gtk-icon-cache |
12 | 12 | ||
13 | # Poky/Sato specific enhancements | 13 | # Poky/Sato specific enhancements |
14 | OWL = "--disable-owl" | 14 | OWL = "--disable-owl" |
diff --git a/meta/recipes-sato/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch b/meta/recipes-sato/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch new file mode 100644 index 0000000000..6ade4708f2 --- /dev/null +++ b/meta/recipes-sato/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | uclibc has langinfo.h but it does not define _NL_TIME_FIRST_WEEKDAY | ||
2 | therefore we introduce a check in configure for the this define | ||
3 | and then we make sure that we use it when it really exists | ||
4 | |||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Index: 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 " " | ||
22 | Index: 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; | ||
diff --git a/meta/recipes-sato/pimlico/dates_git.bb b/meta/recipes-sato/pimlico/dates_git.bb index 4b6a3e9f41..094ef30e88 100644 --- a/meta/recipes-sato/pimlico/dates_git.bb +++ b/meta/recipes-sato/pimlico/dates_git.bb | |||
@@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | |||
7 | 7 | ||
8 | SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4" | 8 | SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4" |
9 | PV = "0.4.11+git${SRCPV}" | 9 | PV = "0.4.11+git${SRCPV}" |
10 | PR = "r3" | 10 | PR = "r4" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | SRC_URI = "git://git.gnome.org/${BPN};protocol=git \ | 14 | SRC_URI = "git://git.gnome.org/${BPN};protocol=git \ |
15 | file://make-382.patch \ | 15 | file://make-382.patch \ |
16 | file://dso_linking_change_build_fix.patch" | 16 | file://dso_linking_change_build_fix.patch \ |
17 | file://uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch \ | ||
18 | " | ||