From 2b1174e9bb27c861ef7a4a71bd47104355e3acea Mon Sep 17 00:00:00 2001
From: Rene Gollent <rene@gollent.com>
Date: Fri, 4 Oct 2013 22:29:20 -0400
Subject: [PATCH] Update Vision to r946.

- Fixes a logging-related regression on PM-enabled builds.
---
 .../vision/patches/vision-0.9.7-gcc2.patch    | 16 ++++++++++
 .../vision/patches/vision-0.9.7-gcc4.patch    | 29 ++++++++++---------
 ...7.r944.recipe => vision-0.9.7.r946.recipe} |  6 ++--
 3 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 haiku-apps/vision/patches/vision-0.9.7-gcc2.patch
 rename haiku-apps/vision/{vision-0.9.7.r944.recipe => vision-0.9.7.r946.recipe} (84%)

diff --git a/haiku-apps/vision/patches/vision-0.9.7-gcc2.patch b/haiku-apps/vision/patches/vision-0.9.7-gcc2.patch
new file mode 100644
index 000000000..081346c85
--- /dev/null
+++ b/haiku-apps/vision/patches/vision-0.9.7-gcc2.patch
@@ -0,0 +1,16 @@
+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 86e32352a..37997208f 100644
--- a/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch
+++ b/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch
@@ -1,22 +1,25 @@
-Index: Vision/Makefile
+Index: Makefile
 ===================================================================
---- Vision/Makefile	(revision 908)
+--- Vision/Makefile	(revision 946)
 +++ Vision/Makefile	(working copy)
 @@ -21,7 +21,7 @@
  BUILD_TYPE := Release
- 
+
  # system libs
 -REG_LIBS := -lbe -ltranslation -ltextencoding -ltracker -lnetwork -lroot
 +REG_LIBS := -lbe -ltranslation -ltextencoding -ltracker -lnetwork -lroot -lstdc++
- 
+
  # lua
  LUA_LIBS := -L./src/lua/lib -llua -llualib
-@@ -71,7 +71,7 @@
- CFLAGS += -DBUILD_DATE=\"$(BUILDDATE)\"
- CFLAGS += -fno-pic
- CFLAGS += -ffast-math
--CFLAGS += -march=pentium -mcpu=pentiumpro
-+CFLAGS += -march=pentium
- CFLAGS += -Wall -W -Wno-multichar -Wpointer-arith
- CFLAGS += -Wwrite-strings -Woverloaded-virtual
- CFLAGS += -Wconversion -Wpointer-arith
+@@ -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.r944.recipe b/haiku-apps/vision/vision-0.9.7.r946.recipe
similarity index 84%
rename from haiku-apps/vision/vision-0.9.7.r944.recipe
rename to haiku-apps/vision/vision-0.9.7.r946.recipe
index 79cdf2ed1..8434bb1e4 100644
--- a/haiku-apps/vision/vision-0.9.7.r944.recipe
+++ b/haiku-apps/vision/vision-0.9.7.r946.recipe
@@ -1,13 +1,15 @@
 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#944"
+SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#946"
 LICENSE="MPL v1.1"
 COPYRIGHT="1999-2010 The Vision Team"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
-if [ $targetArchitecture != x86_gcc2 ]; then
+if [ $targetArchitecture == x86_gcc2 ]; then
+	PATCHES="vision-0.9.7-gcc2.patch"
+else
 	PATCHES="vision-0.9.7-gcc4.patch"
 fi