From 33cabc1cb692c3326d96641957021a01ab8aca73 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 26 Jan 2009 19:41:47 +0000 Subject: libcgicc: don't build demos And remove unneeded patch for demos while we're at it. --- package/libcgicc/cgicc-3.2.7-sort-undeclared.patch | 38 ---------------------- package/libcgicc/libcgicc.mk | 1 + 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 package/libcgicc/cgicc-3.2.7-sort-undeclared.patch (limited to 'package') diff --git a/package/libcgicc/cgicc-3.2.7-sort-undeclared.patch b/package/libcgicc/cgicc-3.2.7-sort-undeclared.patch deleted file mode 100644 index c6e04ba8f..000000000 --- a/package/libcgicc/cgicc-3.2.7-sort-undeclared.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Robert Schwebel -Subject: [patch] sort is now in - -When built with gcc-4.3.2, cgicc-3.2.7 cannot be compiled any more; sort -is now being part of 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 - ---- - 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 - #include - #include -+#include - - #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 <<"
"; - cout <<""; - cout <<""; diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index 7a94f0384..83898e93e 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -32,6 +32,7 @@ $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked --exec-prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --disable-demos \ ) touch $@ -- cgit v1.2.3