From b17c7963890354d2cffdda2f16eeeaf4c1288e99 Mon Sep 17 00:00:00 2001
From: Tristan Lelong <tristan.lelong@blunderer.org>
Date: Thu, 29 Nov 2012 17:20:58 +0000
Subject: libroxml: bump version to 2.2.1

Signed-off-by: Tristan Lelong <tristan.lelong@blunderer.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libroxml/libroxml-2.2.0-werror.patch | 22 ----------------------
 package/libroxml/libroxml-werror.patch       | 22 ++++++++++++++++++++++
 package/libroxml/libroxml.mk                 |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 package/libroxml/libroxml-2.2.0-werror.patch
 create mode 100644 package/libroxml/libroxml-werror.patch

diff --git a/package/libroxml/libroxml-2.2.0-werror.patch b/package/libroxml/libroxml-2.2.0-werror.patch
deleted file mode 100644
index a72f2a786..000000000
--- a/package/libroxml/libroxml-2.2.0-werror.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-[PATCH] remove -Werror from CFLAGS
-
--Werror should only be used during development, not in released SW.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: libroxml-2.1.0/Makefile
-===================================================================
---- libroxml-2.1.0.orig/Makefile
-+++ libroxml-2.1.0/Makefile
-@@ -41,7 +41,7 @@
- 
- # options
- override CPPFLAGS += -Iinc/
--override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Werror -Iinc/ $(DEFINES)
-+override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Iinc/ $(DEFINES)
- override LDFLAGS += 
- 
- ifeq ("$(OS)", "Darwin")
diff --git a/package/libroxml/libroxml-werror.patch b/package/libroxml/libroxml-werror.patch
new file mode 100644
index 000000000..a99962f30
--- /dev/null
+++ b/package/libroxml/libroxml-werror.patch
@@ -0,0 +1,22 @@
+[PATCH] remove -Werror from CFLAGS
+
+-Werror should only be used during development, not in released SW.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: a/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -41,7 +41,7 @@
+ 
+ # options
+ override CPPFLAGS += -Iinc/
+-override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Werror -Iinc/ $(DEFINES)
++override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Iinc/ $(DEFINES)
+ override LDFLAGS += 
+ 
+ ifeq ("$(OS)", "Darwin")
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index 457a28a81..d7ef6a48d 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -2,7 +2,7 @@
 # libroxml
 #
 
-LIBROXML_VERSION = 2.2.0
+LIBROXML_VERSION = 2.2.1
 LIBROXML_SITE = http://libroxml.googlecode.com/files
 LIBROXML_INSTALL_STAGING = YES
 
-- 
cgit v1.2.3