rpms/wp_tray/devel wp_tray-0.5.3-boost.patch, 1.1, 1.2 wp_tray-0.5.3-missingdir.patch, 1.2, 1.3 wp_tray.spec, 1.13, 1.14

[Denis Leroy]

Author: denis

Update of /cvs/pkgs/rpms/wp_tray/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv830

Modified Files:
	wp_tray-0.5.3-boost.patch wp_tray-0.5.3-missingdir.patch 
	wp_tray.spec 
Log Message:
Fixed boost patch

wp_tray-0.5.3-boost.patch:

Index: wp_tray-0.5.3-boost.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wp_tray/devel/wp_tray-0.5.3-boost.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wp_tray-0.5.3-boost.patch	21 Aug 2007 19:00:57 -0000	1.1
+++ wp_tray-0.5.3-boost.patch	1 Oct 2008 22:19:31 -0000	1.2
@@ -1,19 +1,52 @@
-diff -ru wp_tray-0.5.3.orig/src/SearchDialog.cc wp_tray-0.5.3/src/SearchDialog.cc
---- wp_tray-0.5.3.orig/src/SearchDialog.cc	2007-08-21 15:18:43.000000000 +0100
-+++ wp_tray-0.5.3/src/SearchDialog.cc	2007-08-21 15:40:05.000000000 +0100
-@@ -319,7 +319,7 @@
+diff -ur wp_tray-0.5.3.orig/src/SearchDialog.cc wp_tray-0.5.3/src/SearchDialog.cc
+--- wp_tray-0.5.3.orig/src/SearchDialog.cc	2008-10-01 23:46:10.000000000 +0200
++++ wp_tray-0.5.3/src/SearchDialog.cc	2008-10-01 23:46:32.000000000 +0200
+@@ -317,15 +317,15 @@
+ 			}// end if
+ 			else
  			{
- 				if(boost::regex_match(itDir->leaf(), _refRegex))
+-				if(boost::regex_match(itDir->leaf(), _refRegex))
++				if(boost::regex_match(itDir->path().leaf(), _refRegex))
  				{
 -					_reflsResults.push_back((*itDir).native_directory_string());
 +					_reflsResults.push_back((*itDir).path().native_directory_string());
  				}// end if
  			}// end else
  		}// end try
-diff -ru wp_tray-0.5.3.orig/src/Wallpapers.cc wp_tray-0.5.3/src/Wallpapers.cc
---- wp_tray-0.5.3.orig/src/Wallpapers.cc	2007-08-21 15:18:43.000000000 +0100
-+++ wp_tray-0.5.3/src/Wallpapers.cc	2007-08-21 15:41:56.000000000 +0100
-@@ -383,7 +383,7 @@
+ 		catch(const std::exception & ex)
+ 		{
+-			std::cerr << "SearchDialog::WallpaperSearch() : " << itDir->leaf() << " " << ex.what() << std::endl;
++			std::cerr << "SearchDialog::WallpaperSearch() : " << itDir->path().leaf() << " " << ex.what() << std::endl;
+ 		}// end catch
+ 	}// end for
+ }// end SearchDialog::WallpaperSearch
+diff -ur wp_tray-0.5.3.orig/src/Wallpapers.cc wp_tray-0.5.3/src/Wallpapers.cc
+--- wp_tray-0.5.3.orig/src/Wallpapers.cc	2008-10-01 23:46:10.000000000 +0200
++++ wp_tray-0.5.3/src/Wallpapers.cc	2008-10-01 23:46:49.000000000 +0200
+@@ -299,7 +299,7 @@
+ 		try
+ 		{
+ 			// is it a directory and not hidden?
+-			if(fs::is_directory(*it) && it->leaf()[0] != '.')
++			if(fs::is_directory(*it) && it->path().leaf()[0] != '.')
+ 			{
+ 				if(fs::symbolic_link_exists(*it))
+ 				{
+@@ -317,7 +317,7 @@
+ 			}// end if
+ 			else
+ 			{
+-				if(!m_pGconfClient->get_bool("/apps/wp_tray/b_img_check") || boost::regex_match(it->leaf(), m_regexImageCheck))
++				if(!m_pGconfClient->get_bool("/apps/wp_tray/b_img_check") || boost::regex_match(it->path().leaf(), m_regexImageCheck))
+ 				{
+ 					++ _nFileCount;
+ 				}// end if
+@@ -379,18 +379,18 @@
+ 			}// end if
+ 			else
+ 			{
+-				if(!m_pGconfClient->get_bool("/apps/wp_tray/b_img_check") || boost::regex_match(it->leaf(), m_regexImageCheck))
++				if(!m_pGconfClient->get_bool("/apps/wp_tray/b_img_check") || boost::regex_match(it->path().leaf(), m_regexImageCheck))
  				{
  					if(-- _nFileIndex == 0)
  					{
@@ -22,3 +55,11 @@
  					}// end if
  				}// end if
  			}// end else
+ 		}// end try
+ 		catch(const std::exception & ex)
+ 		{
+-			std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->leaf() << " " << ex.what() << std::endl;
++			std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->path().leaf() << " " << ex.what() << std::endl;
+ 		}// end catch
+ 	}// end for
+ }// end Wallpapers::GetDirectoryEntryAtIndex

wp_tray-0.5.3-missingdir.patch:

Index: wp_tray-0.5.3-missingdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wp_tray/devel/wp_tray-0.5.3-missingdir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wp_tray-0.5.3-missingdir.patch	29 Aug 2008 12:34:33 -0000	1.2
+++ wp_tray-0.5.3-missingdir.patch	1 Oct 2008 22:19:31 -0000	1.3
@@ -27,7 +27,7 @@
  	{
  		try
 @@ -393,6 +396,8 @@
- 			std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->leaf() << " " << ex.what() << std::endl;
+ 			std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->path().leaf() << " " << ex.what() << std::endl;
  		}// end catch
  	}// end for
 +	} catch (std::exception& e) {


Index: wp_tray.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wp_tray/devel/wp_tray.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wp_tray.spec	29 Aug 2008 12:34:33 -0000	1.13
+++ wp_tray.spec	1 Oct 2008 22:19:31 -0000	1.14
@@ -71,6 +71,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Wed Oct  1 2008 Denis <denis at poolshark.org> - 0.5.3-8
+- Fixed boost patch
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.3-7
 - Autorebuild for GCC 4.3