summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-11-30 08:16:57 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2011-12-01 09:19:29 +0100
commit45d7250d64bf7d7c2d29d2dbf61bb6c30b683a80 (patch)
treeb5c2b0bc6e574fd322f6e2a5a0ed06cd335280d6
parent4a72b57c620d2800ceac7a66e54b17235511d835 (diff)
downloadmeta-openembedded-45d7250d64bf7d7c2d29d2dbf61bb6c30b683a80.tar.gz
elementary: add gettextize patch
* normally we would call gettextize from do_configure, but efl.bbclass is running do_configure_prepend() { autopoint || touch config.rpath } before that and this respects AM_GNU_GETTEXT_VERSION which is 0.17 and later it fails with; *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.17 but the autoconf macros are from gettext version 0.18 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--meta-efl/recipes-efl/efl/elementary/0001-elementary-gettextize-0.18.1.patch76
-rw-r--r--meta-efl/recipes-efl/efl/elementary_svn.bb4
2 files changed, 79 insertions, 1 deletions
diff --git a/meta-efl/recipes-efl/efl/elementary/0001-elementary-gettextize-0.18.1.patch b/meta-efl/recipes-efl/efl/elementary/0001-elementary-gettextize-0.18.1.patch
new file mode 100644
index 000000000..0dc16600b
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/elementary/0001-elementary-gettextize-0.18.1.patch
@@ -0,0 +1,76 @@
1From 5b81eac20242ece02f8bc42549783604a326f75d Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 17 Nov 2011 11:36:29 +0100
4Subject: [PATCH] elementary: gettextize
5
6* was complaining about wrong version
7 *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.17 but the autoconf macros are from gettext version 0.18
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 Makefile.am | 2 +-
12 configure.ac | 4 ++--
13 po/ChangeLog | 11 +++++++++++
14 3 files changed, 14 insertions(+), 3 deletions(-)
15 delete mode 100644 ChangeLog
16
17diff --git a/ChangeLog b/ChangeLog
18deleted file mode 100644
19index e69de29..0000000
20diff --git a/Makefile.am b/Makefile.am
21index 46d2871..419a429 100644
22--- a/Makefile.am
23+++ b/Makefile.am
24@@ -56,7 +56,7 @@ endif
25
26
27
28-EXTRA_DIST = \
29+EXTRA_DIST = config.rpath \
30 README \
31 AUTHORS \
32 COPYING \
33diff --git a/configure.ac b/configure.ac
34index e5ad88c..f204693 100644
35--- a/configure.ac
36+++ b/configure.ac
37@@ -631,7 +631,7 @@ EFL_ENABLE_BIN([elementary-test])
38 EFL_ENABLE_BIN([elementary-config])
39
40 m4_ifdef([AM_GNU_GETTEXT_VERSION], [
41-AM_GNU_GETTEXT_VERSION([0.17])
42+AM_GNU_GETTEXT_VERSION([0.18.1])
43 ])
44
45 m4_ifdef([AM_GNU_GETTEXT], [
46@@ -657,7 +657,7 @@ EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="
47 EFL_CHECK_INSTALL_EXAMPLES([enable_install_examples="yes"], [enable_install_examples="no"])
48
49
50-AC_OUTPUT([
51+AC_OUTPUT([ po/Makefile.in
52 Makefile
53 elementary.spec
54 elementary.pc
55diff --git a/po/ChangeLog b/po/ChangeLog
56index 31234d3..8ca1011 100644
57--- a/po/ChangeLog
58+++ b/po/ChangeLog
59@@ -1,3 +1,14 @@
60+2011-11-17 gettextize <bug-gnu-gettext@gnu.org>
61+
62+ * Makefile.in.in: New file, from gettext-0.18.1.
63+ * Rules-quot: New file, from gettext-0.18.1.
64+ * boldquot.sed: New file, from gettext-0.18.1.
65+ * en@boldquot.header: New file, from gettext-0.18.1.
66+ * en@quot.header: New file, from gettext-0.18.1.
67+ * insert-header.sin: New file, from gettext-0.18.1.
68+ * quot.sed: New file, from gettext-0.18.1.
69+ * remove-potcdate.sin: New file, from gettext-0.18.1.
70+
71 2010-12-26 gettextize <bug-gnu-gettext@gnu.org>
72
73 * Makefile.in.in: New file, from gettext-0.17.
74--
751.7.8.rc1
76
diff --git a/meta-efl/recipes-efl/efl/elementary_svn.bb b/meta-efl/recipes-efl/efl/elementary_svn.bb
index 4051caf25..840cb11e9 100644
--- a/meta-efl/recipes-efl/efl/elementary_svn.bb
+++ b/meta-efl/recipes-efl/efl/elementary_svn.bb
@@ -6,7 +6,9 @@ PV = "0.8.0+svnr${SRCPV}"
6SRCREV = "${EFL_SRCREV}" 6SRCREV = "${EFL_SRCREV}"
7 7
8inherit efl gettext 8inherit efl gettext
9SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep" 9SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \
10 file://0001-elementary-gettextize-0.18.1.patch \
11"
10S = "${WORKDIR}/${SRCNAME}" 12S = "${WORKDIR}/${SRCNAME}"
11 13
12EXTRA_OECONF = "\ 14EXTRA_OECONF = "\