summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-sato/pimlico/dates.inc2
-rw-r--r--meta/recipes-sato/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch37
-rw-r--r--meta/recipes-sato/pimlico/dates_git.bb6
3 files changed, 42 insertions, 3 deletions
diff --git a/meta/recipes-sato/pimlico/dates.inc b/meta/recipes-sato/pimlico/dates.inc
index 01ab40962..b3be6b6b0 100644
--- a/meta/recipes-sato/pimlico/dates.inc
+++ b/meta/recipes-sato/pimlico/dates.inc
@@ -8,7 +8,7 @@ SECTION = "x11"
DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
RDEPENDS_${PN} = "libedata-cal"
-inherit autotools pkgconfig gtk-icon-cache
+inherit autotools gettext pkgconfig gtk-icon-cache
# Poky/Sato specific enhancements
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 000000000..6ade4708f
--- /dev/null
+++ b/meta/recipes-sato/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
@@ -0,0 +1,37 @@
+uclibc has langinfo.h but it does not define _NL_TIME_FIRST_WEEKDAY
+therefore we introduce a check in configure for the this define
+and then we make sure that we use it when it really exists
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac 2011-07-18 10:34:15.000000000 -0700
++++ git/configure.ac 2011-07-18 10:54:26.403798188 -0700
+@@ -98,6 +98,8 @@
+ src/libgtkdatesview.pc
+ ])
+
++AC_CHECK_DECLS([_NL_TIME_FIRST_WEEKDAY],[],[],[[#include <langinfo.h>]])
++
+ AC_OUTPUT
+
+ echo " "
+Index: git/src/dates_view.c
+===================================================================
+--- git.orig/src/dates_view.c 2011-07-18 10:34:15.000000000 -0700
++++ git/src/dates_view.c 2011-07-18 10:58:46.093798136 -0700
+@@ -1505,7 +1505,11 @@
+ priv->days = 1;
+ priv->months = 0;
+ priv->months_in_row = 4;
++#if HAVE_DECL__NL_TIME_FIRST_WEEKDAY
+ priv->week_start = *nl_langinfo (_NL_TIME_FIRST_WEEKDAY) - 1;
++#else
++ priv->week_start = 0;
++#endif
+ priv->dragbox = TRUE;
+ priv->single_click = TRUE;
+ priv->double_click = FALSE;
diff --git a/meta/recipes-sato/pimlico/dates_git.bb b/meta/recipes-sato/pimlico/dates_git.bb
index 4b6a3e9f4..094ef30e8 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 \
SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4"
PV = "0.4.11+git${SRCPV}"
-PR = "r3"
+PR = "r4"
S = "${WORKDIR}/git"
SRC_URI = "git://git.gnome.org/${BPN};protocol=git \
file://make-382.patch \
- file://dso_linking_change_build_fix.patch"
+ file://dso_linking_change_build_fix.patch \
+ file://uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch \
+ "