rpms/wp_tray/F-8 wp_tray-0.5.3-missingdir.patch, NONE, 1.1 wp_tray.spec, 1.10, 1.11
Denis Leroy (denis)
fedora-extras-commits at redhat.com
Thu Dec 13 21:25:00 UTC 2007
- Previous message: rpms/python-bugzilla/F-7 python-bugzilla.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/python-bugzilla/EL-5 python-bugzilla.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: denis
Update of /cvs/pkgs/rpms/wp_tray/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19881
Modified Files:
wp_tray.spec
Added Files:
wp_tray-0.5.3-missingdir.patch
Log Message:
Added patch to fix missing dir crash (#417311)
wp_tray-0.5.3-missingdir.patch:
--- NEW FILE wp_tray-0.5.3-missingdir.patch ---
--- wp_tray-0.5.3/src/Wallpapers.cc.orig 2007-12-13 22:11:27.000000000 +0100
+++ wp_tray-0.5.3/src/Wallpapers.cc 2007-12-13 22:10:41.000000000 +0100
@@ -294,6 +294,7 @@
{
fs::directory_iterator itEnd;
+ try {
for(fs::directory_iterator it(_pathCurrent); it != itEnd; ++ it)
{
try
@@ -328,7 +329,8 @@
std::cerr << "Wallpapers::CountEntriesInDirectory() : " << ex.what() << std::endl;
}// end catch
}// end for
-
+ } catch (std::exception& e) {
+ }
return _nFileCount;
}// end Wallpapers::CountDirectoryEntries
@@ -357,6 +359,7 @@
return;
}// end if
+ try {
for(fs::directory_iterator it(_pathCurrent); it != itEnd && _nFileIndex != 0; ++ it)
{
try
@@ -393,6 +396,8 @@
std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->leaf() << " " << ex.what() << std::endl;
}// end catch
}// end for
+ } catch (std::exception& e) {
+ }
}// end Wallpapers::GetDirectoryEntryAtIndex
//------------------------------------------------------------------------
Index: wp_tray.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wp_tray/F-8/wp_tray.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wp_tray.spec 21 Aug 2007 19:00:57 -0000 1.10
+++ wp_tray.spec 13 Dec 2007 21:24:22 -0000 1.11
@@ -1,6 +1,6 @@
Name: wp_tray
Version: 0.5.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A wallpaper-changing applet for GNOME
Group: Amusements/Graphics
@@ -10,6 +10,7 @@
Patch0: wp_tray-0.5.3-gnomewp.patch
Patch1: wp_tray-0.5.3-notify.patch
Patch2: wp_tray-0.5.3-boost.patch
+Patch3: wp_tray-0.5.3-missingdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext libglademm24-devel libgnomecanvasmm26-devel
@@ -25,6 +26,7 @@
%patch0 -p1 -b .gnomewp
%patch1 -p1 -b .notify
%patch2 -p1 -b .boost
+%patch3 -p1 -b .missingdir
%build
%configure --with-boostfilesystem=%{_libdir}/libboost_filesystem.so \
@@ -69,6 +71,9 @@
%{_sysconfdir}/gconf/schemas/*.schemas
%changelog
+* Thu Dec 13 2007 Denis Leroy <denis at poolshark.org> - 0.5.3-6
+- Added patch to fix missing dir crash
+
* Fri Aug 3 2007 Denis Leroy <denis at poolshark.org> - 0.5.3-5
- Changed License field to new guidelines
- Added patch to support new boost library
- Previous message: rpms/python-bugzilla/F-7 python-bugzilla.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/python-bugzilla/EL-5 python-bugzilla.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list