From 1bc65972efc1145645e6f77f8778b2a38ef7cafb Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Tue, 21 Jun 2022 12:54:59 +0200 Subject: cleanup: Remove expired ports: 2022-06-20 net-im/licq: Abandonware, project is dead Remove these ports too which were part of net-im/licq: - net-im/licq-icq - net-im/licq-jabber - net-im/licq-osd - net-im/licq-qt-gui --- net-im/Makefile | 5 - net-im/licq-icq/Makefile | 36 - net-im/licq-icq/distinfo | 3 - net-im/licq-icq/pkg-descr | 5 - net-im/licq-jabber/Makefile | 39 -- net-im/licq-jabber/distinfo | 3 - net-im/licq-jabber/pkg-descr | 6 - net-im/licq-osd/Makefile | 32 - net-im/licq-osd/distinfo | 3 - net-im/licq-osd/files/patch-licq_osd.conf.h | 11 - net-im/licq-osd/pkg-descr | 9 - net-im/licq-osd/pkg-message | 14 - net-im/licq-qt-gui/Makefile | 42 -- net-im/licq-qt-gui/distinfo | 3 - net-im/licq-qt-gui/files/patch-contactuserdata.h | 11 - net-im/licq-qt-gui/files/patch-plugin.cpp | 10 - net-im/licq-qt-gui/files/patch-usereventcommon.h | 11 - net-im/licq-qt-gui/pkg-descr | 5 - net-im/licq-qt-gui/pkg-message | 8 - net-im/licq-qt-gui/pkg-plist | 738 --------------------- net-im/licq/Makefile | 57 -- net-im/licq/distinfo | 3 - ...ch-3rdparty_gmock_include_gmock_gmock-actions.h | 92 --- ...party_gmock_include_gmock_gmock-spec-builders.h | 183 ----- ...k_include_gmock_internal_gmock-internal-utils.h | 38 -- ...patch-3rdparty_gmock_src_gmock-spec-builders.cc | 29 - ...party_gtest_include_gtest_internal_gtest-port.h | 34 - net-im/licq/files/patch-filetransfer.h | 10 - net-im/licq/files/patch-licq.cpp | 52 -- net-im/licq/files/patch-main.cpp | 10 - net-im/licq/pkg-descr | 7 - net-im/licq/pkg-message | 9 - net-im/licq/pkg-plist | 130 ---- 33 files changed, 1648 deletions(-) delete mode 100644 net-im/licq-icq/Makefile delete mode 100644 net-im/licq-icq/distinfo delete mode 100644 net-im/licq-icq/pkg-descr delete mode 100644 net-im/licq-jabber/Makefile delete mode 100644 net-im/licq-jabber/distinfo delete mode 100644 net-im/licq-jabber/pkg-descr delete mode 100644 net-im/licq-osd/Makefile delete mode 100644 net-im/licq-osd/distinfo delete mode 100644 net-im/licq-osd/files/patch-licq_osd.conf.h delete mode 100644 net-im/licq-osd/pkg-descr delete mode 100644 net-im/licq-osd/pkg-message delete mode 100644 net-im/licq-qt-gui/Makefile delete mode 100644 net-im/licq-qt-gui/distinfo delete mode 100644 net-im/licq-qt-gui/files/patch-contactuserdata.h delete mode 100644 net-im/licq-qt-gui/files/patch-plugin.cpp delete mode 100644 net-im/licq-qt-gui/files/patch-usereventcommon.h delete mode 100644 net-im/licq-qt-gui/pkg-descr delete mode 100644 net-im/licq-qt-gui/pkg-message delete mode 100644 net-im/licq-qt-gui/pkg-plist delete mode 100644 net-im/licq/Makefile delete mode 100644 net-im/licq/distinfo delete mode 100644 net-im/licq/files/patch-3rdparty_gmock_include_gmock_gmock-actions.h delete mode 100644 net-im/licq/files/patch-3rdparty_gmock_include_gmock_gmock-spec-builders.h delete mode 100644 net-im/licq/files/patch-3rdparty_gmock_include_gmock_internal_gmock-internal-utils.h delete mode 100644 net-im/licq/files/patch-3rdparty_gmock_src_gmock-spec-builders.cc delete mode 100644 net-im/licq/files/patch-3rdparty_gtest_include_gtest_internal_gtest-port.h delete mode 100644 net-im/licq/files/patch-filetransfer.h delete mode 100644 net-im/licq/files/patch-licq.cpp delete mode 100644 net-im/licq/files/patch-main.cpp delete mode 100644 net-im/licq/pkg-descr delete mode 100644 net-im/licq/pkg-message delete mode 100644 net-im/licq/pkg-plist (limited to 'net-im') diff --git a/net-im/Makefile b/net-im/Makefile index 55a1cf6205bb..890f22c7db1e 100644 --- a/net-im/Makefile +++ b/net-im/Makefile @@ -65,11 +65,6 @@ SUBDIR += libsignal-client SUBDIR += libsignon-glib SUBDIR += libstrophe - SUBDIR += licq - SUBDIR += licq-icq - SUBDIR += licq-jabber - SUBDIR += licq-osd - SUBDIR += licq-qt-gui SUBDIR += loudmouth SUBDIR += matterbridge SUBDIR += matterhorn diff --git a/net-im/licq-icq/Makefile b/net-im/licq-icq/Makefile deleted file mode 100644 index 4a719a6c7c89..000000000000 --- a/net-im/licq-icq/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -PORTNAME= icq -PORTVERSION= 1.9.0 -PORTREVISION= 4 -CATEGORIES= net-im -PKGNAMEPREFIX= licq- - -MAINTAINER= ports@FreeBSD.org -COMMENT= ICQ plugin for Licq - -LICENSE= GPLv2 - -BUILD_DEPENDS= licq:${LICQ_PORT} -LIB_DEPENDS= libboost_regex.so:devel/boost-libs -RUN_DEPENDS= licq:${LICQ_PORT} - -USES= cmake -DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} -USE_GITHUB= yes -GH_ACCOUNT= licq-im -GH_PROJECT= licq -GH_TAGNAME= f271d55 -WRKSRC_SUBDIR= ${PORTNAME} - -DOCFILES= README -PLIST_FILES= lib/licq/protocol_icq.so \ - %%PORTDOCS%%%%DOCSDIR%%/README - -LICQ_PORT?= net-im/licq - -OPTIONS_DEFINE= DOCS - -do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ - -.include diff --git a/net-im/licq-icq/distinfo b/net-im/licq-icq/distinfo deleted file mode 100644 index 1068c0b0220f..000000000000 --- a/net-im/licq-icq/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1546802962 -SHA256 (licq-im-licq-1.9.0-f271d55_GH0.tar.gz) = 0b6eb164b0faa31773c2b06096c7a3002d0054b198caa5ae5a703964c78fc641 -SIZE (licq-im-licq-1.9.0-f271d55_GH0.tar.gz) = 2921027 diff --git a/net-im/licq-icq/pkg-descr b/net-im/licq-icq/pkg-descr deleted file mode 100644 index 5334fdf1d8ce..000000000000 --- a/net-im/licq-icq/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Adds support for the ICQ protocol to Licq. - -LICENSE: GPL2 or later - -WWW: http://www.licq.org/ diff --git a/net-im/licq-jabber/Makefile b/net-im/licq-jabber/Makefile deleted file mode 100644 index 1e22f623208e..000000000000 --- a/net-im/licq-jabber/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -PORTNAME= jabber -PORTVERSION= 1.9.0 -PORTREVISION= 5 -CATEGORIES= net-im -PKGNAMEPREFIX= licq- - -MAINTAINER= ports@FreeBSD.org -COMMENT= Jabber (XMPP) plugin for Licq - -LICENSE= GPLv2 - -BUILD_DEPENDS= licq:${LICQ_PORT} -LIB_DEPENDS= libgloox.so:net-im/gloox \ - libboost_regex.so:devel/boost-libs \ - libidn.so:dns/libidn \ - libgnutls.so:security/gnutls -RUN_DEPENDS= licq:${LICQ_PORT} - -USES= cmake pkgconfig -DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} - -DOCFILES= README -PLIST_FILES= lib/licq/protocol_jabber.so \ - %%PORTDOCS%%%%DOCSDIR%%/README -USE_GITHUB= yes -GH_ACCOUNT= licq-im -GH_PROJECT= licq -GH_TAGNAME= f271d55 -WRKSRC_SUBDIR= ${PORTNAME} - -LICQ_PORT?= net-im/licq - -OPTIONS_DEFINE= DOCS - -do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ - -.include diff --git a/net-im/licq-jabber/distinfo b/net-im/licq-jabber/distinfo deleted file mode 100644 index c23a3bf7e202..000000000000 --- a/net-im/licq-jabber/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1546803399 -SHA256 (licq-im-licq-1.9.0-f271d55_GH0.tar.gz) = 0b6eb164b0faa31773c2b06096c7a3002d0054b198caa5ae5a703964c78fc641 -SIZE (licq-im-licq-1.9.0-f271d55_GH0.tar.gz) = 2921027 diff --git a/net-im/licq-jabber/pkg-descr b/net-im/licq-jabber/pkg-descr deleted file mode 100644 index dc531a99507a..000000000000 --- a/net-im/licq-jabber/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Adds support for the Jabber (XMPP) protocol to Licq. Still in early -development, but capable of sending and receiving messages. - -LICENSE: GPL2 or later with execption to link with OpenSSL - -WWW: http://www.licq.org/ diff --git a/net-im/licq-osd/Makefile b/net-im/licq-osd/Makefile deleted file mode 100644 index 8dc3b87688f9..000000000000 --- a/net-im/licq-osd/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Created by: nm@web.am - -PORTNAME= osd -PORTVERSION= 1.9.0 -PORTREVISION= 5 -PORTEPOCH= 2 -CATEGORIES= net-im -PKGNAMEPREFIX= licq- - -MAINTAINER= ports@FreeBSD.org -COMMENT= OnScreenDisplay messages in licq - -BUILD_DEPENDS= licq:${LICQ_PORT} -LIB_DEPENDS= libxosd.so:misc/xosd \ - libboost_regex.so:devel/boost-libs -RUN_DEPENDS= licq:${LICQ_PORT} \ - ${LOCALBASE}/lib/licq/licq_qt-gui.so:${LICQ_PORT}-qt-gui - -USES= cmake gettext-tools iconv -USE_GITHUB= yes -GH_ACCOUNT= licq-im -GH_PROJECT= licq -GH_TAGNAME= f271d55 -WRKSRC_SUBDIR= ${PORTNAME} - -LOCALES= be de cs es fr pt pt_BR ro ru sv sk tr -PLIST_FILES= lib/licq/licq_osd.so \ - ${LOCALES:C+^.*$+share/locale/&/LC_MESSAGES/licq_osd_plugin.mo+} - -LICQ_PORT?= net-im/licq - -.include diff --git a/net-im/licq-osd/distinfo b/net-im/licq-osd/distinfo deleted file mode 100644 index b3ce16116075..000000000000 --- a/net-im/licq-osd/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1546803703 -SHA256 (licq-im-licq-1.9.0-f271d55_GH0.tar.gz) = 0b6eb164b0faa31773c2b06096c7a3002d0054b198caa5ae5a703964c78fc641 -SIZE (licq-im-licq-1.9.0-f271d55_GH0.tar.gz) = 2921027 diff --git a/net-im/licq-osd/files/patch-licq_osd.conf.h b/net-im/licq-osd/files/patch-licq_osd.conf.h deleted file mode 100644 index 536d83d1f4da..000000000000 --- a/net-im/licq-osd/files/patch-licq_osd.conf.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/licq_osd.conf.h.orig Mon Mar 7 19:24:09 2005 -+++ src/licq_osd.conf.h Mon Mar 7 19:27:17 2005 -@@ -4,7 +4,7 @@ - "# you can get the available fonts for your machine from xfontsel\n" - "# i prefer this one - but it is not available everywhere\n" - "# Font=-*-lucida-*-r-*-*-24-*-*-*-*-*-iso8859-15\n" --"Font=-*-*-*-*-*-*-24-*-*-*-*-*-*-*\n" -+"Font=-*-lucida-*-*-*-*-24-*-*-*-*-*-iso8859-15\n" - "\n" - "# how long should a message be displayed\n" - "Timeout=5\n" diff --git a/net-im/licq-osd/pkg-descr b/net-im/licq-osd/pkg-descr deleted file mode 100644 index d60d604e54c1..000000000000 --- a/net-im/licq-osd/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -This is a small licq-plugin, which uses libxosd2 to display new arriving -messages as OSD (On Screen Display) text on your desktop. I wrote this, as I -saw this feature in sim and wanted to have the same functionality in licq. - -Martin Maurer, martinmaurer@gmx.at - -LICENSE: GPL2 or later with execption to link with OpenSSL - -WWW: https://sourceforge.net/projects/licq-osd/ diff --git a/net-im/licq-osd/pkg-message b/net-im/licq-osd/pkg-message deleted file mode 100644 index 42f2e3003180..000000000000 --- a/net-im/licq-osd/pkg-message +++ /dev/null @@ -1,14 +0,0 @@ -[ -{ type: install - message: < - -PORTNAME= qt-gui -PORTVERSION= 1.9.0 -PORTREVISION= 7 -CATEGORIES= net-im -PKGNAMEPREFIX= licq- -PKGNAMESUFFIX?= ${KDE_SUFFIX}${PKGNAMESUFFIX2} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Qt plugin for licq - -LICENSE= GPLv2 - -BUILD_DEPENDS= licq:${LICQ_PORT} -LIB_DEPENDS= libboost_regex.so:devel/boost-libs -RUN_DEPENDS= licq:${LICQ_PORT} \ - ${LOCALBASE}/lib/licq/protocol_icq.so:${LICQ_PORT}-icq - -USES= cmake qt:5 xorg -USE_XORG= x11 xext ice xscrnsaver sm -USE_QT= buildtools_build qmake_build linguisttools_build core \ - xml gui network dbus svg widgets -USE_GITHUB= yes -GH_ACCOUNT= licq-im -GH_PROJECT= licq -GH_TAGNAME= f271d55 -WRKSRC_SUBDIR= ${PORTNAME} -CMAKE_ARGS+= -DWITH_QT5:BOOL=ON - -OPTIONS_DEFINE= HUNSPELL -OPTIONS_DEFAULT=HUNSPELL - -LICQ_PORT?= net-im/licq - -HUNSPELL_LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell -HUNSPELL_CMAKE_ON= -DHUNSPELL_INCLUDE_DIRS=${LOCALBASE}/include/hunspell \ - -DHUNSPELL_LIBRARIES=${LOCALBASE}/lib/libhunspell-1.7.so \ - -DHUNSPELL_FOUND:BOOL=ON -HUNSPELL_CMAKE_OFF= -DHUNSPELL_FOUND:BOOL=OFF - -.include diff --git a/net-im/licq-qt-gui/distinfo b/net-im/licq-qt-gui/distinfo deleted file mode 100644 index cc8d85366aaa..000000000000 --- a/net-im/licq-qt-gui/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1546800004 -SHA256 (licq-im-licq-1.9.0-f271d55_GH0.tar.gz) = 0b6eb164b0faa31773c2b06096c7a3002d0054b198caa5ae5a703964c78fc641 -SIZE (licq-im-licq-1.9.0-f271d55_GH0.tar.gz) = 2921027 diff --git a/net-im/licq-qt-gui/files/patch-contactuserdata.h b/net-im/licq-qt-gui/files/patch-contactuserdata.h deleted file mode 100644 index fd4c2238309a..000000000000 --- a/net-im/licq-qt-gui/files/patch-contactuserdata.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/contactlist/contactuserdata.h.orig 2014-06-01 19:16:42 UTC -+++ src/contactlist/contactuserdata.h -@@ -20,6 +20,8 @@ - #ifndef CONTACTUSERDATA_H - #define CONTACTUSERDATA_H - -+#include -+ - #include - #include - #include diff --git a/net-im/licq-qt-gui/files/patch-plugin.cpp b/net-im/licq-qt-gui/files/patch-plugin.cpp deleted file mode 100644 index 60396e4990fd..000000000000 --- a/net-im/licq-qt-gui/files/patch-plugin.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/core/plugin.cpp.orig 2014-06-01 19:16:42 UTC -+++ src/core/plugin.cpp -@@ -31,6 +31,7 @@ - # include - #include - #include -+#include - #else - # include - #endif diff --git a/net-im/licq-qt-gui/files/patch-usereventcommon.h b/net-im/licq-qt-gui/files/patch-usereventcommon.h deleted file mode 100644 index 524a8d7ac972..000000000000 --- a/net-im/licq-qt-gui/files/patch-usereventcommon.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/userevents/usereventcommon.h.orig 2014-06-01 19:16:42 UTC -+++ src/userevents/usereventcommon.h -@@ -20,6 +20,8 @@ - #ifndef USEREVENTCOMMON_H - #define USEREVENTCOMMON_H - -+#include -+ - #include - - #include diff --git a/net-im/licq-qt-gui/pkg-descr b/net-im/licq-qt-gui/pkg-descr deleted file mode 100644 index 66a0f2d4acbf..000000000000 --- a/net-im/licq-qt-gui/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -A qt gui plugin for the popular icq clone licq. - -LICENSE: GPL2 or later with execption to link with OpenSSL - -WWW: http://www.licq.org/ diff --git a/net-im/licq-qt-gui/pkg-message b/net-im/licq-qt-gui/pkg-message deleted file mode 100644 index fed1055d881a..000000000000 --- a/net-im/licq-qt-gui/pkg-message +++ /dev/null @@ -1,8 +0,0 @@ -[ -{ type: install - message: < - -pre-configure: - ${REINPLACE_CMD} -e 's=!/bin/bash=!${LOCALBASE}/bin/bash=' \ - ${WRKSRC}/bin/sidclean.sh - -post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/licq - ${INSTALL_SCRIPT} ${WRKSRC}/bin/sidclean.sh ${STAGEDIR}${PREFIX}/bin/sidclean.bash - -.include diff --git a/net-im/licq/distinfo b/net-im/licq/distinfo deleted file mode 100644 index f7be501b1331..000000000000 --- a/net-im/licq/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1546802369 -SHA256 (licq-im-licq-1.9.0-f271d55_GH0.tar.gz) = 0b6eb164b0faa31773c2b06096c7a3002d0054b198caa5ae5a703964c78fc641 -SIZE (licq-im-licq-1.9.0-f271d55_GH0.tar.gz) = 2921027 diff --git a/net-im/licq/files/patch-3rdparty_gmock_include_gmock_gmock-actions.h b/net-im/licq/files/patch-3rdparty_gmock_include_gmock_gmock-actions.h deleted file mode 100644 index bf13ef99eafa..000000000000 --- a/net-im/licq/files/patch-3rdparty_gmock_include_gmock_gmock-actions.h +++ /dev/null @@ -1,92 +0,0 @@ ---- 3rdparty/gmock/include/gmock/gmock-actions.h.orig 2014-10-22 20:07:20 UTC -+++ 3rdparty/gmock/include/gmock/gmock-actions.h -@@ -163,18 +163,27 @@ class DefaultValue { - // Sets the default value for type T; requires T to be - // copy-constructable and have a public destructor. - static void Set(T x) { -- delete value_; -- value_ = new T(x); -+ delete producer_; -+ producer_ = new FixedValueProducer(x); - } - -+ // Provides a factory function to be called to generate the default value. -+ // This method can be used even if T is only move-constructible, but it is not -+ // limited to that case. -+ typedef T (*FactoryFunction)(); -+ static void SetFactory(FactoryFunction factory) { -+ delete producer_; -+ producer_ = new FactoryValueProducer(factory); -+ } -+ - // Unsets the default value for type T. - static void Clear() { -- delete value_; -- value_ = NULL; -+ delete producer_; -+ producer_ = NULL; - } - - // Returns true iff the user has set the default value for type T. -- static bool IsSet() { return value_ != NULL; } -+ static bool IsSet() { return producer_ != NULL; } - - // Returns true if T has a default return value set by the user or there - // exists a built-in default value. -@@ -183,15 +192,42 @@ class DefaultValue { - } - - // Returns the default value for type T if the user has set one; -- // otherwise returns the built-in default value if there is one; -- // otherwise aborts the process. -+ // otherwise returns the built-in default value. Requires that Exists() -+ // is true, which ensures that the return value is well-defined. - static T Get() { -- return value_ == NULL ? -- internal::BuiltInDefaultValue::Get() : *value_; -+ return producer_ == NULL ? -+ internal::BuiltInDefaultValue::Get() : producer_->Produce(); - } - - private: -- static const T* value_; -+ class ValueProducer { -+ public: -+ virtual ~ValueProducer() {} -+ virtual T Produce() = 0; -+ }; -+ -+ class FixedValueProducer : public ValueProducer { -+ public: -+ explicit FixedValueProducer(T value) : value_(value) {} -+ virtual T Produce() { return value_; } -+ -+ private: -+ const T value_; -+ GTEST_DISALLOW_COPY_AND_ASSIGN_(FixedValueProducer); -+ }; -+ -+ class FactoryValueProducer : public ValueProducer { -+ public: -+ explicit FactoryValueProducer(FactoryFunction factory) -+ : factory_(factory) {} -+ virtual T Produce() { return factory_(); } -+ -+ private: -+ const FactoryFunction factory_; -+ GTEST_DISALLOW_COPY_AND_ASSIGN_(FactoryValueProducer); -+ }; -+ -+ static ValueProducer* producer_; - }; - - // This partial specialization allows a user to set default values for -@@ -241,7 +277,7 @@ class DefaultValue { - - // Points to the user-set default value for type T. - template --const T* DefaultValue::value_ = NULL; -+typename DefaultValue::ValueProducer* DefaultValue::producer_ = NULL; - - // Points to the user-set default value for type T&. - template diff --git a/net-im/licq/files/patch-3rdparty_gmock_include_gmock_gmock-spec-builders.h b/net-im/licq/files/patch-3rdparty_gmock_include_gmock_gmock-spec-builders.h deleted file mode 100644 index 7a89bd91a857..000000000000 --- a/net-im/licq/files/patch-3rdparty_gmock_include_gmock_gmock-spec-builders.h +++ /dev/null @@ -1,183 +0,0 @@ ---- 3rdparty/gmock/include/gmock/gmock-spec-builders.h.orig 2014-10-22 20:07:20 UTC -+++ 3rdparty/gmock/include/gmock/gmock-spec-builders.h -@@ -211,7 +211,7 @@ class GTEST_API_ UntypedFunctionMockerBase { - // arguments. This function can be safely called from multiple - // threads concurrently. The caller is responsible for deleting the - // result. -- const UntypedActionResultHolderBase* UntypedInvokeWith( -+ UntypedActionResultHolderBase* UntypedInvokeWith( - const void* untyped_args) - GTEST_LOCK_EXCLUDED_(g_gmock_mutex); - -@@ -1289,6 +1289,58 @@ class MockSpec { - GTEST_DISALLOW_ASSIGN_(MockSpec); - }; // class MockSpec - -+// Wrapper type for generically holding an ordinary value or lvalue reference. -+// If T is not a reference type, it must be copyable or movable. -+// ReferenceOrValueWrapper is movable, and will also be copyable unless -+// T is a move-only value type (which means that it will always be copyable -+// if the current platform does not support move semantics). -+// -+// The primary template defines handling for values, but function header -+// comments describe the contract for the whole template (including -+// specializations). -+template -+class ReferenceOrValueWrapper { -+ public: -+ // Constructs a wrapper from the given value/reference. -+ explicit ReferenceOrValueWrapper(T value) -+ : value_(GTEST_MOVE_(value)) {} -+ -+ // Unwraps and returns the underlying value/reference, exactly as -+ // originally passed. The behavior of calling this more than once on -+ // the same object is unspecified. -+ T Unwrap() { -+ return GTEST_MOVE_(value_); -+ } -+ -+ // Provides nondestructive access to the underlying value/reference. -+ // Always returns a const reference (more precisely, -+ // const RemoveReference&). The behavior of calling this after -+ // calling Unwrap on the same object is unspecified. -+ const T& Peek() const { -+ return value_; -+ } -+ -+ private: -+ T value_; -+}; -+ -+// Specialization for lvalue reference types. See primary template -+// for documentation. -+template -+class ReferenceOrValueWrapper { -+ public: -+ // Workaround for debatable pass-by-reference lint warning (c-library-team -+ // policy precludes NOLINT in this context) -+ typedef T& reference; -+ explicit ReferenceOrValueWrapper(reference ref) -+ : value_ptr_(&ref) {} -+ T& Unwrap() { return *value_ptr_; } -+ const T& Peek() const { return *value_ptr_; } -+ -+ private: -+ T* value_ptr_; -+}; -+ - // MSVC warns about using 'this' in base member initializer list, so - // we need to temporarily disable the warning. We have to do it for - // the entire class to suppress the warning, even though it's about -@@ -1320,23 +1372,16 @@ class UntypedActionResultHolderBase { - template - class ActionResultHolder : public UntypedActionResultHolderBase { - public: -- explicit ActionResultHolder(T a_value) : value_(a_value) {} -- -- // The compiler-generated copy constructor and assignment operator -- // are exactly what we need, so we don't need to define them. -- -- // Returns the held value and deletes this object. -- T GetValueAndDelete() const { -- T retval(value_); -- delete this; -- return retval; -+ // Returns the held value. Must not be called more than once. -+ T Unwrap() { -+ return result_.Unwrap(); - } - - // Prints the held value as an action's result to os. - virtual void PrintAsActionResult(::std::ostream* os) const { - *os << "\n Returns: "; - // T may be a reference type, so we don't use UniversalPrint(). -- UniversalPrinter::Print(value_, os); -+ UniversalPrinter::Print(result_.Peek(), os); - } - - // Performs the given mock function's default action and returns the -@@ -1346,8 +1391,8 @@ class ActionResultHolder : public UntypedActionResultH - const FunctionMockerBase* func_mocker, - const typename Function::ArgumentTuple& args, - const string& call_description) { -- return new ActionResultHolder( -- func_mocker->PerformDefaultAction(args, call_description)); -+ return new ActionResultHolder(Wrapper( -+ func_mocker->PerformDefaultAction(args, call_description))); - } - - // Performs the given action and returns the result in a new-ed -@@ -1356,42 +1401,52 @@ class ActionResultHolder : public UntypedActionResultH - static ActionResultHolder* - PerformAction(const Action& action, - const typename Function::ArgumentTuple& args) { -- return new ActionResultHolder(action.Perform(args)); -+ return new ActionResultHolder(Wrapper(action.Perform(args))); - } - - private: -- T value_; -+ typedef ReferenceOrValueWrapper Wrapper; - -- // T could be a reference type, so = isn't supported. -- GTEST_DISALLOW_ASSIGN_(ActionResultHolder); -+ explicit ActionResultHolder(Wrapper result) -+ : result_(GTEST_MOVE_(result)) {} -+ -+ Wrapper result_; -+ -+ GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder); - }; - - // Specialization for T = void. - template <> - class ActionResultHolder : public UntypedActionResultHolderBase { - public: -- void GetValueAndDelete() const { delete this; } -+ void Unwrap() { } - - virtual void PrintAsActionResult(::std::ostream* /* os */) const {} - -- // Performs the given mock function's default action and returns NULL; -+ // Performs the given mock function's default action and returns ownership -+ // of an empty ActionResultHolder*. - template - static ActionResultHolder* PerformDefaultAction( - const FunctionMockerBase* func_mocker, - const typename Function::ArgumentTuple& args, - const string& call_description) { - func_mocker->PerformDefaultAction(args, call_description); -- return NULL; -+ return new ActionResultHolder; - } - -- // Performs the given action and returns NULL. -+ // Performs the given action and returns ownership of an empty -+ // ActionResultHolder*. - template - static ActionResultHolder* PerformAction( - const Action& action, - const typename Function::ArgumentTuple& args) { - action.Perform(args); -- return NULL; -+ return new ActionResultHolder; - } -+ -+ private: -+ ActionResultHolder() {} -+ GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder); - }; - - // The base of the function mocker class for the given function type. -@@ -1526,8 +1581,9 @@ class FunctionMockerBase : public UntypedFunctionMocke - // threads concurrently. - Result InvokeWith(const ArgumentTuple& args) - GTEST_LOCK_EXCLUDED_(g_gmock_mutex) { -- return static_cast( -- this->UntypedInvokeWith(&args))->GetValueAndDelete(); -+ scoped_ptr holder( -+ DownCast_(this->UntypedInvokeWith(&args))); -+ return holder->Unwrap(); - } - - // Adds and returns a default action spec for this mock function. diff --git a/net-im/licq/files/patch-3rdparty_gmock_include_gmock_internal_gmock-internal-utils.h b/net-im/licq/files/patch-3rdparty_gmock_include_gmock_internal_gmock-internal-utils.h deleted file mode 100644 index 5d65f7c9fb05..000000000000 --- a/net-im/licq/files/patch-3rdparty_gmock_include_gmock_internal_gmock-internal-utils.h +++ /dev/null @@ -1,38 +0,0 @@ ---- 3rdparty/gmock/include/gmock/internal/gmock-internal-utils.h.orig 2014-10-22 20:07:20 UTC -+++ 3rdparty/gmock/include/gmock/internal/gmock-internal-utils.h -@@ -361,17 +361,30 @@ template struct DecayArray { - typedef const T* type; - }; - --// Invalid() returns an invalid value of type T. This is useful -+// Disable MSVC warnings for infinite recursion, since in this case the -+// the recursion is unreachable. -+#ifdef _MSC_VER -+# pragma warning(push) -+# pragma warning(disable:4717) -+#endif -+ -+// Invalid() is usable as an expression of type T, but will terminate -+// the program with an assertion failure if actually run. This is useful - // when a value of type T is needed for compilation, but the statement - // will not really be executed (or we don't care if the statement - // crashes). - template - inline T Invalid() { -- return const_cast::type&>( -- *static_cast::type*>(NULL)); -+ Assert(false, "", -1, "Internal error: attempt to return invalid value"); -+ // This statement is unreachable, and would never terminate even if it -+ // could be reached. It is provided only to placate compiler warnings -+ // about missing return statements. -+ return Invalid(); - } --template <> --inline void Invalid() {} -+ -+#ifdef _MSC_VER -+# pragma warning(pop) -+#endif - - // Given a raw type (i.e. having no top-level reference or const - // modifier) RawContainer that's either an STL-style container or a diff --git a/net-im/licq/files/patch-3rdparty_gmock_src_gmock-spec-builders.cc b/net-im/licq/files/patch-3rdparty_gmock_src_gmock-spec-builders.cc deleted file mode 100644 index ce84096cad90..000000000000 --- a/net-im/licq/files/patch-3rdparty_gmock_src_gmock-spec-builders.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- 3rdparty/gmock/src/gmock-spec-builders.cc.orig 2014-10-22 20:07:20 UTC -+++ 3rdparty/gmock/src/gmock-spec-builders.cc -@@ -325,7 +325,7 @@ const char* UntypedFunctionMockerBase::Name() const - // Calculates the result of invoking this mock function with the given - // arguments, prints it, and returns it. The caller is responsible - // for deleting the result. --const UntypedActionResultHolderBase* -+UntypedActionResultHolderBase* - UntypedFunctionMockerBase::UntypedInvokeWith(const void* const untyped_args) - GTEST_LOCK_EXCLUDED_(g_gmock_mutex) { - if (untyped_expectations_.size() == 0) { -@@ -363,7 +363,7 @@ UntypedFunctionMockerBase::UntypedInvokeWith(const voi - this->UntypedDescribeUninterestingCall(untyped_args, &ss); - - // Calculates the function result. -- const UntypedActionResultHolderBase* const result = -+ UntypedActionResultHolderBase* const result = - this->UntypedPerformDefaultAction(untyped_args, ss.str()); - - // Prints the function result. -@@ -410,7 +410,7 @@ UntypedFunctionMockerBase::UntypedInvokeWith(const voi - untyped_expectation->DescribeLocationTo(&loc); - } - -- const UntypedActionResultHolderBase* const result = -+ UntypedActionResultHolderBase* const result = - untyped_action == NULL ? - this->UntypedPerformDefaultAction(untyped_args, ss.str()) : - this->UntypedPerformAction(untyped_action, untyped_args); diff --git a/net-im/licq/files/patch-3rdparty_gtest_include_gtest_internal_gtest-port.h b/net-im/licq/files/patch-3rdparty_gtest_include_gtest_internal_gtest-port.h deleted file mode 100644 index 2c1a502110fc..000000000000 --- a/net-im/licq/files/patch-3rdparty_gtest_include_gtest_internal_gtest-port.h +++ /dev/null @@ -1,34 +0,0 @@ ---- 3rdparty/gtest/include/gtest/internal/gtest-port.h.orig 2014-10-22 20:07:20 UTC -+++ 3rdparty/gtest/include/gtest/internal/gtest-port.h -@@ -141,6 +141,10 @@ - // GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=. - // GTEST_MUST_USE_RESULT_ - declares that a function's result must be used. - // -+// C++11 feature wrappers: -+// -+// GTEST_MOVE_ - portability wrapper for std::move. -+// - // Synchronization: - // Mutex, MutexLock, ThreadLocal, GetThreadCount() - // - synchronization primitives. -@@ -211,6 +215,7 @@ - #include // NOLINT - #include // NOLINT - #include // NOLINT -+#include - - #define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com" - #define GTEST_FLAG_PREFIX_ "gtest_" -@@ -737,6 +742,12 @@ using ::std::tuple_size; - #else - # define GTEST_MUST_USE_RESULT_ - #endif // __GNUC__ && (GTEST_GCC_VER_ >= 30400) && !COMPILER_ICC -+ -+#if GTEST_LANG_CXX11 -+# define GTEST_MOVE_(x) ::std::move(x) // NOLINT -+#else -+# define GTEST_MOVE_(x) x -+#endif - - // Determine whether the compiler supports Microsoft's Structured Exception - // Handling. This is supported by several Windows compilers but generally diff --git a/net-im/licq/files/patch-filetransfer.h b/net-im/licq/files/patch-filetransfer.h deleted file mode 100644 index d4ff21cc1a58..000000000000 --- a/net-im/licq/files/patch-filetransfer.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/licq/icq/filetransfer.h.orig 2014-06-01 19:16:42 UTC -+++ include/licq/icq/filetransfer.h -@@ -73,6 +73,7 @@ - * which case the file will be saved as . - *-------------------------------------------------------------------------*/ - -+#include - #include - #include - #include diff --git a/net-im/licq/files/patch-licq.cpp b/net-im/licq/files/patch-licq.cpp deleted file mode 100644 index 932db2f9e765..000000000000 --- a/net-im/licq/files/patch-licq.cpp +++ /dev/null @@ -1,52 +0,0 @@ ---- src/licq.cpp.orig 2014-06-01 19:16:42 UTC -+++ src/licq.cpp -@@ -89,6 +89,19 @@ using std::string; - extern SSL_CTX *gSSL_CTX; - extern SSL_CTX *gSSL_CTX_NONICQ; - -+# if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100001L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) -+static int -+DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) -+{ -+ dh->p=p; -+ if (q != NULL) -+ dh->q=q; -+ dh->g=g; -+ return 1; /* success */ -+} -+# endif /* !defined() || OPENSSL_VERSION_NUMBER < 0x00907000L */ -+ - // AUTOGENERATED by dhparam - static DH *get_dh512() - { -@@ -104,12 +117,14 @@ static DH *get_dh512() - 0x02, - }; - DH *dh; -+ BIGNUM *dhp_bn, *dhg_bn; -+ - - if ((dh=DH_new()) == NULL) return(NULL); -- dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL); -- dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL); -- if ((dh->p == NULL) || (dh->g == NULL)) -- { DH_free(dh); return(NULL); } -+ dhp_bn = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL); -+ dhg_bn = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL); -+ if ((dhp_bn == NULL) || (dhg_bn == NULL) || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) -+ { DH_free(dh); BN_free(dhp_bn); BN_free(dhg_bn); return(NULL); } - return(dh); - } - -@@ -610,8 +625,8 @@ bool CLicq::Init(int argc, char **argv) - #ifdef USE_OPENSSL - // Initialize SSL - SSL_library_init(); -- gSSL_CTX = SSL_CTX_new(TLSv1_method()); -- gSSL_CTX_NONICQ = SSL_CTX_new(TLSv1_method()); -+ gSSL_CTX = SSL_CTX_new(SSLv23_method()); -+ gSSL_CTX_NONICQ = SSL_CTX_new(SSLv23_method()); - #if OPENSSL_VERSION_NUMBER >= 0x00905000L - SSL_CTX_set_cipher_list(gSSL_CTX, "ADH:@STRENGTH"); - #else diff --git a/net-im/licq/files/patch-main.cpp b/net-im/licq/files/patch-main.cpp deleted file mode 100644 index 23c673667cf0..000000000000 --- a/net-im/licq/files/patch-main.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/main.cpp.orig 2014-06-01 19:16:42 UTC -+++ src/main.cpp -@@ -31,7 +31,6 @@ - - #ifdef USE_SOCKS5 - #define SOCKS --#define INCLUDE_PROTOTYPES - extern "C" { - #include - } diff --git a/net-im/licq/pkg-descr b/net-im/licq/pkg-descr deleted file mode 100644 index f38fe8a606cc..000000000000 --- a/net-im/licq/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -This is an unofficial ICQ clone, written in C++. -It is in no way endorsed by Mirabilis, and now is the most full-featured -ICQ-compatible program with the exception of Java ICQ. - -LICENSE: GPL2 or later with execption to link with OpenSSL - -WWW: http://www.licq.org/ diff --git a/net-im/licq/pkg-message b/net-im/licq/pkg-message deleted file mode 100644 index 95eee5ae55e9..000000000000 --- a/net-im/licq/pkg-message +++ /dev/null @@ -1,9 +0,0 @@ -[ -{ type: install - message: <