merge of '6686ff23579d58fcc1cd77385b2f7dab97200433'

     and 'a4d4654dbba442a770bc9686a79cb078180ead5b'

7 files changed, 0 insertions, 109 deletions

diff --git a/packages/efl1/ecore/configure.patch b/packages/efl1/ecore/configure.patch
deleted file mode 100644
index 9939bd9d34..0000000000
--- a/packages/efl1/ecore/configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: ecore/configure.in
-===================================================================
---- ecore.orig/configure.in	2007-08-20 17:21:13.000000000 +0000
-+++ ecore/configure.in	2007-08-20 17:23:31.000000000 +0000
-@@ -16,7 +16,6 @@
- AC_CHECK_SIZEOF(long, 4)
- AM_ENABLE_SHARED
- AM_PROG_LIBTOOL
--AC_C___ATTRIBUTE__
- 							
- if test "x${bindir}" = 'xNONE'; then
-   if test "x${prefix}" = "xNONE"; then
-@@ -238,9 +237,7 @@
- AC_CHECK_HEADER(X11/X.h,
-   [
-    have_x="yes"
--   x_dir=${x_dir:-/usr/X11R6}
--   x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--   x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+   x_libs="${x_libs} -lX11 -lXext"
-   ]
- )
- 
diff --git a/packages/efl1/ecore/ecore_kernel_input_header.patch b/packages/efl1/ecore/ecore_kernel_input_header.patch
deleted file mode 100644
index 99f57ddcff..0000000000
--- a/packages/efl1/ecore/ecore_kernel_input_header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c
-===================================================================
---- ecore-0.9.9.036.orig/src/lib/ecore_fb/ecore_fb_li.c	2006-09-05 01:36:43.000000000 +0100
-+++ ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c	2006-12-02 21:55:54.000000000 +0000
-@@ -1,6 +1,18 @@
- #include "Ecore_Fb.h"
- #include "ecore_fb_private.h"
- 
-+struct input_absinfo {
-+	__s32 value;
-+	__s32 minimum;
-+	__s32 maximum;
-+	__s32 fuzz;
-+	__s32 flat;
-+};
-+
-+
-+#define EV_SYN			0x00
-+#define EV_PWR			0x16
-+#define EV_FF_STATUS		0x17
- 
- /* Copyright (C) Brad Hards (1999-2002).
-  * this macro is used to tell if "bit" is set in "array"
diff --git a/packages/efl1/ecore/fix-tslib-configure.patch b/packages/efl1/ecore/fix-tslib-configure.patch
deleted file mode 100644
index a1fbb21326..0000000000
--- a/packages/efl1/ecore/fix-tslib-configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: ecore-0.9.9.038/configure.in
-===================================================================
---- ecore-0.9.9.038.orig/configure.in
-+++ ecore-0.9.9.038/configure.in
-@@ -1,4 +1,4 @@
--dnl Process this file with autoconf to produce a configure script.
-+<dnl Process this file with autoconf to produce a configure script.
- 
- AC_INIT(configure.in)
- AC_CANONICAL_BUILD
-@@ -321,7 +321,7 @@ tslib_libs=""
- if test "x$have_ecore_fb" = "xyes" ; then
- AC_CHECK_HEADER(tslib.h,
-   [
--   tslib_libs="-ltslib"
-+   tslib_libs="-lts"
-    AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
-   ]
- )
diff --git a/packages/efl1/ecore/remove-bad-code.patch b/packages/efl1/ecore/remove-bad-code.patch
deleted file mode 100644
index 87a8d16bd6..0000000000
--- a/packages/efl1/ecore/remove-bad-code.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h
-===================================================================
---- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_private.h
-+++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h
-@@ -19,8 +19,8 @@
-  #define kernel_ulong_t unsigned long 
-  #define BITS_PER_LONG 32
-  #include <linux/input.h>
-- #undef kernel_ulong_t <-added
-- #undef BITS_PER_LONG <-added
-+ #undef kernel_ulong_t
-+ #undef BITS_PER_LONG
- #else
-  #include <linux/input.h>
- #endif
-Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c
-===================================================================
---- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_li.c
-+++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c
-@@ -1,6 +1,6 @@
- #include "Ecore_Fb.h"
- #include "ecore_fb_private.h"
--
-+/*
- struct input_absinfo {
- 	__s32 value;
- 	__s32 minimum;
-@@ -8,7 +8,7 @@ struct input_absinfo {
- 	__s32 fuzz;
- 	__s32 flat;
- };
--
-+*/
- 
- #define EV_SYN			0x00
- #define EV_PWR			0x16
diff --git a/packages/poppler/poppler_0.5.4.bb b/packages/poppler/poppler_0.5.4.bb
deleted file mode 100644
index 754eccf435..0000000000
--- a/packages/poppler/poppler_0.5.4.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require poppler.inc
-PR = "r3"
diff --git a/packages/poppler/poppler_0.6.2.bb b/packages/poppler/poppler_0.6.4.bb
index 3c1ec00183..3c1ec00183 100644
--- a/packages/poppler/poppler_0.6.2.bb
+++ b/packages/poppler/poppler_0.6.4.bb
diff --git a/packages/poppler/poppler_0.6.bb b/packages/poppler/poppler_0.6.bb
deleted file mode 100644
index 3c1ec00183..0000000000
--- a/packages/poppler/poppler_0.6.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require poppler.inc
-
-PR = "r0"
-
-EXTRA_OECONF_append = " --disable-abiword-output "
-