From 74e30507a1ab987008b9264b0a9f47a20ddd0e61 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 18 Feb 2015 21:23:59 +0000
Subject: [PATCH] querywatcher: upstream patch.

---
 .../patches/querywatcher-1.4.patchset         | 109 ------------------
 .../querywatcher/querywatcher-1.4.recipe      |   9 +-
 2 files changed, 3 insertions(+), 115 deletions(-)
 delete mode 100644 haiku-apps/querywatcher/patches/querywatcher-1.4.patchset

diff --git a/haiku-apps/querywatcher/patches/querywatcher-1.4.patchset b/haiku-apps/querywatcher/patches/querywatcher-1.4.patchset
deleted file mode 100644
index 3dbf69223..000000000
--- a/haiku-apps/querywatcher/patches/querywatcher-1.4.patchset
+++ /dev/null
@@ -1,109 +0,0 @@
-From 88d1ebaf009131526657d0e848495b46bc001aee Mon Sep 17 00:00:00 2001
-From: Chris Roberts <cpr420@gmail.com>
-Date: Mon, 2 Dec 2013 19:32:02 -0700
-Subject: Misc gcc4 fixes
-
-
-diff --git a/src/App.cpp b/src/App.cpp
-index 6dd6ad8..25a4bac 100644
---- a/src/App.cpp
-+++ b/src/App.cpp
-@@ -41,7 +41,7 @@ const char *kTrackerQueryVolume = "_trk/qryvol1";
- #include <be/kernel/fs_info.h>
- 
- // Yes, globals are bad. But, sssh!
--typedef list<entry_ref> reflist;
-+typedef std::list<entry_ref> reflist;
- reflist gIgnoreList;
- BPath gSettingsPath;
- 
-@@ -57,7 +57,7 @@ struct query_load_info
- 	BRect 			rect;	
- };
- 
--typedef list<BVolume> vollist;
-+typedef std::list<BVolume> vollist;
- 
- char *ReadAttribute(BNode node, const char *attribute, int32 *length = NULL) {
- 	attr_info info;
-@@ -583,7 +583,7 @@ QueryView::ShouldIgnore( BMessage * msg )
- 				ref.node = node;
- 				ref.device = device;
- 				
--				list<node_ref>::iterator iter;
-+				std::list<node_ref>::iterator iter;
- 				iter = find(fIgnoredMatches.begin(), fIgnoredMatches.end(), ref);
- 				
- 				if ( iter == fIgnoredMatches.end() )
-@@ -601,7 +601,7 @@ QueryView::ShouldIgnore( BMessage * msg )
- 		if ( !result )
- 		{
- 			// remove node from ignore list if present
--			list<node_ref>::iterator iter;
-+			std::list<node_ref>::iterator iter;
- 			
- 			node_ref ref;
- 			ref.node = node;
-@@ -619,7 +619,7 @@ QueryView::ShouldIgnore( BMessage * msg )
- 	if ( opcode == B_ENTRY_REMOVED )
- 	{
- 		// remove from fIgnoredMatches if there
--		list<node_ref>::iterator iter;
-+		std::list<node_ref>::iterator iter;
- 		
- 		node_ref ref;
- 		ref.node = node;
-@@ -653,7 +653,7 @@ QueryView::MessageReceived(BMessage* msg)
- 				msg->FindInt32("device",&node.device);
- 				msg->FindInt64("node",&node.node);
- 				
--				list<node_ref>::iterator iter;
-+				std::list<node_ref>::iterator iter;
- 				
- 				iter = find(fIgnoredMatches.begin(),fIgnoredMatches.end(),node);
- 				
-diff --git a/src/App.h b/src/App.h
-index fe5e49c..765eabe 100644
---- a/src/App.h
-+++ b/src/App.h
-@@ -28,7 +28,7 @@ class LabelView;
- class ColorView;
- 
- // slaad
--typedef list<BQuery *> querylist;
-+typedef std::list<BQuery *> querylist;
- 
- class App : public BApplication
- {
-@@ -104,7 +104,7 @@ private:
- 	BString			fPredicate;
- 	
- 	// eiman
--	list<node_ref>	fIgnoredMatches;
-+	std::list<node_ref>	fIgnoredMatches;
- };
- 
- IMPEXP class LabelView : public BStringView
-diff --git a/src/makefile b/src/makefile
-index 07ea621..ac5d9b2 100644
---- a/src/makefile
-+++ b/src/makefile
-@@ -47,7 +47,7 @@ SRCS := \
- #		naming scheme you need to specify the path to the library
- #		and it's name
- #		library: my_lib.a entry: my_lib.a or path/my_lib.a
--LIBS= be
-+LIBS= be $(STDCPPLIBS)
- 
- #	specify additional paths to directories following the standard
- #	libXXX.so or libXXX.a naming scheme.  You can specify full paths
-@@ -149,4 +149,4 @@ else
-   LIBS += zeta tracker
- endif
- 
--include $(BUILDHOME)/etc/makefile-engine
-\ No newline at end of file
-+include $(BUILDHOME)/etc/makefile-engine
--- 
-1.8.3.4
-
diff --git a/haiku-apps/querywatcher/querywatcher-1.4.recipe b/haiku-apps/querywatcher/querywatcher-1.4.recipe
index d965a62e6..09922aaef 100644
--- a/haiku-apps/querywatcher/querywatcher-1.4.recipe
+++ b/haiku-apps/querywatcher/querywatcher-1.4.recipe
@@ -4,14 +4,14 @@ This is a tiny little GUI application that monitors any regular Tracker \
 queries and displays miniature indicator lights for the presence of results.
 "
 HOMEPAGE="https://github.com/HaikuArchives/QueryWatcher"
-SRC_URI="git://github.com/HaikuArchives/QueryWatcher.git#64b66ee9e9"
+SRC_URI="git://github.com/HaikuArchives/QueryWatcher.git#006614d8faf8b2b650aab1e8919b87920496a8c7"
 LICENSE="Public Domain"
 COPYRIGHT="
-	2003-2004 Michael Armida	
+	2003-2004 Michael Armida
 	2004 Mikael Eiman
 	2004 Michael Davidson
 	"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
@@ -31,11 +31,8 @@ BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:gcc
 	cmd:make
-	cmd:mkdepend
 	"
 
-PATCHES="querywatcher-1.4.patchset"
-
 BUILD()
 {
 	cd src