Patchwork [meta-efl,08/16] Revert "elementary: add gettextize patch"

login
register
mail settings
Submitter Martin Jansa
Date Dec. 6, 2011, 9:57 a.m.
Message ID <879e3ad03bc00140ef14a0292fdd9c17ed3da4e2.1323165311.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/16265/
State Accepted
Commit 716d12924e03d7ad54517ccbcd8c5439b8f1c348
Headers show

Comments

Martin Jansa - Dec. 6, 2011, 9:57 a.m.
* 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>
---
 .../0001-elementary-gettextize-0.18.1.patch        |   76 --------------------
 meta-efl/recipes-efl/efl/elementary_svn.bb         |    4 +-
 2 files changed, 1 insertions(+), 79 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/efl/elementary/0001-elementary-gettextize-0.18.1.patch

Patch

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 0dc1660..0000000
--- a/meta-efl/recipes-efl/efl/elementary/0001-elementary-gettextize-0.18.1.patch
+++ /dev/null
@@ -1,76 +0,0 @@ 
-From 5b81eac20242ece02f8bc42549783604a326f75d Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Thu, 17 Nov 2011 11:36:29 +0100
-Subject: [PATCH] elementary: gettextize
-
-* was complaining about wrong version
-  *** 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>
----
- Makefile.am  |    2 +-
- configure.ac |    4 ++--
- po/ChangeLog |   11 +++++++++++
- 3 files changed, 14 insertions(+), 3 deletions(-)
- delete mode 100644 ChangeLog
-
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/Makefile.am b/Makefile.am
-index 46d2871..419a429 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -56,7 +56,7 @@ endif
- 
- 
- 
--EXTRA_DIST = \
-+EXTRA_DIST = config.rpath  \
- README \
- AUTHORS \
- COPYING \
-diff --git a/configure.ac b/configure.ac
-index e5ad88c..f204693 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -631,7 +631,7 @@ EFL_ENABLE_BIN([elementary-test])
- EFL_ENABLE_BIN([elementary-config])
- 
- m4_ifdef([AM_GNU_GETTEXT_VERSION], [
--AM_GNU_GETTEXT_VERSION([0.17])
-+AM_GNU_GETTEXT_VERSION([0.18.1])
- ])
- 
- m4_ifdef([AM_GNU_GETTEXT], [
-@@ -657,7 +657,7 @@ EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="
- EFL_CHECK_INSTALL_EXAMPLES([enable_install_examples="yes"], [enable_install_examples="no"])
- 
- 
--AC_OUTPUT([
-+AC_OUTPUT([ po/Makefile.in
- Makefile
- elementary.spec
- elementary.pc
-diff --git a/po/ChangeLog b/po/ChangeLog
-index 31234d3..8ca1011 100644
---- a/po/ChangeLog
-+++ b/po/ChangeLog
-@@ -1,3 +1,14 @@
-+2011-11-17  gettextize  <bug-gnu-gettext@gnu.org>
-+
-+	* Makefile.in.in: New file, from gettext-0.18.1.
-+	* Rules-quot: New file, from gettext-0.18.1.
-+	* boldquot.sed: New file, from gettext-0.18.1.
-+	* en@boldquot.header: New file, from gettext-0.18.1.
-+	* en@quot.header: New file, from gettext-0.18.1.
-+	* insert-header.sin: New file, from gettext-0.18.1.
-+	* quot.sed: New file, from gettext-0.18.1.
-+	* remove-potcdate.sin: New file, from gettext-0.18.1.
-+
- 2010-12-26  gettextize  <bug-gnu-gettext@gnu.org>
- 
- 	* Makefile.in.in: New file, from gettext-0.17.
--- 
-1.7.8.rc1
-
diff --git a/meta-efl/recipes-efl/efl/elementary_svn.bb b/meta-efl/recipes-efl/efl/elementary_svn.bb
index 6e9347e..fd5c911 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}"
 SRCREV = "${EFL_SRCREV}"
 
 inherit efl gettext
-SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \
-  file://0001-elementary-gettextize-0.18.1.patch \
-"
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
 S = "${WORKDIR}/${SRCNAME}"
 
 EXTRA_OECONF = "\