mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
- Disable the MSN plugin, as it depends on the deprecated net-im/libmsn
port. [1] - Add patches to fix the build with libc++. With contributions from Schaich Alonso <alonsoschaich@fastmail.fm> for [1]. PR: ports/181985 [1]
This commit is contained in:
Raphael Kubo da Costa
parent
fb3cc90b72
commit
9648f9ea32
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=332698
@ -2,6 +2,7 @@
|
||||
|
||||
PORTNAME= kopete
|
||||
PORTVERSION= ${KDE4_VERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= net-im kde ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_KDE}
|
||||
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
|
||||
@ -14,7 +15,6 @@ COMMENT= KDE multi-protocol instant messenger
|
||||
LIB_DEPENDS= idn.17:${PORTSDIR}/dns/libidn \
|
||||
qca.2:${PORTSDIR}/devel/qca \
|
||||
otr.4:${PORTSDIR}/security/libotr3 \
|
||||
msn.0:${PORTSDIR}/net-im/libmsn \
|
||||
gadu.3:${PORTSDIR}/polish/libgadu \
|
||||
ortp.8:${PORTSDIR}/net/linphone-base \
|
||||
mediastreamer.0:${PORTSDIR}/net/linphone-base \
|
||||
@ -60,6 +60,9 @@ CMAKE_ARGS+= -DWITH_Alsa:BOOL=OFF
|
||||
# Route Mozilla plugin by standard path.
|
||||
CMAKE_ARGS+= -DMOZPLUGIN_INSTALL_DIR:PATH="${WEBPLUGINS_DIR}"
|
||||
|
||||
# Forcefully disable net-im/libmsn which was deprecated on 2013-07-27.
|
||||
CMAKE_ARGS+= -DHAVE_LIBMSN:BOOL=OFF
|
||||
|
||||
# Fix build with fresh multimedia/v4l_compat installed.
|
||||
CFLAGS+= -DHAVE_LINUX_INTEGER_TYPES=1
|
||||
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
Build fix for clang.
|
||||
|
||||
error: unknown type name 'time_t'
|
||||
|
||||
--- kopete/protocols/jabber/googletalk/libjingle/talk/base/diskcache.h
|
||||
++- kopete/protocols/jabber/googletalk/libjingle/talk/base/diskcache.h
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
+#include <time.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#undef UnlockResource
|
||||
@ -0,0 +1,18 @@
|
||||
Build fix for clang.
|
||||
|
||||
error: use of undeclared identifier 'pthread_mutex_lock'
|
||||
error: use of undeclared identifier 'pthread_mutex_unlock'
|
||||
error: use of undeclared identifier 'pthread_self'
|
||||
error: use of undeclared identifier 'pthread_mutex_init'
|
||||
error: use of undeclared identifier 'pthread_mutex_destroy'
|
||||
|
||||
--- kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc.orig 2013-11-04 01:20:09.000000000 +0200
|
||||
+++ kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2013-11-04 01:20:20.000000000 +0200
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
#ifdef POSIX
|
||||
extern "C" {
|
||||
+#include <pthread.h>
|
||||
#include <unistd.h>
|
||||
}
|
||||
#endif
|
||||
98
net-im/kopete-kde4/files/patch-libcxx_support
Normal file
98
net-im/kopete-kde4/files/patch-libcxx_support
Normal file
@ -0,0 +1,98 @@
|
||||
Build fix for clang and libc++.
|
||||
|
||||
stl_decl.h overrides std::vector which is not supposed to be done and does not
|
||||
work with libc++. Using plain std::vector with both libc++ and libstdc++ should
|
||||
be harmless on FreeBSD.
|
||||
|
||||
--- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlbuilder.cc
|
||||
++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlbuilder.cc
|
||||
@@ -25,7 +25,6 @@
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
-#include "talk/base/stl_decl.h"
|
||||
#include <vector>
|
||||
#include <set>
|
||||
#include <expat.h>
|
||||
--- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlbuilder.h
|
||||
++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlbuilder.h
|
||||
@@ -29,8 +29,8 @@
|
||||
#define _xmlbuilder_h_
|
||||
|
||||
#include <string>
|
||||
+#include <vector>
|
||||
#include "talk/base/scoped_ptr.h"
|
||||
-#include "talk/base/stl_decl.h"
|
||||
#include "talk/xmllite/xmlparser.h"
|
||||
|
||||
#include <expat.h>
|
||||
--- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlnsstack.cc
|
||||
++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlnsstack.cc
|
||||
@@ -25,7 +25,6 @@
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
-#include "talk/base/stl_decl.h"
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
--- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlnsstack.h
|
||||
++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlnsstack.h
|
||||
@@ -29,8 +29,8 @@
|
||||
#define _xmlnsstack_h_
|
||||
|
||||
#include <string>
|
||||
+#include <vector>
|
||||
#include "talk/base/scoped_ptr.h"
|
||||
-#include "talk/base/stl_decl.h"
|
||||
#include "talk/xmllite/qname.h"
|
||||
|
||||
namespace buzz {
|
||||
--- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlparser.cc
|
||||
++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlparser.cc
|
||||
@@ -27,7 +27,6 @@
|
||||
|
||||
#include "talk/xmllite/xmlparser.h"
|
||||
|
||||
-#include "talk/base/stl_decl.h"
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
--- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlprinter.cc
|
||||
++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlprinter.cc
|
||||
@@ -25,7 +25,6 @@
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
-#include "talk/base/stl_decl.h"
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
--- kopete/protocols/jabber/googletalk/libjingle/talk/xmpp/xmppengineimpl.h
|
||||
++- kopete/protocols/jabber/googletalk/libjingle/talk/xmpp/xmppengineimpl.h
|
||||
@@ -259,10 +259,10 @@ private:
|
||||
XmppOutputHandler* output_handler_;
|
||||
XmppSessionHandler* session_handler_;
|
||||
|
||||
- typedef STD_VECTOR(XmppStanzaHandler*) StanzaHandlerVector;
|
||||
+ typedef std::vector<XmppStanzaHandler*> StanzaHandlerVector;
|
||||
scoped_ptr<StanzaHandlerVector> stanza_handlers_[HL_COUNT];
|
||||
|
||||
- typedef STD_VECTOR(XmppIqEntry*) IqEntryVector;
|
||||
+ typedef std::vector<XmppIqEntry*> IqEntryVector;
|
||||
scoped_ptr<IqEntryVector> iq_entries_;
|
||||
|
||||
scoped_ptr<SaslHandler> sasl_handler_;
|
||||
--- kopete/protocols/jabber/googletalk/libjingle/talk/xmpp/xmpplogintask.h
|
||||
++- kopete/protocols/jabber/googletalk/libjingle/talk/xmpp/xmpplogintask.h
|
||||
@@ -29,9 +29,9 @@
|
||||
#define _logintask_h_
|
||||
|
||||
#include <string>
|
||||
+#include <vector>
|
||||
#include "talk/base/logging.h"
|
||||
#include "talk/base/scoped_ptr.h"
|
||||
-#include "talk/base/stl_decl.h"
|
||||
#include "talk/xmpp/jid.h"
|
||||
#include "talk/xmpp/xmppengine.h"
|
||||
|
||||
@ -120,7 +120,6 @@ lib/kde4/kopete_texteffect.so
|
||||
lib/kde4/kopete_translator.so
|
||||
lib/kde4/kopete_urlpicpreview.so
|
||||
lib/kde4/kopete_webpresence.so
|
||||
lib/kde4/kopete_wlm.so
|
||||
lib/kde4/kopete_wp.so
|
||||
lib/kde4/kopete_yahoo.so
|
||||
lib/kde4/libchattexteditpart.so
|
||||
@ -256,7 +255,6 @@ share/apps/kopete/icons/oxygen/128x128/apps/qq_protocol.png
|
||||
share/apps/kopete/icons/oxygen/128x128/apps/skype_protocol.png
|
||||
share/apps/kopete/icons/oxygen/128x128/apps/sms_protocol.png
|
||||
share/apps/kopete/icons/oxygen/128x128/apps/testbed_protocol.png
|
||||
share/apps/kopete/icons/oxygen/128x128/apps/wlm_protocol.png
|
||||
share/apps/kopete/icons/oxygen/128x128/apps/wp_protocol.png
|
||||
share/apps/kopete/icons/oxygen/128x128/apps/yahoo_protocol.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/aim_away.png
|
||||
@ -317,18 +315,6 @@ share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_online.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_skypeme.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_skypeout.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_unknown.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/wlm_away.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/wlm_blocked.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/wlm_brb.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/wlm_busy.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/wlm_fakefriend.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/wlm_invisible.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/wlm_lunch.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/wlm_na.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/wlm_newmsg.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/wlm_offline.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/wlm_online.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/wlm_phone.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/wp_away.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/yahoo_away.png
|
||||
share/apps/kopete/icons/oxygen/16x16/actions/yahoo_busy.png
|
||||
@ -359,7 +345,6 @@ share/apps/kopete/icons/oxygen/16x16/apps/qq_protocol.png
|
||||
share/apps/kopete/icons/oxygen/16x16/apps/skype_protocol.png
|
||||
share/apps/kopete/icons/oxygen/16x16/apps/sms_protocol.png
|
||||
share/apps/kopete/icons/oxygen/16x16/apps/testbed_protocol.png
|
||||
share/apps/kopete/icons/oxygen/16x16/apps/wlm_protocol.png
|
||||
share/apps/kopete/icons/oxygen/16x16/apps/wp_protocol.png
|
||||
share/apps/kopete/icons/oxygen/16x16/apps/yahoo_protocol.png
|
||||
share/apps/kopete/icons/oxygen/22x22/actions/logging.png
|
||||
@ -376,7 +361,6 @@ share/apps/kopete/icons/oxygen/22x22/apps/kopete_avdevice.png
|
||||
share/apps/kopete/icons/oxygen/22x22/apps/meanwhile_protocol.png
|
||||
share/apps/kopete/icons/oxygen/22x22/apps/qq_protocol.png
|
||||
share/apps/kopete/icons/oxygen/22x22/apps/skype_protocol.png
|
||||
share/apps/kopete/icons/oxygen/22x22/apps/wlm_protocol.png
|
||||
share/apps/kopete/icons/oxygen/32x32/actions/logging.png
|
||||
share/apps/kopete/icons/oxygen/32x32/actions/skype_blockcontact.png
|
||||
share/apps/kopete/icons/oxygen/32x32/actions/skype_call.png
|
||||
@ -398,7 +382,6 @@ share/apps/kopete/icons/oxygen/32x32/apps/qq_protocol.png
|
||||
share/apps/kopete/icons/oxygen/32x32/apps/skype_protocol.png
|
||||
share/apps/kopete/icons/oxygen/32x32/apps/sms_protocol.png
|
||||
share/apps/kopete/icons/oxygen/32x32/apps/testbed_protocol.png
|
||||
share/apps/kopete/icons/oxygen/32x32/apps/wlm_protocol.png
|
||||
share/apps/kopete/icons/oxygen/32x32/apps/wp_protocol.png
|
||||
share/apps/kopete/icons/oxygen/32x32/apps/yahoo_protocol.png
|
||||
share/apps/kopete/icons/oxygen/48x48/actions/logging.png
|
||||
@ -412,7 +395,6 @@ share/apps/kopete/icons/oxygen/48x48/apps/qq_protocol.png
|
||||
share/apps/kopete/icons/oxygen/48x48/apps/skype_protocol.png
|
||||
share/apps/kopete/icons/oxygen/48x48/apps/sms_protocol.png
|
||||
share/apps/kopete/icons/oxygen/48x48/apps/testbed_protocol.png
|
||||
share/apps/kopete/icons/oxygen/48x48/apps/wlm_protocol.png
|
||||
share/apps/kopete/icons/oxygen/48x48/apps/wp_protocol.png
|
||||
share/apps/kopete/icons/oxygen/48x48/apps/yahoo_protocol.png
|
||||
share/apps/kopete/icons/oxygen/64x64/actions/logging.png
|
||||
@ -426,7 +408,6 @@ share/apps/kopete/icons/oxygen/64x64/apps/meanwhile_protocol.png
|
||||
share/apps/kopete/icons/oxygen/64x64/apps/qq_protocol.png
|
||||
share/apps/kopete/icons/oxygen/64x64/apps/sms_protocol.png
|
||||
share/apps/kopete/icons/oxygen/64x64/apps/testbed_protocol.png
|
||||
share/apps/kopete/icons/oxygen/64x64/apps/wlm_protocol.png
|
||||
share/apps/kopete/icons/oxygen/64x64/apps/wp_protocol.png
|
||||
share/apps/kopete/icons/oxygen/64x64/apps/yahoo_protocol.png
|
||||
share/apps/kopete/icons/oxygen/scalable/apps/meanwhile_protocol.svgz
|
||||
@ -637,7 +618,6 @@ share/apps/kopete_skype/skypeui.rc
|
||||
share/apps/kopete_statistics/statisticsui.rc
|
||||
share/apps/kopete_translator/translatorchatui.rc
|
||||
share/apps/kopete_translator/translatorui.rc
|
||||
share/apps/kopete_wlm/wlmchatui.rc
|
||||
share/apps/kopete_yahoo/yahoochatui.rc
|
||||
share/apps/kopete_yahoo/yahooconferenceui.rc
|
||||
share/apps/kopete_yahoo/yahooimui.rc
|
||||
@ -821,7 +801,6 @@ share/kde4/services/kopete_texteffect.desktop
|
||||
share/kde4/services/kopete_translator.desktop
|
||||
share/kde4/services/kopete_urlpicpreview.desktop
|
||||
share/kde4/services/kopete_webpresence.desktop
|
||||
share/kde4/services/kopete_wlm.desktop
|
||||
share/kde4/services/kopete_wp.desktop
|
||||
share/kde4/services/kopete_yahoo.desktop
|
||||
share/kde4/services/skype.protocol
|
||||
@ -839,7 +818,6 @@ share/sounds/Kopete_User_is_Online.ogg
|
||||
@dirrm share/doc/HTML/en/kopete
|
||||
@dirrm share/apps/kopeterichtexteditpart
|
||||
@dirrm share/apps/kopete_yahoo
|
||||
@dirrm share/apps/kopete_wlm
|
||||
@dirrm share/apps/kopete_translator
|
||||
@dirrm share/apps/kopete_statistics
|
||||
@dirrm share/apps/kopete_skype
|
||||
|
||||
Loading…
Reference in New Issue
Block a user