From dea63e3f55e98412f45d70bb0ba945b52c994853 Mon Sep 17 00:00:00 2001
From: =?utf8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org>
Date: Thu, 28 Aug 2014 17:59:54 +0200
Subject: [PATCH] libpinyin: remove unused patches
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: Iea8e90a76c3949ecc9c2202ac45596cc5ec05526
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
---
 .../libpinyin/files/Fix_Crosscompile.patch         | 27 -----------------
 recipes-tizen/libpinyin/libpinyin-extraconf.inc    | 22 +++++---------
 .../libpinyin/0001-Yocto-correct-build-issue.patch | 35 ----------------------
 3 files changed, 8 insertions(+), 76 deletions(-)
 delete mode 100644 recipes-tizen/libpinyin/files/Fix_Crosscompile.patch
 delete mode 100644 recipes-tizen/libpinyin/libpinyin/0001-Yocto-correct-build-issue.patch

diff --git a/recipes-tizen/libpinyin/files/Fix_Crosscompile.patch b/recipes-tizen/libpinyin/files/Fix_Crosscompile.patch
deleted file mode 100644
index 661b35c..0000000
--- a/recipes-tizen/libpinyin/files/Fix_Crosscompile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 1e80530..90d4e02 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -47,6 +47,9 @@ libpinyin_dbdir		= $(libdir)/libpinyin/data
- 
- CLEANFILES		= $(binary_model_data)
- 
-+utils_storage		= ../utils/storage
-+utils_training		= ../utils/training
-+
- interpolation2.text:
- 	wget http://downloads.sourceforge.net/libpinyin/models/model7.text.tar.gz
- 	tar xvf model7.text.tar.gz -C $(top_srcdir)/data
-@@ -56,9 +59,9 @@ $(tablefiles): interpolation2.text
- 
- bigram.db: $(textual_model_data)
- 	$(RM) $(binary_model_data)
--	../utils/storage/gen_binary_files --table-dir $(top_srcdir)/data
--	../utils/storage/import_interpolation --table-dir $(top_srcdir)/data < $(top_srcdir)/data/interpolation2.text
--	../utils/training/gen_unigram --table-dir $(top_srcdir)/data
-+	$(utils_storage)/gen_binary_files --table-dir $(top_srcdir)/data
-+	$(utils_storage)/import_interpolation --table-dir $(top_srcdir)/data < $(top_srcdir)/data/interpolation2.text
-+	$(utils_training)/gen_unigram --table-dir $(top_srcdir)/data
- 
- phrase_index.bin pinyin_index.bin $(binfiles): bigram.db
- 
diff --git a/recipes-tizen/libpinyin/libpinyin-extraconf.inc b/recipes-tizen/libpinyin/libpinyin-extraconf.inc
index e735a20..c50cc6a 100644
--- a/recipes-tizen/libpinyin/libpinyin-extraconf.inc
+++ b/recipes-tizen/libpinyin/libpinyin-extraconf.inc
@@ -1,21 +1,15 @@
-SRC_URI += "file://Fix_Crosscompile.patch"
-
 DEPENDS_append_class-target += "libpinyin-native"
 
 EXTRA_OEMAKE_class-target += " utils_storage=${STAGING_BINDIR_NATIVE}"
 EXTRA_OEMAKE_class-target += " utils_training=${STAGING_BINDIR_NATIVE}"
 
 do_compile() {
- cd ${S}
-  LANG=C
-  export LANG
-  unset DISPLAY
-  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
-
-  autotools_do_configure
-  oe_runmake -j16
-
+    cd ${S}
+    LANG=C
+    export LANG
+    unset DISPLAY
+    LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+
+    autotools_do_configure
+    oe_runmake -j16
 }
-
-
-
diff --git a/recipes-tizen/libpinyin/libpinyin/0001-Yocto-correct-build-issue.patch b/recipes-tizen/libpinyin/libpinyin/0001-Yocto-correct-build-issue.patch
deleted file mode 100644
index 7a500bf..0000000
--- a/recipes-tizen/libpinyin/libpinyin/0001-Yocto-correct-build-issue.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From aa90c99fd90e1944684c7fe268611136d568e691 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org>
-Date: Mon, 18 Aug 2014 14:39:54 +0200
-Subject: [PATCH] Yocto: correct build issue
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
----
- data/Makefile.am | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 1e80530..7a7afc1 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -56,9 +56,11 @@ $(tablefiles): interpolation2.text
- 
- bigram.db: $(textual_model_data)
- 	$(RM) $(binary_model_data)
--	../utils/storage/gen_binary_files --table-dir $(top_srcdir)/data
--	../utils/storage/import_interpolation --table-dir $(top_srcdir)/data < $(top_srcdir)/data/interpolation2.text
--	../utils/training/gen_unigram --table-dir $(top_srcdir)/data
-+	cd $(top_srcdir)/utils/storage
-+	gen_binary_files --table-dir $(top_srcdir)/data
-+	import_interpolation --table-dir $(top_srcdir)/data < $(top_srcdir)/data/interpolation2.text
-+	cd $(top_srcdir)/utils/training
-+	gen_unigram --table-dir $(top_srcdir)/data
- 
- phrase_index.bin pinyin_index.bin $(binfiles): bigram.db
- 
--- 
-1.8.1.4
-
-- 
2.7.4