From 728c6c0e3737a40679a81baf5f96584b3de66e36 Mon Sep 17 00:00:00 2001
From: Rene Gollent <rene@gollent.com>
Date: Sun, 20 Oct 2013 15:48:24 -0400
Subject: [PATCH] Update vision to 20131020.

---
 .../vision/patches/vision-0.9.7-gcc2.patch       | 16 ----------------
 .../vision/patches/vision-0.9.7-gcc4.patch       | 12 ------------
 ...ion-0.9.7.r946.recipe => vision-0.9.7.recipe} |  8 +++-----
 3 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 haiku-apps/vision/patches/vision-0.9.7-gcc2.patch
 rename haiku-apps/vision/{vision-0.9.7.r946.recipe => vision-0.9.7.recipe} (83%)

diff --git a/haiku-apps/vision/patches/vision-0.9.7-gcc2.patch b/haiku-apps/vision/patches/vision-0.9.7-gcc2.patch
deleted file mode 100644
index 081346c85..000000000
--- a/haiku-apps/vision/patches/vision-0.9.7-gcc2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: Makefile
-===================================================================
---- Vision/Makefile	(revision 946)
-+++ Vision/Makefile	(working copy)
-@@ -84,10 +84,7 @@
-
- LDFLAGS := $(REG_LIBS) -nodefaultlibs
-
--ifeq ($(wildcard /boot/common/include/infopopper/InfoPopper.h), )
--else
--  CFLAGS += -DUSE_INFOPOPPER=1
--endif
-+CFLAGS += -DUSE_INFOPOPPER=1
-
- DEP := gcc -MM -DBEOS_BUILD
-
diff --git a/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch b/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch
index 37997208f..d526da332 100644
--- a/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch
+++ b/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch
@@ -11,15 +11,3 @@ Index: Makefile
 
  # lua
  LUA_LIBS := -L./src/lua/lib -llua -llualib
-@@ -84,10 +84,7 @@
-
- LDFLAGS := $(REG_LIBS) -nodefaultlibs
-
--ifeq ($(wildcard /boot/common/include/infopopper/InfoPopper.h), )
--else
--  CFLAGS += -DUSE_INFOPOPPER=1
--endif
-+CFLAGS += -DUSE_INFOPOPPER=1
-
- DEP := gcc -MM -DBEOS_BUILD
-
diff --git a/haiku-apps/vision/vision-0.9.7.r946.recipe b/haiku-apps/vision/vision-0.9.7.recipe
similarity index 83%
rename from haiku-apps/vision/vision-0.9.7.r946.recipe
rename to haiku-apps/vision/vision-0.9.7.recipe
index 8434bb1e4..d9b00a677 100644
--- a/haiku-apps/vision/vision-0.9.7.r946.recipe
+++ b/haiku-apps/vision/vision-0.9.7.recipe
@@ -1,15 +1,13 @@
 SUMMARY="IRC client for Haiku"
 DESCRIPTION="Vision is an IRC client for Haiku."
 HOMEPAGE="http://vision.sourceforge.net/"
-SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#946"
+SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#947"
 LICENSE="MPL v1.1"
 COPYRIGHT="1999-2010 The Vision Team"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
-if [ $targetArchitecture == x86_gcc2 ]; then
-	PATCHES="vision-0.9.7-gcc2.patch"
-else
+if [ $targetArchitecture == x86 ]; then
 	PATCHES="vision-0.9.7-gcc4.patch"
 fi