Date: Sat, 27 Oct 2018 00:52:11 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483071 - in head/net-im/ekiga: . files Message-ID: <201810270052.w9R0qB0H011535@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Oct 27 00:52:11 2018 New Revision: 483071 URL: https://svnweb.freebsd.org/changeset/ports/483071 Log: net-im/ekiga: unbreak with boost 1.69 ===> ekiga-4.0.1_20 depends on shared library: libboost_signals.so - not found PR: 232525 Obtained from: upstream Added: head/net-im/ekiga/files/patch-boost-1.69 (contents, props changed) Modified: head/net-im/ekiga/Makefile (contents, props changed) Modified: head/net-im/ekiga/Makefile ============================================================================== --- head/net-im/ekiga/Makefile Sat Oct 27 00:51:27 2018 (r483070) +++ head/net-im/ekiga/Makefile Sat Oct 27 00:52:11 2018 (r483071) @@ -4,7 +4,7 @@ PORTNAME= ekiga PORTVERSION= 4.0.1 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= net-im MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -15,10 +15,10 @@ COMMENT= VoIP and video conferencing application LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat \ +BUILD_DEPENDS= boost-libs>=1.53:devel/boost-libs \ + v4l_compat>=0:multimedia/v4l_compat \ gnome-icon-theme>=3.0.0:misc/gnome-icon-theme -LIB_DEPENDS= libboost_signals.so:devel/boost-libs \ - libopal.so:net/opal \ +LIB_DEPENDS= libopal.so:net/opal \ libv4l2.so:multimedia/libv4l RUN_DEPENDS= gnome-icon-theme>=3.0.0:misc/gnome-icon-theme Added: head/net-im/ekiga/files/patch-boost-1.69 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/ekiga/files/patch-boost-1.69 Sat Oct 27 00:52:11 2018 (r483071) @@ -0,0 +1,2879 @@ +https://gitlab.gnome.org/GNOME/ekiga/commit/12641b735a98 +https://gitlab.gnome.org/GNOME/ekiga/commit/44ef7c66d055 + +--- Makefile.in.orig 2013-02-20 21:44:17 UTC ++++ Makefile.in +@@ -64,7 +64,6 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/D + depcomp install-sh ltmain.sh missing mkinstalldirs + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ +- $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +@@ -189,8 +188,6 @@ AVAHI_LIBS = @AVAHI_LIBS@ + AWK = @AWK@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ + BOOST_LDFLAGS = @BOOST_LDFLAGS@ +-BOOST_LIBS = @BOOST_LIBS@ +-BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ +--- aclocal.m4.orig 2013-02-20 21:44:14 UTC ++++ aclocal.m4 +@@ -1783,7 +1783,6 @@ fi[]dnl + ])# PKG_CHECK_MODULES + + m4_include([m4/ax_boost_base.m4]) +-m4_include([m4/ax_boost_signals.m4]) + m4_include([m4/gnome-doc-utils.m4]) + m4_include([m4/intltool.m4]) + m4_include([m4/libtool.m4]) +--- config.h.in.orig 2013-02-20 21:44:15 UTC ++++ config.h.in +@@ -27,9 +27,6 @@ + /* define if the Boost library is available */ + #undef HAVE_BOOST + +-/* define if the Boost::Signals library is available */ +-#undef HAVE_BOOST_SIGNALS +- + /* DBUS support */ + #undef HAVE_DBUS + +--- configure.orig 2013-02-20 21:44:15 UTC ++++ configure +@@ -745,8 +745,6 @@ GCONF_LIBS + GCONF_CFLAGS + XML_LIBS + XML_CFLAGS +-BOOST_LIBS +-BOOST_SIGNALS_LIB + BOOST_LDFLAGS + BOOST_CPPFLAGS + GLIB_LIBS +@@ -938,7 +936,6 @@ enable_nls + enable_gtk_debug + with_boost + with_boost_libdir +-with_boost_signals + enable_gconf + with_gconf_source + with_gconf_schema_file_dir +@@ -1704,10 +1701,6 @@ Optional Packages: + this parameter only if default library detection + fails and you know exactly where your boost + libraries are located. +- --with-boost-signals[=special-lib] +- use the Signals library from boost - it is possible +- to specify a certain library for the linker e.g. +- --with-boost-signals=boost_signals-gcc-mt-d + --with-gconf-source=sourceaddress + Config database for installing schema files. + --with-gconf-schema-file-dir=dir +@@ -17785,7 +17778,7 @@ fi + + + if test "x$want_boost" = "xyes"; then +- boost_lib_version_req=1.34 ++ boost_lib_version_req=1.53 + boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'` + boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'` + boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'` +@@ -18013,241 +18006,21 @@ fi + + + +-# Check whether --with-boost-signals was given. +-if test "${with_boost_signals+set}" = set; then : +- withval=$with_boost_signals; +- if test "$withval" = "no"; then +- want_boost="no" +- elif test "$withval" = "yes"; then +- want_boost="yes" +- ax_boost_user_signals_lib="" +- else +- want_boost="yes" +- ax_boost_user_signals_lib="$withval" +- fi +- ++CPPFLAGS_save="$CPPFLAGS" ++CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" ++ac_fn_cxx_check_header_mongrel "$LINENO" "boost/signals2.hpp" "ac_cv_header_boost_signals2_hpp" "$ac_includes_default" ++if test "x$ac_cv_header_boost_signals2_hpp" = xyes; then : ++ + else +- want_boost="yes" +- ++ found_signals2=no + fi + + +- if test "x$want_boost" = "xyes"; then ++CPPFLAGS="$CPPFLAGS_save" + +- CPPFLAGS_SAVED="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +- export CPPFLAGS +- +- LDFLAGS_SAVED="$LDFLAGS" +- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" +- export LDFLAGS +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Signals library is available" >&5 +-$as_echo_n "checking whether the Boost::Signals library is available... " >&6; } +-if ${ax_cv_boost_signals+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <boost/signal.hpp> +- +-int +-main () +-{ +-boost::signal<void ()> sig; +- return 0; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- ax_cv_boost_signals=yes +-else +- ax_cv_boost_signals=no ++if test "x$found_signals2" = "xno"; then ++ as_fn_error $? "Could not find BOOST signals2 headers" "$LINENO" 5 + fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_signals" >&5 +-$as_echo "$ax_cv_boost_signals" >&6; } +- if test "x$ax_cv_boost_signals" = "xyes"; then +- +-$as_echo "#define HAVE_BOOST_SIGNALS /**/" >>confdefs.h +- +- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` +- if test "x$ax_boost_user_signals_lib" = "x"; then +- for libextension in `ls $BOOSTLIBDIR/libboost_signals*.so* $BOOSTLIBDIR/libboost_signals*.dylib* $BOOSTLIBDIR/libboost_signals*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_signals.*\)\.so.*$;\1;' -e 's;^lib\(boost_signals.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_signals.*\)\.a.*$;\1;'` ; do +- ax_lib=${libextension} +- as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +-$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if eval \${$as_ac_Lib+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-l$ax_lib $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char exit (); +-int +-main () +-{ +-return exit (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_try_link "$LINENO"; then : +- eval "$as_ac_Lib=yes" +-else +- eval "$as_ac_Lib=no" +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-eval ac_res=\$$as_ac_Lib +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +- BOOST_SIGNALS_LIB="-l$ax_lib"; link_signals="yes"; break +-else +- link_signals="no" +-fi +- +- done +- if test "x$link_signals" != "xyes"; then +- for libextension in `ls $BOOSTLIBDIR/boost_signals*.dll* $BOOSTLIBDIR/boost_signals*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_signals.*\)\.dll.*$;\1;' -e 's;^\(boost_signals.*\)\.a*$;\1;'` ; do +- ax_lib=${libextension} +- as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +-$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +-if eval \${$as_ac_Lib+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-l$ax_lib $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char exit (); +-int +-main () +-{ +-return exit (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_try_link "$LINENO"; then : +- eval "$as_ac_Lib=yes" +-else +- eval "$as_ac_Lib=no" +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-eval ac_res=\$$as_ac_Lib +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +- BOOST_SIGNALS_LIB="-l$ax_lib"; link_signals="yes"; break +-else +- link_signals="no" +-fi +- +- done +- fi +- +- else +- for ax_lib in $ax_boost_user_signals_lib boost_signals-$ax_boost_user_signals_lib; do +- as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +-$as_echo_n "checking for main in -l$ax_lib... " >&6; } +-if eval \${$as_ac_Lib+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-l$ax_lib $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-int +-main () +-{ +-return main (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_try_link "$LINENO"; then : +- eval "$as_ac_Lib=yes" +-else +- eval "$as_ac_Lib=no" +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-eval ac_res=\$$as_ac_Lib +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +- BOOST_SIGNALS_LIB="-l$ax_lib"; link_signals="yes"; break +-else +- link_signals="no" +-fi +- +- done +- +- fi +- if test "x$ax_lib" = "x"; then +- as_fn_error $? "Could not find a version of the library!" "$LINENO" 5 +- fi +- if test "x$link_signals" != "xyes"; then +- as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5 +- fi +- fi +- +- CPPFLAGS="$CPPFLAGS_SAVED" +- LDFLAGS="$LDFLAGS_SAVED" +- fi +- +- +-if test "x${ax_cv_boost_signals}" == "xno"; then +- as_fn_error $? "You need the boost signals library to compile Ekiga" "$LINENO" 5 +-fi +- +-BOOST_LIBS="${BOOST_SIGNALS_LIB}" +- + + + +--- help/Makefile.in.orig 2013-02-20 21:44:16 UTC ++++ help/Makefile.in +@@ -80,7 +80,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile + subdir = help + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ +- $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +@@ -119,8 +118,6 @@ AVAHI_LIBS = @AVAHI_LIBS@ + AWK = @AWK@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ + BOOST_LDFLAGS = @BOOST_LDFLAGS@ +-BOOST_LIBS = @BOOST_LIBS@ +-BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ +--- lib/Makefile.in.orig 2013-02-20 21:44:16 UTC ++++ lib/Makefile.in +@@ -136,7 +136,6 @@ subdir = lib + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ +- $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +@@ -650,8 +649,6 @@ AVAHI_LIBS = @AVAHI_LIBS@ + AWK = @AWK@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ + BOOST_LDFLAGS = @BOOST_LDFLAGS@ +-BOOST_LIBS = @BOOST_LIBS@ +-BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ +@@ -1206,7 +1203,7 @@ libekiga_la_SOURCES = $(top_srcdir)/lib/toolbox.h \ + $(components_dir)/common-videooutput/videooutput-manager-common.cpp \ + $(components_dir)/common-videooutput/videooutput-manager-common.h \ + $(am__append_23) $(am__append_24) +-libekiga_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) \ ++libekiga_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(GLIB_LIBS) \ + $(XML_LIBS) $(GTK_LIBS) $(am__append_1) $(am__append_8) \ + $(am__append_12) $(PTLIB_LIBS) $(OPAL_LIBS) $(am__append_18) \ + $(am__append_22) $(am__append_25) +@@ -1251,7 +1248,7 @@ AM_CPPFLAGS = \ + $(DBUS_CFLAGS) $(PTLIB_CFLAGS) $(OPAL_CFLAGS) + + AM_LIBS = \ +- $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS) ++ $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS) + + engine_dir = $(top_srcdir)/lib/engine + components_dir = $(top_srcdir)/lib/engine/components +--- lib/engine/account/account-core.h.orig 2012-11-07 20:43:51 UTC ++++ lib/engine/account/account-core.h +@@ -106,26 +106,26 @@ namespace Ekiga + + /** This signal is emitted when a bank has been added to the core + */ +- boost::signal1<void, BankPtr> bank_added; ++ boost::signals2::signal<void(BankPtr)> bank_added; + + /** This signal is emitted when a bank has been removed from the core + */ +- boost::signal1<void, BankPtr> bank_removed; ++ boost::signals2::signal<void(BankPtr)> bank_removed; + + /** This signal is emitted when a account has been added to one of + * the banks + */ +- boost::signal2<void, BankPtr, AccountPtr> account_added; ++ boost::signals2::signal<void(BankPtr, AccountPtr)> account_added; + + /** This signal is emitted when a account has been removed from one of + * the banks + */ +- boost::signal2<void, BankPtr, AccountPtr> account_removed; ++ boost::signals2::signal<void(BankPtr, AccountPtr)> account_removed; + + /** This signal is emitted when a account has been updated in one of + * the banks + */ +- boost::signal2<void, BankPtr, AccountPtr> account_updated; ++ boost::signals2::signal<void(BankPtr, AccountPtr)> account_updated; + + private: + +@@ -147,7 +147,7 @@ namespace Ekiga + /** This signal is emitted when the AccountCore Service has been + * updated. + */ +- boost::signal0<void> updated; ++ boost::signals2::signal<void(void)> updated; + + + /** This chain allows the AccountCore to present forms to the user +--- lib/engine/account/bank-impl.h.orig 2012-11-07 20:43:51 UTC ++++ lib/engine/account/bank-impl.h +@@ -74,7 +74,7 @@ namespace Ekiga + template<class AccountType = Account> + class BankImpl: + public Bank, +- public boost::signals::trackable, ++ public boost::signals2::trackable, + protected RefLister<AccountType> + { + +--- lib/engine/account/bank.h.orig 2012-11-07 20:43:51 UTC ++++ lib/engine/account/bank.h +@@ -74,15 +74,15 @@ namespace Ekiga + + /** This signal is emitted when a account has been added. + */ +- boost::signal1<void, AccountPtr> account_added; ++ boost::signals2::signal<void(AccountPtr)> account_added; + + /** This signal is emitted when a account has been removed. + */ +- boost::signal1<void, AccountPtr> account_removed; ++ boost::signals2::signal<void(AccountPtr)> account_removed; + + /** This signal is emitted when a account has been updated. + */ +- boost::signal1<void, AccountPtr> account_updated; ++ boost::signals2::signal<void(AccountPtr)> account_updated; + + /** This chain allows the BankImpl to present forms to the user + */ +--- lib/engine/addressbook/book.h.orig 2012-11-07 20:43:51 UTC ++++ lib/engine/addressbook/book.h +@@ -92,17 +92,17 @@ namespace Ekiga { + + /** This signal is emitted when a Contact has been added to the Book. + */ +- boost::signal1<void, ContactPtr > contact_added; ++ boost::signals2::signal<void(ContactPtr)> contact_added; + + + /** This signal is emitted when a Contact has been removed from the Book. + */ +- boost::signal1<void, ContactPtr > contact_removed; ++ boost::signals2::signal<void(ContactPtr)> contact_removed; + + + /** This signal is emitted when a Contact has been updated in the Book. + */ +- boost::signal1<void, ContactPtr > contact_updated; ++ boost::signals2::signal<void(ContactPtr)> contact_updated; + }; + + typedef boost::shared_ptr<Book> BookPtr; +--- lib/engine/addressbook/contact-core.cpp.orig 2013-02-18 21:36:51 UTC ++++ lib/engine/addressbook/contact-core.cpp +@@ -50,7 +50,7 @@ on_search () + + Ekiga::ContactCore::~ContactCore () + { +- for (std::list<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter) ++ for (std::list<boost::signals2::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter) + iter->disconnect (); + } + +--- lib/engine/addressbook/contact-core.h.orig 2013-02-18 21:36:51 UTC ++++ lib/engine/addressbook/contact-core.h +@@ -118,37 +118,37 @@ namespace Ekiga + /** This signal is emitted when a Ekiga::Source has been + * added to the ContactCore Service. + */ +- boost::signal1<void, SourcePtr > source_added; ++ boost::signals2::signal<void(SourcePtr)> source_added; + + /** This signal is emitted when a book has been added to one of + * the sources + */ +- boost::signal2<void, SourcePtr, BookPtr > book_added; ++ boost::signals2::signal<void(SourcePtr, BookPtr )> book_added; + + /** This signal is emitted when a book has been removed from one of + * the sources + */ +- boost::signal2<void, SourcePtr, BookPtr > book_removed; ++ boost::signals2::signal<void(SourcePtr, BookPtr )> book_removed; + + /** This signal is emitted when a book has been updated in one of + * the sources + */ +- boost::signal2<void, SourcePtr, BookPtr > book_updated; ++ boost::signals2::signal<void(SourcePtr, BookPtr )> book_updated; + + /** This signal is emitted when a contact has been added to one of + * the book of one of the sources + */ +- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_added; ++ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_added; + + /** This signal is emitted when a contact has been removed from one of + * the book of one of the sources + */ +- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_removed; ++ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_removed; + + /** This signal is emitted when a contact has been updated in one of + * the book of one of the sources + */ +- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_updated; ++ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_updated; + + private: + +@@ -174,7 +174,7 @@ namespace Ekiga + std::list<boost::shared_ptr<ContactDecorator> > contact_decorators; + + /*** Misc stuff ***/ +- std::list<boost::signals::connection> conns; ++ std::list<boost::signals2::connection> conns; + }; + + /** +--- lib/engine/addressbook/source.h.orig 2012-11-07 20:43:51 UTC ++++ lib/engine/addressbook/source.h +@@ -63,32 +63,32 @@ namespace Ekiga { + + /** This signal is emitted when a Book has been added to the Source. + */ +- boost::signal1<void, BookPtr > book_added; ++ boost::signals2::signal<void(BookPtr)> book_added; + + + /** This signal is emitted when a Book has been updated in the Source. + */ +- boost::signal1<void, BookPtr > book_updated; ++ boost::signals2::signal<void(BookPtr)> book_updated; + + + /** This signal is emitted when a Book has been removed in the Source. + */ +- boost::signal1<void, BookPtr > book_removed; ++ boost::signals2::signal<void(BookPtr)> book_removed; + + /** This signal is emitted when a Contact has been added to a book in + * this source. + */ +- boost::signal2<void, BookPtr, ContactPtr > contact_added; ++ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_added; + + /** This signal is emitted when a Contact has been removed from a book in + * this source. + */ +- boost::signal2<void, BookPtr, ContactPtr > contact_removed; ++ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_removed; + + /** This signal is emitted when a Contact has been updated in a book in + * this source + */ +- boost::signal2<void, BookPtr, ContactPtr > contact_updated; ++ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_updated; + }; + + typedef boost::shared_ptr<Source> SourcePtr; +--- lib/engine/audioinput/audioinput-core.h.orig 2012-11-07 20:43:51 UTC ++++ lib/engine/audioinput/audioinput-core.h +@@ -136,7 +136,7 @@ namespace Ekiga + /** This signal is emitted when a Ekiga::AudioInputManager has been + * added to the AudioInputCore Service. + */ +- boost::signal1<void, AudioInputManager &> manager_added; ++ boost::signals2::signal<void(AudioInputManager &)> manager_added; + + + /*** AudioInput Device Management ***/ +@@ -254,23 +254,23 @@ namespace Ekiga + + /** See audioinput-manager.h for the API + */ +- boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputSettings&> device_opened; +- boost::signal2<void, AudioInputManager &, AudioInputDevice &> device_closed; +- boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes> device_error; ++ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputSettings&)> device_opened; ++ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &)> device_closed; ++ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes)> device_error; + + /** This signal is emitted when an audio device input has been added to the system. + * This signal will be emitted if add_device was called with a device name and + * a manager claimed support for this device. + * @param device the audio input device that was added. + */ +- boost::signal2<void, AudioInputDevice, bool> device_added; ++ boost::signals2::signal<void(AudioInputDevice, bool)> device_added; + + /** This signal is emitted when an audio input device has been removed from the system. + * This signal will be emitted if remove_device was called with a device name and + * a manager claimed support for this device. + * @param device the audio input device that was removed. + */ +- boost::signal2<void, AudioInputDevice, bool> device_removed; ++ boost::signals2::signal<void(AudioInputDevice, bool)> device_removed; + + private: + void on_set_device (const AudioInputDevice & device); +--- lib/engine/audioinput/audioinput-manager.h.orig 2012-11-07 20:43:51 UTC ++++ lib/engine/audioinput/audioinput-manager.h +@@ -39,7 +39,7 @@ + #define __AUDIOINPUT_MANAGER_H__ + + #include <vector> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include "audioinput-info.h" +@@ -148,18 +148,18 @@ namespace Ekiga + * @param device the audio input device that was opened. + * @param config the current audio input device configuration (current volume, etc.). + */ +- boost::signal2<void, AudioInputDevice, AudioInputSettings> device_opened; ++ boost::signals2::signal<void(AudioInputDevice, AudioInputSettings)> device_opened; + + /** This signal is emitted when an audio input device is closed. + * @param device the audio input device that was closed. + */ +- boost::signal1<void, AudioInputDevice> device_closed; ++ boost::signals2::signal<void(AudioInputDevice)> device_closed; + + /** This signal is emitted when an error occurs when opening a audio input device. + * @param device the audio input device that caused the error. + * @param error_code the audio input device error code. + */ +- boost::signal2<void, AudioInputDevice, AudioInputErrorCodes> device_error; ++ boost::signals2::signal<void(AudioInputDevice, AudioInputErrorCodes)> device_error; + + + protected: +--- lib/engine/audiooutput/audiooutput-core.h.orig 2013-02-18 21:37:04 UTC ++++ lib/engine/audiooutput/audiooutput-core.h +@@ -128,7 +128,7 @@ namespace Ekiga + /** This signal is emitted when a Ekiga::AudioOutputManager has been + * added to the AudioOutputCore Service. + */ +- boost::signal1<void, AudioOutputManager &> manager_added; ++ boost::signals2::signal<void(AudioOutputManager &)> manager_added; + + + /** Get a list of all devices supported by all managers registered to the core. +@@ -299,23 +299,23 @@ namespace Ekiga + + /** See audiooutput-manager.h for the API + */ +- boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&> device_opened; +- boost::signal3<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&> device_closed; +- boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes> device_error; ++ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&)> device_opened; ++ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&)> device_closed; ++ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes)> device_error; + + /** This signal is emitted when an audio output device has been added to the system. + * This signal will be emitted if add_device was called with a device name and + * a manager claimed support for this device. + * @param device the audio output device that was added. + */ +- boost::signal2<void, AudioOutputDevice, bool> device_added; ++ boost::signals2::signal<void(AudioOutputDevice, bool)> device_added; + + /** This signal is emitted when an audio output device has been removed from the system. + * This signal will be emitted if remove_device was called with a device name and + * a manager claimed support for this device. + * @param device the audio output device that was removed. + */ +- boost::signal2<void, AudioOutputDevice, bool> device_removed; ++ boost::signals2::signal<void(AudioOutputDevice, bool)> device_removed; + + private: + void on_set_device (const AudioOutputDevice & device); +--- lib/engine/audiooutput/audiooutput-manager.h.orig 2012-11-07 20:43:51 UTC ++++ lib/engine/audiooutput/audiooutput-manager.h +@@ -39,7 +39,7 @@ + #define __AUDIOOUTPUT_MANAGER_H__ + + #include <vector> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include "audiooutput-info.h" +@@ -152,20 +152,20 @@ namespace Ekiga + * @param device the audio output device that was opened. + * @param config the current audio output device configuration (current volume, etc.). + */ +- boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputSettings> device_opened; ++ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputSettings)> device_opened; + + /** This signal is emitted when an audio output device is closed. + * @param prim whether the primary or secondary audio output device was closed. + * @param device the audio output device that was closed. + */ +- boost::signal2<void, AudioOutputPS, AudioOutputDevice> device_closed; ++ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice)> device_closed; + + /** This signal is emitted when an error occurs when opening an audio output device. + * @param prim whether the primary or secondary audio output device caused the error. + * @param device the audio output device that caused the error. + * @param error_code the audio output device error code. + */ +- boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes> device_error; ++ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes)> device_error; + + protected: + typedef struct ManagerState { +--- lib/engine/chat/chat-core.h.orig 2012-11-07 20:43:51 UTC ++++ lib/engine/chat/chat-core.h +@@ -100,7 +100,7 @@ namespace Ekiga + /** This signal is emitted when an Ekiga::Dialect has been added to + * the ChatCore service. + */ +- boost::signal1<void, DialectPtr > dialect_added; ++ boost::signals2::signal<void(DialectPtr)> dialect_added; + + private: + +@@ -116,7 +116,7 @@ namespace Ekiga + + /** This signal is emitted when the ChatCore service has been updated. + */ +- boost::signal0<void> updated; ++ boost::signals2::signal<void(void)> updated; + + /** This chain allows the ChatCore to present forms to the user + */ +--- lib/engine/chat/chat.h.orig 2012-11-07 20:43:51 UTC ++++ lib/engine/chat/chat.h +@@ -37,7 +37,7 @@ + #define __CHAT_H__ + + #include <string> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include <boost/smart_ptr.hpp> +@@ -113,15 +113,15 @@ namespace Ekiga + + /** This signal is emitted when the Chat has been updated. + */ +- boost::signal0<void> updated; ++ boost::signals2::signal<void(void)> updated; + + /** This signal is emitted when the user requested to see this Chat + */ +- boost::signal0<void> user_requested; ++ boost::signals2::signal<void(void)> user_requested; + + /** This signal is emitted when the Chat has been removed. + */ +- boost::signal0<void> removed; ++ boost::signals2::signal<void(void)> removed; + + /** Feed possible actions on this Chat to the given MenuBuilder + * @param A MenuBuilder object to populate. +--- lib/engine/chat/dialect-impl.h.orig 2013-02-18 21:36:51 UTC ++++ lib/engine/chat/dialect-impl.h +@@ -47,7 +47,7 @@ namespace Ekiga + typename MultipleChatType = MultipleChat> + class DialectImpl: + public Dialect, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +@@ -75,10 +75,10 @@ namespace Ekiga + + /* More STL-like ways to access the chats within this Ekiga::DialectImpl + */ +- typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_iterator; +- typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_const_iterator; +- typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_iterator; +- typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_const_iterator; ++ typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_iterator; ++ typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_const_iterator; ++ typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_iterator; ++ typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_const_iterator; + + simple_iterator simple_begin (); + simple_iterator simple_end (); +@@ -116,8 +116,8 @@ namespace Ekiga + + private: + +- std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > simple_chats; +- std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > multiple_chats; ++ std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > simple_chats; ++ std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > multiple_chats; + + void on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat); + +@@ -133,22 +133,22 @@ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>:: + template<typename SimpleChatType, typename MultipleChatType> + Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::~DialectImpl () + { +- for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::iterator iter = simple_chats.begin (); ++ for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::iterator iter = simple_chats.begin (); + iter != simple_chats.end (); + iter++) { + +- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin (); ++ for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin (); + conn_iter != iter->second.end (); + ++conn_iter) { + + conn_iter->disconnect (); + } + } +- for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::iterator iter = multiple_chats.begin (); ++ for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::iterator iter = multiple_chats.begin (); + iter != multiple_chats.end (); + iter++) { + +- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin (); ++ for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin (); + conn_iter != iter->second.end (); + ++conn_iter) { + +@@ -163,7 +163,7 @@ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>:: + { + bool go_on = true; + +- for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::const_iterator iter = simple_chats.begin (); ++ for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = simple_chats.begin (); + go_on && iter != simple_chats.end (); + iter++) { + +@@ -177,7 +177,7 @@ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>:: + { + bool go_on = true; + +- for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::const_iterator iter = multiple_chats.begin (); ++ for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = multiple_chats.begin (); + go_on && iter != multiple_chats.end (); + iter++) { + +@@ -275,7 +275,7 @@ template<typename SimpleChatType, typename MultipleCha + void + Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat) + { +- for (typename std::list<boost::signals::connection>::iterator iter = simple_chats[chat].begin (); ++ for (typename std::list<boost::signals2::connection>::iterator iter = simple_chats[chat].begin (); + iter != simple_chats[chat].end (); + ++iter) { + +@@ -288,7 +288,7 @@ template<typename SimpleChatType, typename MultipleCha + void + Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_multiple_chat_removed (boost::shared_ptr<MultipleChatType> chat) + { +- for (typename std::list<boost::signals::connection>::iterator iter = multiple_chats[chat].begin (); ++ for (typename std::list<boost::signals2::connection>::iterator iter = multiple_chats[chat].begin (); + iter != multiple_chats[chat].end (); + ++iter) { + +--- lib/engine/chat/dialect.h.orig 2012-11-07 20:43:51 UTC ++++ lib/engine/chat/dialect.h +@@ -72,12 +72,12 @@ namespace Ekiga + /** This signal is emitted when an Ekiga::SimpleChat has been added to + * the dialect. + */ +- boost::signal1<void, SimpleChatPtr> simple_chat_added; ++ boost::signals2::signal<void(SimpleChatPtr)> simple_chat_added; + + /** This signal is emitted when an Ekiga::MultipleChat has been added to + * the dialect. + */ +- boost::signal1<void, MultipleChatPtr> multiple_chat_added; ++ boost::signals2::signal<void(MultipleChatPtr)> multiple_chat_added; + + /** This chain allows the Dialect to present forms to the user. + */ +--- lib/engine/components/call-history/history-book.h.orig 2013-02-18 21:36:51 UTC ++++ lib/engine/components/call-history/history-book.h +@@ -53,7 +53,7 @@ namespace History + + class Book: + public Ekiga::Book, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +@@ -86,7 +86,7 @@ namespace History + + void clear (); + +- boost::signal0<void> cleared; ++ boost::signals2::signal<void(void)> cleared; + + private: + +--- lib/engine/components/call-history/history-contact.h.orig 2013-02-18 21:36:51 UTC ++++ lib/engine/components/call-history/history-contact.h +@@ -61,7 +61,7 @@ namespace History + + class Contact: + public Ekiga::Contact, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- lib/engine/components/local-roster/local-cluster.h.orig 2013-02-18 21:36:51 UTC ++++ lib/engine/components/local-roster/local-cluster.h +@@ -51,7 +51,7 @@ namespace Local + class Cluster : + public Ekiga::ClusterImpl<Heap>, + public Ekiga::Trigger, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- lib/engine/components/local-roster/local-presentity.h.orig 2013-02-18 21:36:51 UTC ++++ lib/engine/components/local-roster/local-presentity.h +@@ -162,7 +162,7 @@ namespace Local + * This signal makes the Local::Heap know that the XML tree changed + * and hence should be saved + */ +- boost::signal0<void> trigger_saving; ++ boost::signals2::signal<void(void)> trigger_saving; + + + private: +--- lib/engine/components/opal/opal-account.h.orig 2013-02-18 21:37:04 UTC ++++ lib/engine/components/opal/opal-account.h +@@ -153,7 +153,7 @@ namespace Opal (public) + + const std::string as_string () const; + +- boost::signal0<void> trigger_saving; ++ boost::signals2::signal<void(void)> trigger_saving; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810270052.w9R0qB0H011535>