about summary refs log tree commit diff
path: root/pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2012-06-18 15:37:35 +0000
committerVladimír Čunát <vcunat@gmail.com>2012-06-18 15:37:35 +0000
commit1a33b4b654903ec597fcdb743e649466bc563304 (patch)
tree7102a1590b686191e73d3c1347ae9a9b41ed6d1f /pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch
parentfc496faab07e16558ebb13aab9d931bb01f8fe87 (diff)
downloadnixlib-1a33b4b654903ec597fcdb743e649466bc563304.tar
nixlib-1a33b4b654903ec597fcdb743e649466bc563304.tar.gz
nixlib-1a33b4b654903ec597fcdb743e649466bc563304.tar.bz2
nixlib-1a33b4b654903ec597fcdb743e649466bc563304.tar.lz
nixlib-1a33b4b654903ec597fcdb743e649466bc563304.tar.xz
nixlib-1a33b4b654903ec597fcdb743e649466bc563304.tar.zst
nixlib-1a33b4b654903ec597fcdb743e649466bc563304.zip
Fixing stardict broken by my mistake.
svn path=/nixpkgs/trunk/; revision=34549
Diffstat (limited to 'pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch')
-rw-r--r--pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch b/pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch
new file mode 100644
index 000000000000..86825555d9cb
--- /dev/null
+++ b/pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch
@@ -0,0 +1,19 @@
+This patch is from OpenSUSE .src.rpm for the following crash on startup:
+
+ERROR:compositelookup.cpp:53:void CompositeLookup::send_net_dict_request(const string&, const string&): assertion failed: (NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request))
+
+--- dict/src/lib/compositelookup.cpp
++++ dict/src/lib/compositelookup.cpp
+@@ -50,8 +50,10 @@
+ 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));
+-	NetDictRequests.push_back(request);
++	if(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request))
++	{
++	  NetDictRequests.push_back(request);
++	}
+ }
+ 
+ /* returns true if got expected response */