diff --git a/barry-0.17.2-destructor-exception.patch b/barry-0.17.2-destructor-exception.patch new file mode 100644 index 0000000..12173f3 --- /dev/null +++ b/barry-0.17.2-destructor-exception.patch @@ -0,0 +1,25 @@ +diff --git a/src/m_javaloader.cc b/src/m_javaloader.cc +index 5ed8fed..af32306 100644 +--- a/src/m_javaloader.cc ++++ b/src/m_javaloader.cc +@@ -342,8 +342,16 @@ JavaLoader::JavaLoader(Controller &con) + + JavaLoader::~JavaLoader() + { +- if( m_StreamStarted ) +- StopStream(); ++ try { ++ if( m_StreamStarted ) ++ StopStream(); ++ } ++ catch( std::exception &e ) { ++ dout("Exception ignored in ~JavaLoader(): " << e.what()); ++ } ++ catch( ... ) { ++ dout("Unknown exception in ~JavaLoader()"); ++ } + } + + /////////////////////////////////////////////////////////////////////////////// +-- +1.6.5.GIT diff --git a/barry.spec b/barry.spec index ad1c4f9..9945769 100644 --- a/barry.spec +++ b/barry.spec @@ -1,6 +1,6 @@ Name: barry Version: 0.17.1 -Release: 1%{?dist} +Release: 4%{?dist} Summary: BlackBerry Desktop for Linux Group: Applications/Productivity @@ -16,6 +16,8 @@ URL: http://www.netdirect.ca/software/packages/barry BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2 +# pulled from unreleased v0.17.2 +Patch0: barry-0.17.2-destructor-exception.patch BuildRequires: libusb-devel boost-devel desktop-file-utils gtkmm24-devel libxml++-devel BuildRequires: libglademm24-devel libglade2-devel libtar-devel libtool BuildRequires: fuse-devel gettext-devel doxygen autoconf zlib-devel @@ -68,6 +70,7 @@ This package contains the opensync plugin to synchronize your BlackBerry. %{__rm} -rf ./doc/www/*.php %{__rm} -rf ./doc/www/*.sh find ./doc/www/doxygen/html -type f -size 0 -name \*.map -exec rm '{}' \; +%patch0 -p1 %build # main tree @@ -183,6 +186,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %postun libs -p /sbin/ldconfig %changelog +* Wed Nov 9 2011 Nathanael Noblet - 0.17.1-4 +- patch for bug #752000 + +* Fri Jul 22 2011 Nathanael Noblet - 0.17.1-3 +- boost requirements + +* Wed Apr 6 2011 Nathanael Noblet - 0.17.1-2 +- Release bump for F16 boost soname change + * Fri Mar 4 2011 Nathanael Noblet - 0.17.1-1 - Version bump - fixes build issues + some other minor software bugs