diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-12-02 09:59:19 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-12-06 13:08:30 +0100 |
| commit | 716d12924e03d7ad54517ccbcd8c5439b8f1c348 (patch) | |
| tree | b9a97ee03d69ff14cbc21e71b6120aa3a7bd9022 /meta-efl | |
| parent | 0d9457c6773ad9d9de7576b5b7ed5610b2d2b8d5 (diff) | |
| download | meta-openembedded-716d12924e03d7ad54517ccbcd8c5439b8f1c348.tar.gz | |
Revert "elementary: add gettextize patch"
* shouldn't be needed without autopoint in e.bbclass, autotools.bbclass
should call gettextize now
This reverts commit 45d7250d64bf7d7c2d29d2dbf61bb6c30b683a80.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
| -rw-r--r-- | meta-efl/recipes-efl/efl/elementary/0001-elementary-gettextize-0.18.1.patch | 76 | ||||
| -rw-r--r-- | meta-efl/recipes-efl/efl/elementary_svn.bb | 4 |
2 files changed, 1 insertions, 79 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 deleted file mode 100644 index 0dc16600b9..0000000000 --- a/meta-efl/recipes-efl/efl/elementary/0001-elementary-gettextize-0.18.1.patch +++ /dev/null | |||
| @@ -1,76 +0,0 @@ | |||
| 1 | From 5b81eac20242ece02f8bc42549783604a326f75d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Thu, 17 Nov 2011 11:36:29 +0100 | ||
| 4 | Subject: [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 | |||
| 9 | Signed-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 | |||
| 17 | diff --git a/ChangeLog b/ChangeLog | ||
| 18 | deleted file mode 100644 | ||
| 19 | index e69de29..0000000 | ||
| 20 | diff --git a/Makefile.am b/Makefile.am | ||
| 21 | index 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 \ | ||
| 33 | diff --git a/configure.ac b/configure.ac | ||
| 34 | index 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 | ||
| 55 | diff --git a/po/ChangeLog b/po/ChangeLog | ||
| 56 | index 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 | -- | ||
| 75 | 1.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 6e9347ec75..fd5c911c3a 100644 --- a/meta-efl/recipes-efl/efl/elementary_svn.bb +++ b/meta-efl/recipes-efl/efl/elementary_svn.bb | |||
| @@ -6,9 +6,7 @@ PV = "0.8.0+svnr${SRCPV}" | |||
| 6 | SRCREV = "${EFL_SRCREV}" | 6 | SRCREV = "${EFL_SRCREV}" |
| 7 | 7 | ||
| 8 | inherit efl gettext | 8 | inherit efl gettext |
| 9 | SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \ | 9 | SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep" |
| 10 | file://0001-elementary-gettextize-0.18.1.patch \ | ||
| 11 | " | ||
| 12 | S = "${WORKDIR}/${SRCNAME}" | 10 | S = "${WORKDIR}/${SRCNAME}" |
| 13 | 11 | ||
| 14 | EXTRA_OECONF = "\ | 12 | EXTRA_OECONF = "\ |
