Hello community, here is the log from the commit of package stardict for openSUSE:Factory checked in at 2011-12-13 11:50:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stardict (Old) and /work/SRC/openSUSE:Factory/.stardict.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "stardict", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/stardict/stardict.changes 2011-09-23 12:46:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.stardict.new/stardict.changes 2011-12-13 11:50:03.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 29 01:09:55 UTC 2011 - [email protected] + +- added stardict-3.0.3-NetDictRequest.patch to fix crash with + ERROR:compositelookup.cpp:53. Fixed bnc#736368 + +------------------------------------------------------------------- New: ---- stardict-3.0.3-NetDictRequest.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stardict.spec ++++++ --- /var/tmp/diff_new_pack.thRq4T/_old 2011-12-13 11:50:12.000000000 +0100 +++ /var/tmp/diff_new_pack.thRq4T/_new 2011-12-13 11:50:12.000000000 +0100 @@ -28,11 +28,13 @@ Source1: ru.po # PATCH-FIX-OPENSUSE stardict-3.0.3-fix-path-for-sounds.patch -- adjust default path for sound files Patch0: stardict-3.0.3-fix-path-for-sounds.patch -%if 0%{?suse_version} # PATCH-FIX-OPENSUSE stardict-3.0.3-improve-desktop-file.patch -- add GenericName entry Patch1: stardict-3.0.3-improve-desktop-file.patch # PATCH-FIX-UPSTREAM stardict-3.0.3-gcc46.patch -- rebased from Fedora package Patch2: stardict-3.0.3-gcc46.patch +# PATCH-FIX-UPSTREAM stardict-3.0.3-NetDictRequest.patch -- rebased from Arch Linux package +Patch3: stardict-3.0.3-NetDictRequest.patch +%if 0%{?suse_version} BuildRequires: update-desktop-files %endif BuildRequires: enchant-devel @@ -43,6 +45,7 @@ BuildRequires: gnome-doc-utils-devel BuildRequires: gtk2 >= 2.20 BuildRequires: intltool +BuildRequires: zlib-devel BuildRequires: libgnomeui-devel BuildRequires: libsigc++2-devel BuildRequires: perl-XML-Parser @@ -68,6 +71,7 @@ %patch0 %patch1 %patch2 +%patch3 cp %{SOURCE1} dict/po/ # Remove unneeded sigc++ header files to make it sure ++++++ stardict-3.0.3-NetDictRequest.patch ++++++ Index: dict/src/lib/compositelookup.cpp =================================================================== --- dict/src/lib/compositelookup.cpp.orig +++ dict/src/lib/compositelookup.cpp @@ -50,7 +50,7 @@ bool CompositeLookup::is_got_all_respons void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key) { NetDictRequest request(dict_id, key); - g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)); + std::find(NetDictRequests.begin(), NetDictRequests.end(), request); NetDictRequests.push_back(request); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
