From 478487bf0d4e618f671a9fb5bf101ff46474b368 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Jun 2014 11:36:53 +0200
Subject: [PATCH] lzo: use a proper patch for x86 build failure.

---
 srcpkgs/lzo/patches/build-x86.patch      | 20 --------------------
 srcpkgs/lzo/patches/configure-2.07.patch | 12 ++++++++++++
 srcpkgs/lzo/template                     |  2 +-
 3 files changed, 13 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/lzo/patches/build-x86.patch
 create mode 100644 srcpkgs/lzo/patches/configure-2.07.patch

diff --git a/srcpkgs/lzo/patches/build-x86.patch b/srcpkgs/lzo/patches/build-x86.patch
deleted file mode 100644
index adb3618dc8f..00000000000
--- a/srcpkgs/lzo/patches/build-x86.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- include/lzo/lzodefs.h.orig	2014-06-28 09:11:26.981691990 +0200
-+++ include/lzo/lzodefs.h	2014-06-28 09:11:38.989874177 +0200
-@@ -970,17 +970,6 @@
- #    error "unexpected configuration - check your compiler defines"
- #  endif
- #endif
--#if (LZO_ARCH_I386)
--#  if (UINT_MAX != LZO_0xffffL) && defined(__i386_int16__)
--#    error "unexpected configuration - check your compiler defines"
--#  endif
--#  if (UINT_MAX != LZO_0xffffffffL) && !defined(__i386_int16__)
--#    error "unexpected configuration - check your compiler defines"
--#  endif
--#  if (ULONG_MAX != LZO_0xffffffffL)
--#    error "unexpected configuration - check your compiler defines"
--#  endif
--#endif
- #if (LZO_ARCH_AMD64 || LZO_ARCH_I386)
- #  if !defined(LZO_TARGET_FEATURE_SSE2)
- #    if defined(__SSE2__)
diff --git a/srcpkgs/lzo/patches/configure-2.07.patch b/srcpkgs/lzo/patches/configure-2.07.patch
new file mode 100644
index 00000000000..be61278df37
--- /dev/null
+++ b/srcpkgs/lzo/patches/configure-2.07.patch
@@ -0,0 +1,12 @@
+--- configure.ORIG      2014-06-25 15:47:13.000000000 +0200
++++ configure   2014-06-26 00:05:33.000000000 +0200
+@@ -13953,7 +13953,7 @@
+ /* end confdefs.h.  */
+ #define LZO_CFG_NO_CONFIG_HEADER 1
+ #define LZO_WANT_ACC_INCD_H 1
+-#include "include/lzo/lzodefs.h"
++#include "include/lzo/lzoconf.h"
+ #include "src/lzo_supp.h"
+
+ #undef  LZOCHK_ASSERT
+
diff --git a/srcpkgs/lzo/template b/srcpkgs/lzo/template
index 0283323a0cb..4e992aef95b 100644
--- a/srcpkgs/lzo/template
+++ b/srcpkgs/lzo/template
@@ -1,7 +1,7 @@
 # Template build file for 'lzo'.
 pkgname=lzo
 version=2.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared=yes"
 short_desc="Portable lossless data compression library"