CVS commit: pkgsrc/net/ekiga

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Nov 20 22:12:19 UTC 2016

Modified Files:
        pkgsrc/net/ekiga: distinfo
Added Files:
        pkgsrc/net/ekiga/patches: patch-lib_engine_presence_presence-core.cpp
            patch-lib_engine_presence_presence-core.h

Log Message:
Slots have no ordering, at least with modern versions of libsigc++.
As such, don't use std::set as container.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/ekiga/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/ekiga/patches/patch-lib_engine_presence_presence-core.cpp \
    pkgsrc/net/ekiga/patches/patch-lib_engine_presence_presence-core.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/ekiga/distinfo
diff -u pkgsrc/net/ekiga/distinfo:1.14 pkgsrc/net/ekiga/distinfo:1.15
--- pkgsrc/net/ekiga/distinfo:1.14      Wed Nov  4 00:34:59 2015
+++ pkgsrc/net/ekiga/distinfo   Sun Nov 20 22:12:19 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2015/11/04 00:34:59 agc Exp $
+$NetBSD: distinfo,v 1.15 2016/11/20 22:12:19 joerg Exp $
 
 SHA1 (ekiga-3.2.6.tar.bz2) = 1c9d2004aa57643a951c1d454e9cfb207143c021
 RMD160 (ekiga-3.2.6.tar.bz2) = f53fe740856e4a4c5b6141086ba25288aabe51ac
@@ -32,6 +32,8 @@ SHA1 (patch-lib_engine_components_resour
 SHA1 (patch-lib_engine_components_resource-list_rl-presentity.h) = 61567eba2198ad3f81b7d367f16bb06e4429c2de
 SHA1 (patch-lib_engine_presence_cluster-impl.h) = bbdb345cbcb5eae14737021960434343b87bf5fe
 SHA1 (patch-lib_engine_presence_heap-impl.h) = 7a28aa97722d3d81653a2eb98b9d92acc80a6f79
+SHA1 (patch-lib_engine_presence_presence-core.cpp) = 34acd3931c89bcf0623dfd92b1ae2547541b2f01
+SHA1 (patch-lib_engine_presence_presence-core.h) = bee3155ebe7d4d0debdc15ed499cda26362c8f02
 SHA1 (patch-lib_gui_xwindow.cpp) = d6f5b3b07357e3390afe9f9c7ab632ac9a9ba006
 SHA1 (patch-lib_gui_xwindow.h) = 121b40b104d8ac4ad30cf81ddb8237ad5a5a247c
 SHA1 (patch-src_Makefile.am) = 54a6fd59b640c118b928af19fe3aa9943550a3dc

Added files:

Index: pkgsrc/net/ekiga/patches/patch-lib_engine_presence_presence-core.cpp
diff -u /dev/null pkgsrc/net/ekiga/patches/patch-lib_engine_presence_presence-core.cpp:1.1
--- /dev/null   Sun Nov 20 22:12:19 2016
+++ pkgsrc/net/ekiga/patches/patch-lib_engine_presence_presence-core.cpp        Sun Nov 20 22:12:19 2016
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_engine_presence_presence-core.cpp,v 1.1 2016/11/20 22:12:19 joerg Exp $
+
+--- lib/engine/presence/presence-core.cpp.orig 2016-11-20 00:45:55.000000000 +0000
++++ lib/engine/presence/presence-core.cpp
+@@ -245,7 +245,7 @@ Ekiga::PresenceCore::is_supported_uri (c
+ {
+   bool result = false;
+ 
+-  for (std::set<sigc::slot1<bool, std::string> >::const_iterator iter
++  for (std::vector<sigc::slot1<bool, std::string> >::const_iterator iter
+        = uri_testers.begin ();
+        iter != uri_testers.end () && result == false;
+        iter++)
+@@ -257,7 +257,7 @@ Ekiga::PresenceCore::is_supported_uri (c
+ void
+ Ekiga::PresenceCore::add_supported_uri (sigc::slot1<bool,std::string> tester)
+ {
+-  uri_testers.insert (tester);
++  uri_testers.push_back(tester);
+ }
+ 
+ void
Index: pkgsrc/net/ekiga/patches/patch-lib_engine_presence_presence-core.h
diff -u /dev/null pkgsrc/net/ekiga/patches/patch-lib_engine_presence_presence-core.h:1.1
--- /dev/null   Sun Nov 20 22:12:19 2016
+++ pkgsrc/net/ekiga/patches/patch-lib_engine_presence_presence-core.h  Sun Nov 20 22:12:19 2016
@@ -0,0 +1,21 @@
+$NetBSD: patch-lib_engine_presence_presence-core.h,v 1.1 2016/11/20 22:12:19 joerg Exp $
+
+--- lib/engine/presence/presence-core.h.orig   2016-11-20 00:45:43.000000000 +0000
++++ lib/engine/presence/presence-core.h
+@@ -38,6 +38,7 @@
+ #ifndef __PRESENCE_CORE_H__
+ #define __PRESENCE_CORE_H__
+ 
++#include <vector>
+ #include "services.h"
+ #include "cluster.h"
+ #include "account-core.h"
+@@ -309,7 +310,7 @@ namespace Ekiga
+ 
+   private:
+ 
+-    std::set<sigc::slot1<bool, std::string> > uri_testers;
++    std::vector<sigc::slot1<bool, std::string> > uri_testers;
+ 
+     /*** Misc ***/
+   public: