[cgicc] version bump 3.2.7 -> 3.2.9

Some patches have been applied upstream, cleanup.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

6 files changed, 10 insertions, 93 deletions

diff --git a/patches/cgicc-3.2.7/cgicc-3.2.7-memcopy-undeclared.diff b/patches/cgicc-3.2.7/cgicc-3.2.7-memcopy-undeclared.diff
deleted file mode 100644
index c1d8f828e..000000000
--- a/patches/cgicc-3.2.7/cgicc-3.2.7-memcopy-undeclared.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [patch] fix missing includes
-
-When built with gcc-4.3.2, cgicc-3.2.7 cannot be compiled because of a
-missing include:
-
-dns.cpp:128: error: 'memcpy' was not declared in this scope
-dns.cpp:160: error: 'memcpy' was not declared in this scope
-make[2]: *** [dns.o] Error 1
-
-Fix it.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-# 20091210 rsc: Upstream-status: https://savannah.gnu.org/bugs/?25211
-
- demo/dns.cpp |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: cgicc-3.2.7/demo/dns.cpp
-===================================================================
---- cgicc-3.2.7.orig/demo/dns.cpp
-+++ cgicc-3.2.7/demo/dns.cpp
-@@ -30,6 +30,7 @@
-  */
- 
- #include <cstdlib>
-+#include <cstring>
- #include <new>
- #include <vector>
- #include <stdexcept>
diff --git a/patches/cgicc-3.2.7/cgicc-3.2.7-sort-undeclared.diff b/patches/cgicc-3.2.7/cgicc-3.2.7-sort-undeclared.diff
deleted file mode 100644
index 091576701..000000000
--- a/patches/cgicc-3.2.7/cgicc-3.2.7-sort-undeclared.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [patch] sort is now in <algorithm>
-
-When built with gcc-4.3.2, cgicc-3.2.7 cannot be compiled any more; sort
-is now being part of <algorithm> and must be written as ::sort:
-
-cardgame.cpp:1232: error: 'sort' was not declared in this scope
-make[2]: *** [cardgame.o] Error 1
-
-Fix it.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-# 20091210 rsc: Upstream Status: https://savannah.gnu.org/bugs/?25212
-
- demo/cardgame.cpp |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: cgicc-3.2.7/demo/cardgame.cpp
-===================================================================
---- cgicc-3.2.7.orig/demo/cardgame.cpp
-+++ cgicc-3.2.7/demo/cardgame.cpp
-@@ -36,6 +36,7 @@
- #include <sstream>
- #include <fstream>
- #include <queue>
-+#include <algorithm>
- 
- #include "cgicc/CgiDefs.h"
- #include "cgicc/Cgicc.h"
-@@ -1043,7 +1044,7 @@ namespace CardGameTools
- 
- 	void drawPlayerCards(datasplayer *vPlayer)
- 	{
--		sort (vPlayer->cardsList->begin(),vPlayer->cardsList->end());
-+		std::sort (vPlayer->cardsList->begin(),vPlayer->cardsList->end());
- 		cout <<"<form name=\"cards\">"; 
- 		cout <<"<input type=\"hidden\" name=\"actionner\" value=\"\">"; 
- 		cout <<"<input type=\"hidden\" name=\"card\" value=\"\">"; 
diff --git a/patches/cgicc-3.2.7/series b/patches/cgicc-3.2.7/series
deleted file mode 100644
index b7a6f5a58..000000000
--- a/patches/cgicc-3.2.7/series
+++ /dev/null
@@ -1,3 +0,0 @@
-cgicc-3.2.7-memcopy-undeclared.diff
-cgicc-3.2.7-sort-undeclared.diff
-suppress-doc-install.diff 
diff --git a/patches/cgicc-3.2.9/series b/patches/cgicc-3.2.9/series
new file mode 100644
index 000000000..2d65551ea
--- /dev/null
+++ b/patches/cgicc-3.2.9/series
@@ -0,0 +1 @@
+suppress-doc-install.diff
diff --git a/patches/cgicc-3.2.7/suppress-doc-install.diff b/patches/cgicc-3.2.9/suppress-doc-install.diff
index e37784325..6706bbad1 100644
--- a/patches/cgicc-3.2.7/suppress-doc-install.diff
+++ b/patches/cgicc-3.2.9/suppress-doc-install.diff
@@ -11,15 +11,15 @@ better decided in the configure step.
 Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
 
 ---
- Makefile.in |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ Makefile.in |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: cgicc-3.2.7/Makefile.in
+Index: cgicc-3.2.9/Makefile.in
 ===================================================================
---- cgicc-3.2.7.orig/Makefile.in
-+++ cgicc-3.2.7/Makefile.in
-@@ -69,7 +69,7 @@ aclocalDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(aclocal_DATA)
+--- cgicc-3.2.9.orig/Makefile.in
++++ cgicc-3.2.9/Makefile.in
+@@ -88,7 +88,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
+ 	distdir dist dist-all distcheck
  ETAGS = etags
  CTAGS = ctags
 -DIST_SUBDIRS = cgicc doc support demo contrib
@@ -27,7 +27,7 @@ Index: cgicc-3.2.7/Makefile.in
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
-@@ -194,7 +194,7 @@ AUTOMAKE_OPTIONS = check-news dist-bzip2
+@@ -249,7 +249,7 @@ AUTOMAKE_OPTIONS = check-news dist-bzip2
  @DEMOS_FALSE@DEMO = 
  @DEMOS_TRUE@DEMO = demo contrib
  ACLOCAL_AMFLAGS = 
@@ -36,12 +36,3 @@ Index: cgicc-3.2.7/Makefile.in
  CLEANFILES = *~
  MAINTAINERCLEANFILES = aclocal.m4 cgicc-*.tar.*
  EXTRA_DIST = BUGS README.WIN COPYING.DOC example win
-@@ -410,7 +410,7 @@ distdir: $(DISTFILES)
- 	esac
- 	$(am__remove_distdir)
- 	mkdir $(distdir)
--	$(mkdir_p) $(distdir)/cgicc $(distdir)/doc $(distdir)/support
-+	$(mkdir_p) $(distdir)/cgicc $(distdir)/support
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/rules/libcgicc.make b/rules/libcgicc.make
index 569035977..2918b6ba4 100644
--- a/rules/libcgicc.make
+++ b/rules/libcgicc.make
@@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_LIBCGICC) += libcgicc
 #
 # Paths and names
 #
-LIBCGICC_VERSION	:= 3.2.8-ptx1
+LIBCGICC_VERSION	:= 3.2.9
 LIBCGICC		:= cgicc-$(LIBCGICC_VERSION)
 LIBCGICC_SUFFIX		:= tar.gz
 LIBCGICC_URL		:= $(PTXCONF_SETUP_GNUMIRROR)/cgicc/$(LIBCGICC).$(LIBCGICC_SUFFIX)