View | Details | Raw Unified | Return to bug 201774
Collapse All | Expand All

(-)x11/leechcraft/Makefile (-19 / +36 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	leechcraft
4
PORTNAME=	leechcraft
5
PORTVERSION=	0.6.70
5
PORTVERSION=	0.6.70
6
PORTREVISION=	5
6
PORTREVISION=	6
7
CATEGORIES=	x11
7
CATEGORIES=	x11
8
MASTER_SITES=	http://dist.leechcraft.org/LeechCraft/0.6.70/
8
MASTER_SITES=	http://dist.leechcraft.org/LeechCraft/0.6.70/
9
9
Lines 10-16 Link Here
10
MAINTAINER=	vg@FreeBSD.org
10
MAINTAINER=	vg@FreeBSD.org
11
COMMENT=	Cross-platform modular live environment
11
COMMENT=	Cross-platform modular live environment
12
12
13
LICENSE=	BSL
14
LICENSE_FILE=	${WRKDIR}/${DISTNAME}/LICENSE
15
13
LIB_DEPENDS=	libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6 \
16
LIB_DEPENDS=	libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6 \
17
		libpcre.so:${PORTSDIR}/devel/pcre \
14
		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
18
		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
15
19
16
#LC_REV=		1526-g7fdb92a
20
#LC_REV=		1526-g7fdb92a
Lines 17-25 Link Here
17
INSTALLS_ICONS=	yes
21
INSTALLS_ICONS=	yes
18
MAKE_JOBS_UNSAFE=yes
22
MAKE_JOBS_UNSAFE=yes
19
USE_LDCONFIG=	yes
23
USE_LDCONFIG=	yes
20
USES=		tar:xz cmake gettext
24
USES=		cmake pkgconfig tar:xz
21
USE_QT4=	corelib dbus gui linguist moc network qmake rcc script sql \
25
USE_QT4=	corelib declarative gui network script sql sql-sqlite3_run \
22
		sql-sqlite3 svg uic xml
26
		webkit xml qmake_build moc_build rcc_build uic_build \
27
		linguisttools_build
28
USE_XORG=	x11
23
CMAKE_ARGS+=	-DENABLE_LADS=OFF \
29
CMAKE_ARGS+=	-DENABLE_LADS=OFF \
24
		-DENABLE_SYNCER=OFF \
30
		-DENABLE_SYNCER=OFF \
25
		-DLEECHCRAFT_VERSION=${PORTVERSION}
31
		-DLEECHCRAFT_VERSION=${PORTVERSION}
Lines 65-92 Link Here
65
			libotr.so:${PORTSDIR}/security/libotr \
71
			libotr.so:${PORTSDIR}/security/libotr \
66
			libpurple.so:${PORTSDIR}/net-im/libpurple \
72
			libpurple.so:${PORTSDIR}/net-im/libpurple \
67
			libqca.so:${PORTSDIR}/devel/qca \
73
			libqca.so:${PORTSDIR}/devel/qca \
68
			libqjson.so:${PORTSDIR}/devel/qjson \
69
			libqxmpp.so:${PORTSDIR}/net-im/qxmpp \
74
			libqxmpp.so:${PORTSDIR}/net-im/qxmpp \
70
			libspeex.so:${PORTSDIR}/audio/speex
75
			libspeex.so:${PORTSDIR}/audio/speex
71
AZOTH_USES=		desktop-file-utils
76
AZOTH_USES=		desktop-file-utils
72
AZOTH_USE=		qt4=webkit
73
77
74
BITTORRENT_DESC=	Full-featured BitTorrent client plugin
78
BITTORRENT_DESC=	Full-featured BitTorrent client plugin
75
BITTORRENT_CMAKE_ON=	-DENABLE_TORRENT:BOOL=true
79
BITTORRENT_CMAKE_ON=	-DENABLE_TORRENT:BOOL=true
76
BITTORRENT_CMAKE_OFF=	-DENABLE_TORRENT:BOOL=false
80
BITTORRENT_CMAKE_OFF=	-DENABLE_TORRENT:BOOL=false
77
BITTORRENT_LIB_DEPENDS=	libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar
81
BITTORRENT_LIB_DEPENDS=	libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar
78
BITTORRENT_USES=	pkgconfig
79
82
80
BLASQ_DESC=		Cloud image storage services client (like Flickr or Picasa)
83
BLASQ_DESC=		Cloud image storage services client (like Flickr or Picasa)
81
BLASQ_CMAKE_ON=		-DENABLE_BLASQ:BOOL=true
84
BLASQ_CMAKE_ON=		-DENABLE_BLASQ:BOOL=true
82
BLASQ_CMAKE_OFF=	-DENABLE_BLASQ:BOOL=false
85
BLASQ_CMAKE_OFF=	-DENABLE_BLASQ:BOOL=false
83
BLASQ_LIB_DEPENDS=	libkqoauth.so:${PORTSDIR}/security/kqoauth \
86
BLASQ_LIB_DEPENDS=	libkqoauth.so:${PORTSDIR}/security/kqoauth
84
			libqjson.so:${PORTSDIR}/devel/qjson
85
87
86
BLOGIQUE_DESC=		Blogging client
88
BLOGIQUE_DESC=		Blogging client
87
BLOGIQUE_CMAKE_ON=	-DENABLE_BLOGIQUE:BOOL=true
89
BLOGIQUE_CMAKE_ON=	-DENABLE_BLOGIQUE:BOOL=true
88
BLOGIQUE_CMAKE_OFF=	-DENABLE_BLOGIQUE:BOOL=false
90
BLOGIQUE_CMAKE_OFF=	-DENABLE_BLOGIQUE:BOOL=false
89
BLOGIQUE_USE=		qt4=webkit
90
91
91
CERTMGR_DESC=		SSL certificates manager
92
CERTMGR_DESC=		SSL certificates manager
92
CERTMGR_CMAKE_ON=	-DENABLE_CERTMGR:BOOL=true
93
CERTMGR_CMAKE_ON=	-DENABLE_CERTMGR:BOOL=true
Lines 151-157 Link Here
151
HOTSTREAMS_DESC=	Provides some cool radio streams to music players like LMP
152
HOTSTREAMS_DESC=	Provides some cool radio streams to music players like LMP
152
HOTSTREAMS_CMAKE_ON=	-DENABLE_HOTSTREAMS:BOOL=true
153
HOTSTREAMS_CMAKE_ON=	-DENABLE_HOTSTREAMS:BOOL=true
153
HOTSTREAMS_CMAKE_OFF=	-DENABLE_HOTSTREAMS:BOOL=false
154
HOTSTREAMS_CMAKE_OFF=	-DENABLE_HOTSTREAMS:BOOL=false
154
HOTSTREAMS_LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
155
155
156
HTTHARE_DESC=		Simple HTTP server
156
HTTHARE_DESC=		Simple HTTP server
157
HTTHARE_CMAKE_ON=	-DENABLE_HTTHARE:BOOL=true
157
HTTHARE_CMAKE_ON=	-DENABLE_HTTHARE:BOOL=true
Lines 164-175 Link Here
164
KBSWITCH_DESC=		Provides plugin- or tab-grained keyboard layout control
164
KBSWITCH_DESC=		Provides plugin- or tab-grained keyboard layout control
165
KBSWITCH_CMAKE_ON=	-DENABLE_KBSWITCH:BOOL=true
165
KBSWITCH_CMAKE_ON=	-DENABLE_KBSWITCH:BOOL=true
166
KBSWITCH_CMAKE_OFF=	-DENABLE_KBSWITCH:BOOL=false
166
KBSWITCH_CMAKE_OFF=	-DENABLE_KBSWITCH:BOOL=false
167
KBSWITCH_USE=		xorg=x11,xkbfile
167
KBSWITCH_USE=		xorg=xkbfile
168
168
169
KINOTIFY_DESC=		Fancy visual notifications
169
KINOTIFY_DESC=		Fancy visual notifications
170
KINOTIFY_CMAKE_ON=	-DENABLE_KINOTIFY:BOOL=true
170
KINOTIFY_CMAKE_ON=	-DENABLE_KINOTIFY:BOOL=true
171
KINOTIFY_CMAKE_OFF=	-DENABLE_KINOTIFY:BOOL=false
171
KINOTIFY_CMAKE_OFF=	-DENABLE_KINOTIFY:BOOL=false
172
KINOTIFY_USE=		qt4=webkit
173
172
174
KNOWHOW_DESC=		KnowHow, plugin for showing Tips of the Day
173
KNOWHOW_DESC=		KnowHow, plugin for showing Tips of the Day
175
KNOWHOW_CMAKE_ON=	-DENABLE_KNOWHOW:BOOL=true
174
KNOWHOW_CMAKE_ON=	-DENABLE_KNOWHOW:BOOL=true
Lines 178-184 Link Here
178
KRIGSTASK_DESC=		The taskbar quark
177
KRIGSTASK_DESC=		The taskbar quark
179
KRIGSTASK_CMAKE_ON=	-DENABLE_KRIGSTASK:BOOL=true
178
KRIGSTASK_CMAKE_ON=	-DENABLE_KRIGSTASK:BOOL=true
180
KRIGSTASK_CMAKE_OFF=	-DENABLE_KRIGSTASK:BOOL=false
179
KRIGSTASK_CMAKE_OFF=	-DENABLE_KRIGSTASK:BOOL=false
181
KRIGSTASK_USE=		xorg=x11,xcomposite
180
KRIGSTASK_USE=		xorg=xcomposite
182
181
183
LACKMAN_DESC=		Package Manager for extensions, scripts, themes etc
182
LACKMAN_DESC=		Package Manager for extensions, scripts, themes etc
184
LACKMAN_CMAKE_ON=	-DENABLE_LACKMAN:BOOL=true
183
LACKMAN_CMAKE_ON=	-DENABLE_LACKMAN:BOOL=true
Lines 205-211 Link Here
205
LHTR_CMAKE_ON=		-DENABLE_LHTR:BOOL=true
204
LHTR_CMAKE_ON=		-DENABLE_LHTR:BOOL=true
206
LHTR_CMAKE_OFF=		-DENABLE_LHTR:BOOL=false
205
LHTR_CMAKE_OFF=		-DENABLE_LHTR:BOOL=false
207
LHTR_BUILD_DEPENDS=	tidy:${PORTSDIR}/www/tidy-devel
206
LHTR_BUILD_DEPENDS=	tidy:${PORTSDIR}/www/tidy-devel
208
LHTR_USE=		qt4=webkit
209
207
210
LIZNOO_DESC=		UPower-based power manager
208
LIZNOO_DESC=		UPower-based power manager
211
LIZNOO_CMAKE_ON=	-DENABLE_LIZNOO:BOOL=true
209
LIZNOO_CMAKE_ON=	-DENABLE_LIZNOO:BOOL=true
Lines 212-219 Link Here
212
LIZNOO_CMAKE_OFF=	-DENABLE_LIZNOO:BOOL=false
210
LIZNOO_CMAKE_OFF=	-DENABLE_LIZNOO:BOOL=false
213
211
214
LMP_DESC=		LeechCraft Media Player, Phonon-based audio/video player
212
LMP_DESC=		LeechCraft Media Player, Phonon-based audio/video player
215
LMP_CMAKE_ON=		-DENABLE_LMP:BOOL=true
213
LMP_CMAKE_ON=		-DENABLE_LMP:BOOL=true \
214
			-DUSE_GSTREAMER_10:BOOL=false
216
LMP_CMAKE_OFF=		-DENABLE_LMP:BOOL=false
215
LMP_CMAKE_OFF=		-DENABLE_LMP:BOOL=false
216
LMP_USE=		GSTREAMER=yes
217
LMP_LIB_DEPENDS=	libguess.so:${PORTSDIR}/textproc/libguess \
217
LMP_LIB_DEPENDS=	libguess.so:${PORTSDIR}/textproc/libguess \
218
			libtag.so:${PORTSDIR}/audio/taglib
218
			libtag.so:${PORTSDIR}/audio/taglib
219
219
Lines 242-248 Link Here
242
NETSTOREMANAGER_CMAKE_ON=	-DENABLE_NETSTOREMANAGER:BOOL=true \
242
NETSTOREMANAGER_CMAKE_ON=	-DENABLE_NETSTOREMANAGER:BOOL=true \
243
				-DENABLE_NETSTOREMANAGER_INOTIFY:BOOL=false
243
				-DENABLE_NETSTOREMANAGER_INOTIFY:BOOL=false
244
NETSTOREMANAGER_CMAKE_OFF=	-DENABLE_NETSTOREMANAGER:BOOL=false
244
NETSTOREMANAGER_CMAKE_OFF=	-DENABLE_NETSTOREMANAGER:BOOL=false
245
NETSTOREMANAGER_LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
246
245
247
NETWORKMONITOR_DESC=		NetworkMonitor watches HTTP requests in
246
NETWORKMONITOR_DESC=		NetworkMonitor watches HTTP requests in
248
NETWORKMONITOR_CMAKE_ON=	-DENABLE_NETWORKMONITOR:BOOL=true
247
NETWORKMONITOR_CMAKE_ON=	-DENABLE_NETWORKMONITOR:BOOL=true
Lines 280-287 Link Here
280
POSHUKU_DESC=		The full-featured web browser plugin
279
POSHUKU_DESC=		The full-featured web browser plugin
281
POSHUKU_CMAKE_ON=	-DENABLE_POSHUKU:BOOL=true
280
POSHUKU_CMAKE_ON=	-DENABLE_POSHUKU:BOOL=true
282
POSHUKU_CMAKE_OFF=	-DENABLE_POSHUKU:BOOL=false
281
POSHUKU_CMAKE_OFF=	-DENABLE_POSHUKU:BOOL=false
283
POSHUKU_LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
284
POSHUKU_USE=		qt4=webkit
285
282
286
QROSP_DESC=		Scrpting support for LeechCraft via Qross
283
QROSP_DESC=		Scrpting support for LeechCraft via Qross
287
QROSP_CMAKE_ON=		-DENABLE_QROSP:BOOL=true
284
QROSP_CMAKE_ON=		-DENABLE_QROSP:BOOL=true
Lines 370-375 Link Here
370
367
371
.include <bsd.port.options.mk>
368
.include <bsd.port.options.mk>
372
369
370
.if ${PORT_OPTIONS:MAZOTH}   || ${PORT_OPTIONS:MDBUSMANAGER} || \
371
    ${PORT_OPTIONS:MLAUGHTY} || ${PORT_OPTIONS:MLIZNOO} || \
372
    ${PORT_OPTIONS:MLMP}     || ${PORT_OPTIONS:MSYSNOTIFY} || \
373
    ${PORT_OPTIONS:MVROOBY}  || ${PORT_OPTIONS:MXTAZY}
374
USE_QT4+=	dbus
375
.endif
376
377
.if ${PORT_OPTIONS:MBLASQ} || ${PORT_OPTIONS:MBLOGIQUE} || \
378
    ${PORT_OPTIONS:MLACKMAN}
379
USE_QT4+=	xmlpatterns
380
.endif
381
382
.if ${PORT_OPTIONS:MAZOTH} || ${PORT_OPTIONS:MBLASQ} || \
383
    ${PORT_OPTIONS:MFENET} || ${PORT_OPTIONS:MHOTSTREAMS} || \
384
    ${PORT_OPTIONS:MNETSTOREMANAGER} || ${PORT_OPTIONS:MPOSHUKU} || \
385
    ${PORT_OPTIONS:MQROSP} || ${PORT_OPTIONS:MSB2} || \
386
    ${PORT_OPTIONS:MTOUCHSTREAMS}
387
LIB_DEPENDS+=	libqjson.so:${PORTSDIR}/devel/qjson
388
.endif
389
373
.if ${PORT_OPTIONS:MELEEMINATOR}
390
.if ${PORT_OPTIONS:MELEEMINATOR}
374
BROKEN=		Eleeminator has not supported yet (not ported qtermwidget)
391
BROKEN=		Eleeminator has not supported yet (not ported qtermwidget)
375
.endif
392
.endif
(-)x11/leechcraft/files/patch-5c29ae8130.diff (+65 lines)
Line 0 Link Here
1
--- plugins/bittorrent/core.h.orig	2014-07-28 18:35:44 UTC
2
+++ plugins/bittorrent/core.h
3
@@ -271,7 +271,7 @@ namespace BitTorrent
4
 				const QVector<bool>& files = QVector<bool> (),
5
 				LeechCraft::TaskParameters params = LeechCraft::NoParameters);
6
 		void KillTask (int);
7
-		void RemoveTorrent (int, int opt = libtorrent::session::none);
8
+		void RemoveTorrent (int, int opt = 0);
9
 		void PauseTorrent (int);
10
 		void ResumeTorrent (int);
11
 		void ForceReannounce (int);
12
--- plugins/bittorrent/core.cpp.orig	2014-07-28 18:35:44 UTC
13
+++ plugins/bittorrent/core.cpp
14
@@ -230,9 +230,11 @@ namespace BitTorrent
15
 			setLoggingSettings ();
16
 			tcpPortRangeChanged ();
17
 
18
+#if LIBTORRENT_VERSION_NUM < 010000
19
 			if (XmlSettingsManager::Instance ()->
20
 					property ("EnableMetadata").toBool ())
21
 				Session_->add_extension (&libtorrent::create_metadata_plugin);
22
+#endif
23
 			if (XmlSettingsManager::Instance ()->
24
 					property ("EnablePEX").toBool ())
25
 				Session_->add_extension (&libtorrent::create_ut_pex_plugin);
26
@@ -1932,10 +1934,17 @@ namespace BitTorrent
27
 			atp.paused = pause;
28
 			atp.duplicate_is_error = true;
29
 #endif
30
+
31
+#if LIBTORRENT_VERSION_NUM >= 010000
32
+			std::copy (resumeData.constData (),
33
+					resumeData.constData () + resumeData.size (),
34
+					std::back_inserter (atp.resume_data));
35
+#else
36
 			atp.resume_data = new std::vector<char>;
37
 			std::copy (resumeData.constData (),
38
 					resumeData.constData () + resumeData.size (),
39
 					std::back_inserter (*atp.resume_data));
40
+#endif
41
 
42
 			handle = Session_->add_torrent (atp);
43
 			if (XmlSettingsManager::Instance ()->property ("ResolveCountries").toBool ())
44
--- plugins/bittorrent/torrentplugin.cpp.orig	2014-07-28 18:35:44 UTC
45
+++ plugins/bittorrent/torrentplugin.cpp
46
@@ -555,7 +555,7 @@ namespace LeechCraft
47
 
48
 				confirm.exec ();
49
 
50
-				int roptions = libtorrent::session::none;
51
+				int roptions = 0;
52
 				if (confirm.clickedButton () == deleteTorrentsAndFilesButton)
53
 					roptions |= libtorrent::session::delete_files;
54
 				else if (confirm.clickedButton () == deleteTorrentsButton)
55
--- plugins/bittorrent/torrenttab.cpp.orig	2014-07-28 18:35:44 UTC
56
+++ plugins/bittorrent/torrenttab.cpp
57
@@ -450,7 +450,7 @@ namespace BitTorrent
58
 
59
 		confirm.exec ();
60
 
61
-		int roptions = libtorrent::session::none;
62
+		int roptions = 0;
63
 		if (confirm.clickedButton () == deleteTorrentsAndFilesButton)
64
 			roptions |= libtorrent::session::delete_files;
65
 		else if (confirm.clickedButton () == deleteTorrentsButton)
(-)x11/leechcraft/files/patch-CMakeLists.txt (-3 / +3 lines)
Lines 1-6 Link Here
1
--- ./CMakeLists.txt.orig	2014-07-03 17:34:52.000000000 +0400
1
--- CMakeLists.txt.orig	2014-07-28 18:35:44 UTC
2
+++ ./CMakeLists.txt	2014-07-16 15:51:51.241009956 +0400
2
+++ CMakeLists.txt
3
@@ -40,7 +40,6 @@
3
@@ -40,7 +40,6 @@ if (UNIX OR (WIN32 AND MINGW))
4
 		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQ_COMPILER_VARIADIC_TEMPLATES -DQ_COMPILER_AUTO_TYPE -DQ_COMPILER_EXTERN_TEMPLATES -DQ_COMPILER_DEFAULT_DELETE_MEMBERS -DQ_COMPILER_CLASS_ENUM -DQ_COMPILER_INITIALIZER_LISTS")
4
 		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQ_COMPILER_VARIADIC_TEMPLATES -DQ_COMPILER_AUTO_TYPE -DQ_COMPILER_EXTERN_TEMPLATES -DQ_COMPILER_DEFAULT_DELETE_MEMBERS -DQ_COMPILER_CLASS_ENUM -DQ_COMPILER_INITIALIZER_LISTS")
5
 		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQ_COMPILER_LAMBDA -DQ_COMPILER_UNICODE_STRINGS")
5
 		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQ_COMPILER_LAMBDA -DQ_COMPILER_UNICODE_STRINGS")
6
 		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQ_COMPILER_CONSTEXPR -DQ_COMPILER_AUTO_FUNCTION")
6
 		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQ_COMPILER_CONSTEXPR -DQ_COMPILER_AUTO_FUNCTION")
(-)x11/leechcraft/files/patch-plugins__lmp__plugins__fradj__eqbandwidget.cpp (-3 / +3 lines)
Lines 1-6 Link Here
1
--- ./plugins/lmp/plugins/fradj/eqbandwidget.cpp.orig	2014-07-16 15:52:17.270849299 +0400
1
--- plugins/lmp/plugins/fradj/eqbandwidget.cpp.orig	2014-07-28 18:35:44 UTC
2
+++ ./plugins/lmp/plugins/fradj/eqbandwidget.cpp	2014-07-16 15:52:46.079846871 +0400
2
+++ plugins/lmp/plugins/fradj/eqbandwidget.cpp
3
@@ -98,7 +98,7 @@
3
@@ -98,7 +98,7 @@ namespace Fradj
4
 				this,
4
 				this,
5
 				SLOT (setGainBoxValue (int)));
5
 				SLOT (setGainBoxValue (int)));
6
 
6
 

Return to bug 201774