[springlobby/f14/master] - Add missing patches, remove them from .gitignore.

[Gilboa Davara]

commit cfe207cd038d44c5a69a3e5f5a316263308a35b5
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date:   Thu Mar 10 07:30:48 2011 +0200

    - Add missing patches, remove them from .gitignore.

 .gitignore               |    3 ---
 libnotify-070-fix.patch  |   15 +++++++++++++++
 springlobby-gtkfix.patch |   11 +++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7da54ec..5e34256 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 springlobby-0.95.tar.bz2
 /springlobby-0.101.tar.bz2
 /springlobby-0.116.tar.bz2
-/springlobby-gtkfix.patch
 /springlobby-0.118.tar.bz2
 /springlobby-0.120.tar.bz2
-/libnotify-070-fix.patch
-/springlobby-dso.patch
 /springlobby-0.124.tar.bz2
diff --git a/libnotify-070-fix.patch b/libnotify-070-fix.patch
new file mode 100644
index 0000000..5e30f53
--- /dev/null
+++ b/libnotify-070-fix.patch
@@ -0,0 +1,15 @@
+--- springlobby-0.120.orig/src/gui/libnotify.h	2011-01-06 22:58:18.000000000 +0000
++++ springlobby-0.120/src/gui/libnotify.h	2011-01-14 11:16:49.468807915 +0000
+@@ -21,7 +21,11 @@ void LibnotifyNotification::Show(const w
+ {
+ 	NotifyNotification *n;
+ 	notify_init("Test");
+-	n = notify_notification_new ( GetAppName().mb_str(),data.second.mb_str(), NULL, NULL);
++	n = notify_notification_new ( GetAppName().mb_str(),data.second.mb_str(), NULL
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
++                                            , NULL
++#endif
++                                            );
+ 	notify_notification_set_timeout (n, sett().GetNotificationPopupDisplayTime()*1000);
+ 
+ 	notify_notification_set_icon_from_pixbuf(n,icon.GetPixbuf() );
diff --git a/springlobby-gtkfix.patch b/springlobby-gtkfix.patch
new file mode 100644
index 0000000..53ab20b
--- /dev/null
+++ b/springlobby-gtkfix.patch
@@ -0,0 +1,11 @@
+--- springlobby-0.116/CMakeLists.txt.old	2010-11-18 22:03:13.167659743 +0200
++++ springlobby-0.116/CMakeLists.txt	2010-11-18 22:03:51.703595481 +0200
+@@ -193,6 +193,8 @@
+ 	pkg_check_modules( LIBNOTIFY libnotify )
+ 	IF( LIBNOTIFY_FOUND )
+ 		INCLUDE_DIRECTORIES( ${LIBNOTIFY_INCLUDE_DIRS} )
++		FIND_PACKAGE(GTK2 COMPONENTS gtk)
++		INCLUDE_DIRECTORIES (${GTK2_INCLUDE_DIRS})
+ 		LINK_LIBRARIES( ${LIBNOTIFY_LIBRARIES} )
+ 		ADD_DEFINITIONS( -DHAVE_LIBNOTIFY )
+ 	ENDIF( LIBNOTIFY_FOUND )