diff options
author | joerg <joerg@pkgsrc.org> | 2013-10-15 14:46:07 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-10-15 14:46:07 +0000 |
commit | 831f55133b315b9021a3af13e3543a251040eaaf (patch) | |
tree | e06780386c5528262a87429bde815ba9c267ae2e /net/ekiga | |
parent | b6c623a8776849e02220d20c18dc8cddd34312c9 (diff) | |
download | pkgsrc-831f55133b315b9021a3af13e3543a251040eaaf.tar.gz |
Don't use tr1/memory for libc++ or any C++11 compiler.
Diffstat (limited to 'net/ekiga')
24 files changed, 627 insertions, 4 deletions
diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo index fd49b3ae5c2..4d1bc8c487d 100644 --- a/net/ekiga/distinfo +++ b/net/ekiga/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2013/08/16 05:53:02 obache Exp $ +$NetBSD: distinfo,v 1.13 2013/10/15 14:46:07 joerg Exp $ SHA1 (ekiga-3.2.6.tar.bz2) = 1c9d2004aa57643a951c1d454e9cfb207143c021 RMD160 (ekiga-3.2.6.tar.bz2) = f53fe740856e4a4c5b6141086ba25288aabe51ac @@ -8,9 +8,31 @@ SHA1 (patch-configure.ac) = a27f2712f9b3f2fa9020d85de87cae78d30ad9bb SHA1 (patch-lib_engine_account_bank-impl.h) = 2cc4906ce966e5a8840ec5284433c3a9396c5911 SHA1 (patch-lib_engine_addressbook_book-impl.h) = 2259de4d6b4450180a0a2a60866eaf3f3e04f3eb SHA1 (patch-lib_engine_addressbook_source-impl.h) = ca0d25740c4b37768e15179e4980d4559cf392a8 -SHA1 (patch-lib_engine_components_libnotify_libnotify-main.cpp) = c7836b031dcb160003f9956fd968a0dd64ca1924 +SHA1 (patch-lib_engine_components_call-history_history-book.cpp) = cac2aba4e32c94d0d91e211cb187064c04ff2f1c +SHA1 (patch-lib_engine_components_call-history_history-book.h) = 8d64389c70a2f10280ef9da2a1cb8943b0223971 +SHA1 (patch-lib_engine_components_call-history_history-contact.cpp) = e4bc8e533669374d8d585f836441afe9dcd5d080 +SHA1 (patch-lib_engine_components_call-history_history-contact.h) = 532441a88e29eabe1e1bb73e77b0aece3f4d05a3 +SHA1 (patch-lib_engine_components_ldap_ldap-book.cpp) = dfe103a8c5360877931485d15301e27df54de98c +SHA1 (patch-lib_engine_components_ldap_ldap-book.h) = 15ce91d6ac9eca82b70c63870cbd0483c3bfe61d +SHA1 (patch-lib_engine_components_ldap_ldap-source.cpp) = d29dd5c8a88b466d94f3252bd09eac1c27afbdba +SHA1 (patch-lib_engine_components_ldap_ldap-source.h) = 8bd5661002e8701f73c1e326ceaa659d4ca1388a +SHA1 (patch-lib_engine_components_libnotify_libnotify-main.cpp) = 365e7a565f1ae12c3daa22d299de27ce6ab4dda3 +SHA1 (patch-lib_engine_components_local-roster_local-heap.cpp) = 0ec04c16500f74f7dfa85d86920dd80adf69f095 +SHA1 (patch-lib_engine_components_local-roster_local-heap.h) = 002ee5503a34d369b7a52663025eab5050ba6c4e +SHA1 (patch-lib_engine_components_local-roster_local-presentity.cpp) = 775f60c45ed486b589c3860ca779ef76296ab14d +SHA1 (patch-lib_engine_components_local-roster_local-presentity.h) = 69ad42ee97a936ca41c4638f92ce2074b7f048a8 +SHA1 (patch-lib_engine_components_resource-list_rl-cluster.cpp) = 210af3e627477fd28262f1b2617d397f105f47f9 +SHA1 (patch-lib_engine_components_resource-list_rl-cluster.h) = 02b8bb35a8f1fe71a479db48ec363f21c69563a2 +SHA1 (patch-lib_engine_components_resource-list_rl-entry.h) = e99080c1ad4447536b033de425cad4c14ad283d3 +SHA1 (patch-lib_engine_components_resource-list_rl-heap.cpp) = 66b92a708d2e2a10b7dc1a79962ee8b37c257f29 +SHA1 (patch-lib_engine_components_resource-list_rl-heap.h) = b8a22b117d6fd77a1492308a59636d7cefb14f59 +SHA1 (patch-lib_engine_components_resource-list_rl-list.cpp) = 1957a688bca7cde9345b1e3172eaeaf62aa79892 +SHA1 (patch-lib_engine_components_resource-list_rl-presentity.cpp) = 4950c8413898da47e2290b4d4f1f84292c12a281 +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_gui_xwindow.cpp) = d6f5b3b07357e3390afe9f9c7ab632ac9a9ba006 +SHA1 (patch-lib_gui_xwindow.h) = 121b40b104d8ac4ad30cf81ddb8237ad5a5a247c SHA1 (patch-src_Makefile.am) = 54a6fd59b640c118b928af19fe3aa9943550a3dc SHA1 (patch-src_Makefile.in) = dab0e316da9ba7eb2286d104018d59dc85c1ed5b SHA1 (patch-src_gui_main.cpp) = fa15b3f8f2bf5e6bc1bdb73cb5376ae3a9858571 diff --git a/net/ekiga/patches/patch-lib_engine_components_call-history_history-book.cpp b/net/ekiga/patches/patch-lib_engine_components_call-history_history-book.cpp new file mode 100644 index 00000000000..e5f926d56d1 --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_call-history_history-book.cpp @@ -0,0 +1,34 @@ +$NetBSD: patch-lib_engine_components_call-history_history-book.cpp,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/call-history/history-book.cpp.orig 2013-10-15 13:03:14.000000000 +0000 ++++ lib/engine/components/call-history/history-book.cpp +@@ -58,9 +58,9 @@ History::Book::Book (Ekiga::ServiceCore + + const std::string raw = c_raw; + +- doc = std::tr1::shared_ptr<xmlDoc> (xmlRecoverMemory (raw.c_str (), raw.length ()), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlRecoverMemory (raw.c_str (), raw.length ()), xmlFreeDoc); + if ( !doc) +- doc = std::tr1::shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); + + root = xmlDocGetRootElement (doc.get ()); + if (root == NULL) { +@@ -80,7 +80,7 @@ History::Book::Book (Ekiga::ServiceCore + g_free (c_raw); + } else { + +- doc = std::tr1::shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); + root = xmlNewDocNode (doc.get (), NULL, BAD_CAST "list", NULL); + xmlDocSetRootElement (doc.get (), root); + } +@@ -176,7 +176,7 @@ History::Book::clear () + + remove_all_objects (); + +- doc = std::tr1::shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); + root = xmlNewDocNode (doc.get (), NULL, BAD_CAST "list", NULL); + xmlDocSetRootElement (doc.get (), root); + diff --git a/net/ekiga/patches/patch-lib_engine_components_call-history_history-book.h b/net/ekiga/patches/patch-lib_engine_components_call-history_history-book.h new file mode 100644 index 00000000000..21467c0289c --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_call-history_history-book.h @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_engine_components_call-history_history-book.h,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/call-history/history-book.h.orig 2013-10-15 13:03:12.000000000 +0000 ++++ lib/engine/components/call-history/history-book.h +@@ -106,7 +106,7 @@ namespace History + std::string message); + + Ekiga::ServiceCore &core; +- std::tr1::shared_ptr<xmlDoc> doc; ++ shared_ptr<xmlDoc> doc; + }; + + typedef gmref_ptr<Book> BookPtr; diff --git a/net/ekiga/patches/patch-lib_engine_components_call-history_history-contact.cpp b/net/ekiga/patches/patch-lib_engine_components_call-history_history-contact.cpp new file mode 100644 index 00000000000..3c6926466c8 --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_call-history_history-contact.cpp @@ -0,0 +1,22 @@ +$NetBSD: patch-lib_engine_components_call-history_history-contact.cpp,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/call-history/history-contact.cpp.orig 2013-10-15 13:03:06.000000000 +0000 ++++ lib/engine/components/call-history/history-contact.cpp +@@ -45,7 +45,7 @@ + + + History::Contact::Contact (Ekiga::ServiceCore &_core, +- std::tr1::shared_ptr<xmlDoc> _doc, ++ shared_ptr<xmlDoc> _doc, + xmlNodePtr _node): + core(_core), doc(_doc), node(_node) + { +@@ -102,7 +102,7 @@ History::Contact::Contact (Ekiga::Servic + + + History::Contact::Contact (Ekiga::ServiceCore &_core, +- std::tr1::shared_ptr<xmlDoc> _doc, ++ shared_ptr<xmlDoc> _doc, + const std::string _name, + const std::string _uri, + time_t _call_start, diff --git a/net/ekiga/patches/patch-lib_engine_components_call-history_history-contact.h b/net/ekiga/patches/patch-lib_engine_components_call-history_history-contact.h new file mode 100644 index 00000000000..98a37f92699 --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_call-history_history-contact.h @@ -0,0 +1,42 @@ +$NetBSD: patch-lib_engine_components_call-history_history-contact.h,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/call-history/history-contact.h.orig 2009-09-22 14:27:35.000000000 +0000 ++++ lib/engine/components/call-history/history-contact.h +@@ -38,7 +38,14 @@ + + #include <libxml/tree.h> + ++#include <cstddef> ++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION) ++#include <memory> ++using std::shared_ptr; ++#else + #include <tr1/memory> ++using std::tr1::shared_ptr; ++#endif + + #include "services.h" + #include "contact-core.h" +@@ -64,11 +71,11 @@ namespace History + public: + + Contact (Ekiga::ServiceCore &_core, +- std::tr1::shared_ptr<xmlDoc> _doc, ++ shared_ptr<xmlDoc> _doc, + xmlNodePtr _node); + + Contact (Ekiga::ServiceCore &_core, +- std::tr1::shared_ptr<xmlDoc> _doc, ++ shared_ptr<xmlDoc> _doc, + const std::string _name, + const std::string _uri, + time_t call_start, +@@ -101,7 +108,7 @@ namespace History + + Ekiga::ServiceCore &core; + +- std::tr1::shared_ptr<xmlDoc> doc; ++ shared_ptr<xmlDoc> doc; + xmlNodePtr node; + std::string name; + std::string uri; diff --git a/net/ekiga/patches/patch-lib_engine_components_ldap_ldap-book.cpp b/net/ekiga/patches/patch-lib_engine_components_ldap_ldap-book.cpp new file mode 100644 index 00000000000..e57aacf3d53 --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_ldap_ldap-book.cpp @@ -0,0 +1,22 @@ +$NetBSD: patch-lib_engine_components_ldap_ldap-book.cpp,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/ldap/ldap-book.cpp.orig 2013-10-15 13:02:29.000000000 +0000 ++++ lib/engine/components/ldap/ldap-book.cpp +@@ -166,7 +166,7 @@ struct RefreshData + /* actual implementation */ + + OPENLDAP::Book::Book (Ekiga::ServiceCore &_core, +- std::tr1::shared_ptr<xmlDoc> _doc, ++ shared_ptr<xmlDoc> _doc, + xmlNodePtr _node): + saslform(NULL), core(_core), doc(_doc), node(_node), + name_node(NULL), uri_node(NULL), authcID_node(NULL), password_node(NULL), +@@ -335,7 +335,7 @@ OPENLDAP::Book::Book (Ekiga::ServiceCore + } + + OPENLDAP::Book::Book (Ekiga::ServiceCore &_core, +- std::tr1::shared_ptr<xmlDoc> _doc, ++ shared_ptr<xmlDoc> _doc, + OPENLDAP::BookInfo _bookinfo): + saslform(NULL), core(_core), doc(_doc), name_node(NULL), + uri_node(NULL), authcID_node(NULL), password_node(NULL), diff --git a/net/ekiga/patches/patch-lib_engine_components_ldap_ldap-book.h b/net/ekiga/patches/patch-lib_engine_components_ldap_ldap-book.h new file mode 100644 index 00000000000..aaee58f2c1c --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_ldap_ldap-book.h @@ -0,0 +1,41 @@ +$NetBSD: patch-lib_engine_components_ldap_ldap-book.h,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/ldap/ldap-book.h.orig 2013-10-15 12:53:34.000000000 +0000 ++++ lib/engine/components/ldap/ldap-book.h +@@ -40,7 +40,13 @@ + #define __LDAP_BOOK_H__ + + #include <vector> ++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION) ++#include <memory> ++using std::shared_ptr; ++#else + #include <tr1/memory> ++using std::tr1::shared_ptr; ++#endif + #include <libxml/tree.h> + #include <glib/gi18n.h> + +@@ -88,11 +94,11 @@ namespace OPENLDAP + public: + + Book (Ekiga::ServiceCore &_core, +- std::tr1::shared_ptr<xmlDoc> _doc, ++ shared_ptr<xmlDoc> _doc, + xmlNodePtr node); + + Book (Ekiga::ServiceCore &_core, +- std::tr1::shared_ptr<xmlDoc> _doc, ++ shared_ptr<xmlDoc> _doc, + OPENLDAP::BookInfo _bookinfo); + + ~Book (); +@@ -135,7 +141,7 @@ namespace OPENLDAP + Ekiga::Form &form); + + Ekiga::ServiceCore &core; +- std::tr1::shared_ptr<xmlDoc> doc; ++ shared_ptr<xmlDoc> doc; + xmlNodePtr node; + + xmlNodePtr name_node; diff --git a/net/ekiga/patches/patch-lib_engine_components_ldap_ldap-source.cpp b/net/ekiga/patches/patch-lib_engine_components_ldap_ldap-source.cpp new file mode 100644 index 00000000000..fef3f331d53 --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_ldap_ldap-source.cpp @@ -0,0 +1,25 @@ +$NetBSD: patch-lib_engine_components_ldap_ldap-source.cpp,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/ldap/ldap-source.cpp.orig 2013-10-15 12:55:21.000000000 +0000 ++++ lib/engine/components/ldap/ldap-source.cpp +@@ -58,9 +58,9 @@ OPENLDAP::Source::Source (Ekiga::Service + + const std::string raw = c_raw; + +- doc = std::tr1::shared_ptr<xmlDoc> (xmlRecoverMemory (raw.c_str (), raw.length ()), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlRecoverMemory (raw.c_str (), raw.length ()), xmlFreeDoc); + if ( !doc) +- doc = std::tr1::shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); + + root = xmlDocGetRootElement (doc.get ()); + +@@ -83,7 +83,7 @@ OPENLDAP::Source::Source (Ekiga::Service + g_free (c_raw); + } else { + +- doc = std::tr1::shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); + root = xmlNewDocNode (doc.get (), NULL, BAD_CAST "list", NULL); + xmlDocSetRootElement (doc.get (), root); + diff --git a/net/ekiga/patches/patch-lib_engine_components_ldap_ldap-source.h b/net/ekiga/patches/patch-lib_engine_components_ldap_ldap-source.h new file mode 100644 index 00000000000..de1d0c36503 --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_ldap_ldap-source.h @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_engine_components_ldap_ldap-source.h,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/ldap/ldap-source.h.orig 2013-10-15 13:02:38.000000000 +0000 ++++ lib/engine/components/ldap/ldap-source.h +@@ -76,7 +76,7 @@ namespace OPENLDAP + private: + + Ekiga::ServiceCore &core; +- std::tr1::shared_ptr<xmlDoc> doc; ++ shared_ptr<xmlDoc> doc; + + struct BookInfo bookinfo; + diff --git a/net/ekiga/patches/patch-lib_engine_components_libnotify_libnotify-main.cpp b/net/ekiga/patches/patch-lib_engine_components_libnotify_libnotify-main.cpp index e80d27ade63..c3c1deee8bc 100644 --- a/net/ekiga/patches/patch-lib_engine_components_libnotify_libnotify-main.cpp +++ b/net/ekiga/patches/patch-lib_engine_components_libnotify_libnotify-main.cpp @@ -1,10 +1,33 @@ -$NetBSD: patch-lib_engine_components_libnotify_libnotify-main.cpp,v 1.1 2013/08/16 05:53:02 obache Exp $ +$NetBSD: patch-lib_engine_components_libnotify_libnotify-main.cpp,v 1.2 2013/10/15 14:46:07 joerg Exp $ * for linbotify-0.7 API change --- lib/engine/components/libnotify/libnotify-main.cpp.orig 2009-09-22 14:27:35.000000000 +0000 +++ lib/engine/components/libnotify/libnotify-main.cpp -@@ -158,7 +158,7 @@ LibNotify::on_notification_added (gmref_ +@@ -36,7 +36,13 @@ + */ + + #include <map> ++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION) ++#include <memory> ++using std::shared_ptr; ++#else + #include <tr1/memory> ++using std::tr1::shared_ptr; ++#endif + + #include <libnotify/notify.h> + +@@ -67,7 +73,7 @@ private: + void on_notification_added (gmref_ptr<Ekiga::Notification> notif); + void on_notification_removed (gmref_ptr<Ekiga::Notification> notif); + +- typedef std::map<gmref_ptr<Ekiga::Notification>, std::pair<sigc::connection, std::tr1::shared_ptr<NotifyNotification> > > container_type; ++ typedef std::map<gmref_ptr<Ekiga::Notification>, std::pair<sigc::connection, shared_ptr<NotifyNotification> > > container_type; + container_type live; + }; + +@@ -158,13 +164,13 @@ LibNotify::on_notification_added (gmref_ notif = notify_notification_new (notification->get_title ().c_str (), notification->get_body ().c_str (), @@ -13,3 +36,10 @@ $NetBSD: patch-lib_engine_components_libnotify_libnotify-main.cpp,v 1.1 2013/08/ g_signal_connect (notif, "closed", G_CALLBACK (on_notif_closed), notification.get ()); + sigc::connection conn = notification->removed.connect (sigc::bind (sigc::mem_fun (this, &LibNotify::on_notification_removed), notification)); + +- live[notification] = std::pair<sigc::connection, std::tr1::shared_ptr<NotifyNotification> > (conn, std::tr1::shared_ptr<NotifyNotification> (notif, g_object_unref)); ++ live[notification] = std::pair<sigc::connection, shared_ptr<NotifyNotification> > (conn, shared_ptr<NotifyNotification> (notif, g_object_unref)); + + (void)notify_notification_show (notif, NULL); + } diff --git a/net/ekiga/patches/patch-lib_engine_components_local-roster_local-heap.cpp b/net/ekiga/patches/patch-lib_engine_components_local-roster_local-heap.cpp new file mode 100644 index 00000000000..98987f1ad77 --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_local-roster_local-heap.cpp @@ -0,0 +1,25 @@ +$NetBSD: patch-lib_engine_components_local-roster_local-heap.cpp,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/local-roster/local-heap.cpp.orig 2013-10-15 12:55:57.000000000 +0000 ++++ lib/engine/components/local-roster/local-heap.cpp +@@ -60,9 +60,9 @@ Local::Heap::Heap (Ekiga::ServiceCore &_ + if (c_raw != NULL) { + + const std::string raw = c_raw; +- doc = std::tr1::shared_ptr<xmlDoc> (xmlRecoverMemory (raw.c_str (), raw.length ()), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlRecoverMemory (raw.c_str (), raw.length ()), xmlFreeDoc); + if ( !doc) +- doc = std::tr1::shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); + + root = xmlDocGetRootElement (doc.get ()); + if (root == NULL) { +@@ -83,7 +83,7 @@ Local::Heap::Heap (Ekiga::ServiceCore &_ + } + else { + +- doc = std::tr1::shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); + root = xmlNewDocNode (doc.get (), NULL, BAD_CAST "list", NULL); + xmlDocSetRootElement (doc.get (), root); + diff --git a/net/ekiga/patches/patch-lib_engine_components_local-roster_local-heap.h b/net/ekiga/patches/patch-lib_engine_components_local-roster_local-heap.h new file mode 100644 index 00000000000..a197c65fc6b --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_local-roster_local-heap.h @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_engine_components_local-roster_local-heap.h,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/local-roster/local-heap.h.orig 2013-10-15 12:56:10.000000000 +0000 ++++ lib/engine/components/local-roster/local-heap.h +@@ -199,7 +199,7 @@ namespace Local + Ekiga::Form& result); + + Ekiga::ServiceCore &core; +- std::tr1::shared_ptr<xmlDoc> doc; ++ shared_ptr<xmlDoc> doc; + }; + + typedef gmref_ptr<Heap> HeapPtr; diff --git a/net/ekiga/patches/patch-lib_engine_components_local-roster_local-presentity.cpp b/net/ekiga/patches/patch-lib_engine_components_local-roster_local-presentity.cpp new file mode 100644 index 00000000000..d165f81a560 --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_local-roster_local-presentity.cpp @@ -0,0 +1,22 @@ +$NetBSD: patch-lib_engine_components_local-roster_local-presentity.cpp,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/local-roster/local-presentity.cpp.orig 2013-10-15 12:55:38.000000000 +0000 ++++ lib/engine/components/local-roster/local-presentity.cpp +@@ -48,7 +48,7 @@ + * Public API + */ + Local::Presentity::Presentity (Ekiga::ServiceCore &_core, +- std::tr1::shared_ptr<xmlDoc> _doc, ++ shared_ptr<xmlDoc> _doc, + xmlNodePtr _node) : + core(_core), doc(_doc), node(_node), name_node(NULL), presence("unknown") + { +@@ -98,7 +98,7 @@ Local::Presentity::Presentity (Ekiga::Se + + + Local::Presentity::Presentity (Ekiga::ServiceCore &_core, +- std::tr1::shared_ptr<xmlDoc> _doc, ++ shared_ptr<xmlDoc> _doc, + const std::string _name, + const std::string _uri, + const std::set<std::string> _groups) : diff --git a/net/ekiga/patches/patch-lib_engine_components_local-roster_local-presentity.h b/net/ekiga/patches/patch-lib_engine_components_local-roster_local-presentity.h new file mode 100644 index 00000000000..fb6fedebcab --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_local-roster_local-presentity.h @@ -0,0 +1,43 @@ +$NetBSD: patch-lib_engine_components_local-roster_local-presentity.h,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/local-roster/local-presentity.h.orig 2013-10-15 12:53:32.000000000 +0000 ++++ lib/engine/components/local-roster/local-presentity.h +@@ -40,8 +40,14 @@ + + #include <libxml/tree.h> + ++#include <cstddef> ++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION) ++#include <memory> ++using std::shared_ptr; ++#else + #include <tr1/memory> +- ++using std::tr1::shared_ptr; ++#endif + + #include "form.h" + #include "presence-core.h" +@@ -73,11 +79,11 @@ namespace Local + * Constructors (and destructor) + */ + Presentity (Ekiga::ServiceCore &_core, +- std::tr1::shared_ptr<xmlDoc> _doc, ++ shared_ptr<xmlDoc> _doc, + xmlNodePtr _node); + + Presentity (Ekiga::ServiceCore &_core, +- std::tr1::shared_ptr<xmlDoc> _doc, ++ shared_ptr<xmlDoc> _doc, + const std::string _name, + const std::string _uri, + const std::set<std::string> _groups); +@@ -179,7 +185,7 @@ namespace Local + + Ekiga::ServiceCore &core; + +- std::tr1::shared_ptr<xmlDoc> doc; ++ shared_ptr<xmlDoc> doc; + xmlNodePtr node; + xmlNodePtr name_node; + diff --git a/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-cluster.cpp b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-cluster.cpp new file mode 100644 index 00000000000..c1fffdbec4a --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-cluster.cpp @@ -0,0 +1,25 @@ +$NetBSD: patch-lib_engine_components_resource-list_rl-cluster.cpp,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/resource-list/rl-cluster.cpp.orig 2013-10-15 12:56:25.000000000 +0000 ++++ lib/engine/components/resource-list/rl-cluster.cpp +@@ -62,9 +62,9 @@ RL::Cluster::Cluster (Ekiga::ServiceCore + if (c_raw != NULL) { + + const std::string raw = c_raw; +- doc = std::tr1::shared_ptr<xmlDoc> (xmlRecoverMemory (raw.c_str (), raw.length ()), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlRecoverMemory (raw.c_str (), raw.length ()), xmlFreeDoc); + if ( !doc) +- doc = std::tr1::shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); + + xmlNodePtr root = xmlDocGetRootElement (doc.get ()); + if (root == NULL) { +@@ -85,7 +85,7 @@ RL::Cluster::Cluster (Ekiga::ServiceCore + + } else { + +- doc = std::tr1::shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); + xmlNodePtr root = xmlNewDocNode (doc.get (), NULL, BAD_CAST "list", NULL); + xmlDocSetRootElement (doc.get (), root); + add ("https://xcap.sipthor.net/xcap-root", "alice", "123", "alice@example.com", "XCAP Test", false); // FIXME: remove diff --git a/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-cluster.h b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-cluster.h new file mode 100644 index 00000000000..140a4f9c033 --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-cluster.h @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_engine_components_resource-list_rl-cluster.h,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/resource-list/rl-cluster.h.orig 2013-10-15 12:56:50.000000000 +0000 ++++ lib/engine/components/resource-list/rl-cluster.h +@@ -65,7 +65,7 @@ namespace RL { + private: + + Ekiga::ServiceCore& core; +- std::tr1::shared_ptr<xmlDoc> doc; ++ shared_ptr<xmlDoc> doc; + + void add (xmlNodePtr node); + void add (const std::string uri, diff --git a/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-entry.h b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-entry.h new file mode 100644 index 00000000000..a41ef75aa7b --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-entry.h @@ -0,0 +1,37 @@ +$NetBSD: patch-lib_engine_components_resource-list_rl-entry.h,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/resource-list/rl-entry.h.orig 2013-10-15 12:53:30.000000000 +0000 ++++ lib/engine/components/resource-list/rl-entry.h +@@ -44,7 +44,14 @@ + + #include <libxml/tree.h> + ++#include <cstddef> ++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION) ++#include <memory> ++using std::shared_ptr; ++#else + #include <tr1/memory> ++using shared_ptr; ++#endif + + namespace RL { + +@@ -58,7 +65,7 @@ namespace RL { + gmref_ptr<XCAP::Path> path_, + int pos, + const std::string group, +- std::tr1::shared_ptr<xmlDoc> doc_, ++ shared_ptr<xmlDoc> doc_, + xmlNodePtr node_); + + ~Entry (); +@@ -96,7 +103,7 @@ namespace RL { + + std::set<std::string> groups; + +- std::tr1::shared_ptr<xmlDoc> doc; ++ shared_ptr<xmlDoc> doc; + xmlNodePtr node; + xmlNodePtr name_node; + diff --git a/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-heap.cpp b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-heap.cpp new file mode 100644 index 00000000000..80c5233113a --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-heap.cpp @@ -0,0 +1,34 @@ +$NetBSD: patch-lib_engine_components_resource-list_rl-heap.cpp,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/resource-list/rl-heap.cpp.orig 2013-10-15 12:56:37.000000000 +0000 ++++ lib/engine/components/resource-list/rl-heap.cpp +@@ -46,7 +46,7 @@ + #include "rl-heap.h" + + RL::Heap::Heap (Ekiga::ServiceCore& services_, +- std::tr1::shared_ptr<xmlDoc> doc_, ++ shared_ptr<xmlDoc> doc_, + xmlNodePtr node_): + services(services_), + node(node_), name(NULL), +@@ -115,7 +115,7 @@ RL::Heap::Heap (Ekiga::ServiceCore& serv + } + + RL::Heap::Heap (Ekiga::ServiceCore& services_, +- std::tr1::shared_ptr<xmlDoc> doc_, ++ shared_ptr<xmlDoc> doc_, + const std::string name_, + const std::string root_, + const std::string user_, +@@ -286,9 +286,9 @@ RL::Heap::on_document_received (bool err + void + RL::Heap::parse_doc (std::string raw) + { +- doc = std::tr1::shared_ptr<xmlDoc> (xmlRecoverMemory (raw.c_str (), raw.length ()), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlRecoverMemory (raw.c_str (), raw.length ()), xmlFreeDoc); + if ( !doc) +- doc = std::tr1::shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); + xmlNodePtr doc_root = xmlDocGetRootElement (doc.get ()); + + if (doc_root == NULL diff --git a/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-heap.h b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-heap.h new file mode 100644 index 00000000000..b713cabda76 --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-heap.h @@ -0,0 +1,31 @@ +$NetBSD: patch-lib_engine_components_resource-list_rl-heap.h,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/resource-list/rl-heap.h.orig 2013-10-15 12:56:47.000000000 +0000 ++++ lib/engine/components/resource-list/rl-heap.h +@@ -49,7 +49,7 @@ namespace RL { + public: + + Heap (Ekiga::ServiceCore& services_, +- std::tr1::shared_ptr<xmlDoc> doc_, ++ shared_ptr<xmlDoc> doc_, + xmlNodePtr node); + + /* name: the name of the Heap in the GUI +@@ -63,7 +63,7 @@ namespace RL { + * + */ + Heap (Ekiga::ServiceCore& core_, +- std::tr1::shared_ptr<xmlDoc> doc_, ++ shared_ptr<xmlDoc> doc_, + const std::string name_, + const std::string root_, + const std::string user_, +@@ -103,7 +103,7 @@ namespace RL { + xmlNodePtr username; + xmlNodePtr password; + +- std::tr1::shared_ptr<xmlDoc> doc; ++ shared_ptr<xmlDoc> doc; + xmlNodePtr list_node; + + std::map<PresentityPtr, std::list<sigc::connection> > presentities; diff --git a/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-list.cpp b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-list.cpp new file mode 100644 index 00000000000..8c0bdb5a16d --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-list.cpp @@ -0,0 +1,25 @@ +$NetBSD: patch-lib_engine_components_resource-list_rl-list.cpp,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/resource-list/rl-list.cpp.orig 2013-10-15 12:56:42.000000000 +0000 ++++ lib/engine/components/resource-list/rl-list.cpp +@@ -82,7 +82,7 @@ public: // no need to make anything priv + + std::string group; + +- std::tr1::shared_ptr<xmlDoc> doc; ++ shared_ptr<xmlDoc> doc; + xmlNodePtr node; + + xmlNodePtr name_node; +@@ -270,9 +270,9 @@ RL::ListImpl::on_xcap_answer (bool error + + } else { + +- doc = std::tr1::shared_ptr<xmlDoc> (xmlRecoverMemory (value.c_str (), value.length ()), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlRecoverMemory (value.c_str (), value.length ()), xmlFreeDoc); + if ( !doc) +- doc = std::tr1::shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); ++ doc = shared_ptr<xmlDoc> (xmlNewDoc (BAD_CAST "1.0"), xmlFreeDoc); + node = xmlDocGetRootElement (doc.get ()); + if (node == NULL + || node->name == NULL diff --git a/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-presentity.cpp b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-presentity.cpp new file mode 100644 index 00000000000..540b9af099e --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-presentity.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_engine_components_resource-list_rl-presentity.cpp,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/resource-list/rl-presentity.cpp.orig 2013-10-15 12:56:40.000000000 +0000 ++++ lib/engine/components/resource-list/rl-presentity.cpp +@@ -48,7 +48,7 @@ + + RL::Presentity::Presentity (Ekiga::ServiceCore &services_, + gmref_ptr<XCAP::Path> path_, +- std::tr1::shared_ptr<xmlDoc> doc_, ++ shared_ptr<xmlDoc> doc_, + xmlNodePtr node_, + bool writable_) : + services(services_), doc(doc_), node(node_), writable(writable_), diff --git a/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-presentity.h b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-presentity.h new file mode 100644 index 00000000000..8472b11893b --- /dev/null +++ b/net/ekiga/patches/patch-lib_engine_components_resource-list_rl-presentity.h @@ -0,0 +1,37 @@ +$NetBSD: patch-lib_engine_components_resource-list_rl-presentity.h,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/engine/components/resource-list/rl-presentity.h.orig 2013-10-15 12:53:28.000000000 +0000 ++++ lib/engine/components/resource-list/rl-presentity.h +@@ -39,7 +39,14 @@ + #define __RL_PRESENTITY_H__ + + #include <libxml/tree.h> ++#include <cstddef> ++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION) ++#include <memory> ++using std::shared_ptr; ++#else + #include <tr1/memory> ++using shared_ptr; ++#endif + + #include "form.h" + #include "presence-core.h" +@@ -56,7 +63,7 @@ namespace RL + + Presentity (Ekiga::ServiceCore &_core, + gmref_ptr<XCAP::Path> path_, +- std::tr1::shared_ptr<xmlDoc> doc_, ++ shared_ptr<xmlDoc> doc_, + xmlNodePtr _node, + bool writable_); + +@@ -101,7 +108,7 @@ namespace RL + Ekiga::ServiceCore &services; + + gmref_ptr<XCAP::Path> path; +- std::tr1::shared_ptr<xmlDoc> doc; ++ shared_ptr<xmlDoc> doc; + xmlNodePtr node; + bool writable; + diff --git a/net/ekiga/patches/patch-lib_gui_xwindow.cpp b/net/ekiga/patches/patch-lib_gui_xwindow.cpp new file mode 100644 index 00000000000..892be4cf1b5 --- /dev/null +++ b/net/ekiga/patches/patch-lib_gui_xwindow.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_gui_xwindow.cpp,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/gui/xwindow.cpp.orig 2013-10-15 12:52:21.000000000 +0000 ++++ lib/gui/xwindow.cpp +@@ -270,7 +270,7 @@ XWindow::Init (Display* dp, + if (!_colorConverter) + return 0; + +- _frameBuffer = std::tr1::shared_ptr<void> (malloc (_imageWidth * _imageHeight * _planes), free); ++ _frameBuffer = shared_ptr<void> (malloc (_imageWidth * _imageHeight * _planes), free); + + // detect the window manager type + _wmType = GetWMType (); diff --git a/net/ekiga/patches/patch-lib_gui_xwindow.h b/net/ekiga/patches/patch-lib_gui_xwindow.h new file mode 100644 index 00000000000..d6c37d66792 --- /dev/null +++ b/net/ekiga/patches/patch-lib_gui_xwindow.h @@ -0,0 +1,28 @@ +$NetBSD: patch-lib_gui_xwindow.h,v 1.1 2013/10/15 14:46:07 joerg Exp $ + +--- lib/gui/xwindow.h.orig 2013-10-15 12:51:15.000000000 +0000 ++++ lib/gui/xwindow.h +@@ -39,7 +39,14 @@ + #include <stdint.h> + #include "config.h" + ++#include <cstddef> ++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION) ++#include <memory> ++using std::shared_ptr; ++#else + #include <tr1/memory> ++using std::tr1::shared_ptr; ++#endif + + #include <ptlib.h> + #include <ptlib/vconvert.h> +@@ -245,7 +252,7 @@ private: + int _planes; + + PColourConverter* _colorConverter; +- std::tr1::shared_ptr<void> _frameBuffer; ++ shared_ptr<void> _frameBuffer; + + #ifdef HAVE_SHM + XShmSegmentInfo _XShmInfo; |