Attachment 159086 Details for Bug 201774 – Patch.diff

[patch] Patch.diff

patch-leechcraft.diff (text/plain), 10.56 KB, created by Andriy Voskoboinyk on 2015-07-22 20:10:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-07-22 20:10:11 UTC

Size: 10.56 KB

patch

obsolete

>Index: x11/leechcraft/Makefile
>===================================================================
>--- x11/leechcraft/Makefile	(revision 392631)
>+++ x11/leechcraft/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	leechcraft
> PORTVERSION=	0.6.70
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	x11
> MASTER_SITES=	http://dist.leechcraft.org/LeechCraft/0.6.70/
> 
>@@ -10,7 +10,11 @@
> MAINTAINER=	vg@FreeBSD.org
> COMMENT=	Cross-platform modular live environment
> 
>+LICENSE=	BSL
>+LICENSE_FILE=	${WRKDIR}/${DISTNAME}/LICENSE
>+
> LIB_DEPENDS=	libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6 \
>+		libpcre.so:${PORTSDIR}/devel/pcre \
> 		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
> 
> #LC_REV=		1526-g7fdb92a
>@@ -17,9 +21,11 @@
> INSTALLS_ICONS=	yes
> MAKE_JOBS_UNSAFE=yes
> USE_LDCONFIG=	yes
>-USES=		tar:xz cmake gettext
>-USE_QT4=	corelib dbus gui linguist moc network qmake rcc script sql \
>-		sql-sqlite3 svg uic xml
>+USES=		cmake pkgconfig tar:xz
>+USE_QT4=	corelib declarative gui network script sql sql-sqlite3_run \
>+		webkit xml qmake_build moc_build rcc_build uic_build \
>+		linguisttools_build
>+USE_XORG=	x11
> CMAKE_ARGS+=	-DENABLE_LADS=OFF \
> 		-DENABLE_SYNCER=OFF \
> 		-DLEECHCRAFT_VERSION=${PORTVERSION}
>@@ -65,28 +71,23 @@
> 			libotr.so:${PORTSDIR}/security/libotr \
> 			libpurple.so:${PORTSDIR}/net-im/libpurple \
> 			libqca.so:${PORTSDIR}/devel/qca \
>-			libqjson.so:${PORTSDIR}/devel/qjson \
> 			libqxmpp.so:${PORTSDIR}/net-im/qxmpp \
> 			libspeex.so:${PORTSDIR}/audio/speex
> AZOTH_USES=		desktop-file-utils
>-AZOTH_USE=		qt4=webkit
> 
> BITTORRENT_DESC=	Full-featured BitTorrent client plugin
> BITTORRENT_CMAKE_ON=	-DENABLE_TORRENT:BOOL=true
> BITTORRENT_CMAKE_OFF=	-DENABLE_TORRENT:BOOL=false
> BITTORRENT_LIB_DEPENDS=	libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar
>-BITTORRENT_USES=	pkgconfig
> 
> BLASQ_DESC=		Cloud image storage services client (like Flickr or Picasa)
> BLASQ_CMAKE_ON=		-DENABLE_BLASQ:BOOL=true
> BLASQ_CMAKE_OFF=	-DENABLE_BLASQ:BOOL=false
>-BLASQ_LIB_DEPENDS=	libkqoauth.so:${PORTSDIR}/security/kqoauth \
>-			libqjson.so:${PORTSDIR}/devel/qjson
>+BLASQ_LIB_DEPENDS=	libkqoauth.so:${PORTSDIR}/security/kqoauth
> 
> BLOGIQUE_DESC=		Blogging client
> BLOGIQUE_CMAKE_ON=	-DENABLE_BLOGIQUE:BOOL=true
> BLOGIQUE_CMAKE_OFF=	-DENABLE_BLOGIQUE:BOOL=false
>-BLOGIQUE_USE=		qt4=webkit
> 
> CERTMGR_DESC=		SSL certificates manager
> CERTMGR_CMAKE_ON=	-DENABLE_CERTMGR:BOOL=true
>@@ -151,7 +152,6 @@
> HOTSTREAMS_DESC=	Provides some cool radio streams to music players like LMP
> HOTSTREAMS_CMAKE_ON=	-DENABLE_HOTSTREAMS:BOOL=true
> HOTSTREAMS_CMAKE_OFF=	-DENABLE_HOTSTREAMS:BOOL=false
>-HOTSTREAMS_LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
> 
> HTTHARE_DESC=		Simple HTTP server
> HTTHARE_CMAKE_ON=	-DENABLE_HTTHARE:BOOL=true
>@@ -164,12 +164,11 @@
> KBSWITCH_DESC=		Provides plugin- or tab-grained keyboard layout control
> KBSWITCH_CMAKE_ON=	-DENABLE_KBSWITCH:BOOL=true
> KBSWITCH_CMAKE_OFF=	-DENABLE_KBSWITCH:BOOL=false
>-KBSWITCH_USE=		xorg=x11,xkbfile
>+KBSWITCH_USE=		xorg=xkbfile
> 
> KINOTIFY_DESC=		Fancy visual notifications
> KINOTIFY_CMAKE_ON=	-DENABLE_KINOTIFY:BOOL=true
> KINOTIFY_CMAKE_OFF=	-DENABLE_KINOTIFY:BOOL=false
>-KINOTIFY_USE=		qt4=webkit
> 
> KNOWHOW_DESC=		KnowHow, plugin for showing Tips of the Day
> KNOWHOW_CMAKE_ON=	-DENABLE_KNOWHOW:BOOL=true
>@@ -178,7 +177,7 @@
> KRIGSTASK_DESC=		The taskbar quark
> KRIGSTASK_CMAKE_ON=	-DENABLE_KRIGSTASK:BOOL=true
> KRIGSTASK_CMAKE_OFF=	-DENABLE_KRIGSTASK:BOOL=false
>-KRIGSTASK_USE=		xorg=x11,xcomposite
>+KRIGSTASK_USE=		xorg=xcomposite
> 
> LACKMAN_DESC=		Package Manager for extensions, scripts, themes etc
> LACKMAN_CMAKE_ON=	-DENABLE_LACKMAN:BOOL=true
>@@ -205,7 +204,6 @@
> LHTR_CMAKE_ON=		-DENABLE_LHTR:BOOL=true
> LHTR_CMAKE_OFF=		-DENABLE_LHTR:BOOL=false
> LHTR_BUILD_DEPENDS=	tidy:${PORTSDIR}/www/tidy-devel
>-LHTR_USE=		qt4=webkit
> 
> LIZNOO_DESC=		UPower-based power manager
> LIZNOO_CMAKE_ON=	-DENABLE_LIZNOO:BOOL=true
>@@ -212,8 +210,10 @@
> LIZNOO_CMAKE_OFF=	-DENABLE_LIZNOO:BOOL=false
> 
> LMP_DESC=		LeechCraft Media Player, Phonon-based audio/video player
>-LMP_CMAKE_ON=		-DENABLE_LMP:BOOL=true
>+LMP_CMAKE_ON=		-DENABLE_LMP:BOOL=true \
>+			-DUSE_GSTREAMER_10:BOOL=false
> LMP_CMAKE_OFF=		-DENABLE_LMP:BOOL=false
>+LMP_USE=		GSTREAMER=yes
> LMP_LIB_DEPENDS=	libguess.so:${PORTSDIR}/textproc/libguess \
> 			libtag.so:${PORTSDIR}/audio/taglib
> 
>@@ -242,7 +242,6 @@
> NETSTOREMANAGER_CMAKE_ON=	-DENABLE_NETSTOREMANAGER:BOOL=true \
> 				-DENABLE_NETSTOREMANAGER_INOTIFY:BOOL=false
> NETSTOREMANAGER_CMAKE_OFF=	-DENABLE_NETSTOREMANAGER:BOOL=false
>-NETSTOREMANAGER_LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
> 
> NETWORKMONITOR_DESC=		NetworkMonitor watches HTTP requests in
> NETWORKMONITOR_CMAKE_ON=	-DENABLE_NETWORKMONITOR:BOOL=true
>@@ -280,8 +279,6 @@
> POSHUKU_DESC=		The full-featured web browser plugin
> POSHUKU_CMAKE_ON=	-DENABLE_POSHUKU:BOOL=true
> POSHUKU_CMAKE_OFF=	-DENABLE_POSHUKU:BOOL=false
>-POSHUKU_LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
>-POSHUKU_USE=		qt4=webkit
> 
> QROSP_DESC=		Scrpting support for LeechCraft via Qross
> QROSP_CMAKE_ON=		-DENABLE_QROSP:BOOL=true
>@@ -370,6 +367,26 @@
> 
> .include <bsd.port.options.mk>
> 
>+.if ${PORT_OPTIONS:MAZOTH}   || ${PORT_OPTIONS:MDBUSMANAGER} || \
>+    ${PORT_OPTIONS:MLAUGHTY} || ${PORT_OPTIONS:MLIZNOO} || \
>+    ${PORT_OPTIONS:MLMP}     || ${PORT_OPTIONS:MSYSNOTIFY} || \
>+    ${PORT_OPTIONS:MVROOBY}  || ${PORT_OPTIONS:MXTAZY}
>+USE_QT4+=	dbus
>+.endif
>+
>+.if ${PORT_OPTIONS:MBLASQ} || ${PORT_OPTIONS:MBLOGIQUE} || \
>+    ${PORT_OPTIONS:MLACKMAN}
>+USE_QT4+=	xmlpatterns
>+.endif
>+
>+.if ${PORT_OPTIONS:MAZOTH} || ${PORT_OPTIONS:MBLASQ} || \
>+    ${PORT_OPTIONS:MFENET} || ${PORT_OPTIONS:MHOTSTREAMS} || \
>+    ${PORT_OPTIONS:MNETSTOREMANAGER} || ${PORT_OPTIONS:MPOSHUKU} || \
>+    ${PORT_OPTIONS:MQROSP} || ${PORT_OPTIONS:MSB2} || \
>+    ${PORT_OPTIONS:MTOUCHSTREAMS}
>+LIB_DEPENDS+=	libqjson.so:${PORTSDIR}/devel/qjson
>+.endif
>+
> .if ${PORT_OPTIONS:MELEEMINATOR}
> BROKEN=		Eleeminator has not supported yet (not ported qtermwidget)
> .endif
>Index: x11/leechcraft/files/patch-5c29ae8130.diff
>===================================================================
>--- x11/leechcraft/files/patch-5c29ae8130.diff	(revision 0)
>+++ x11/leechcraft/files/patch-5c29ae8130.diff	(working copy)
>@@ -0,0 +1,65 @@
>+--- plugins/bittorrent/core.h.orig	2014-07-28 18:35:44 UTC
>++++ plugins/bittorrent/core.h
>+@@ -271,7 +271,7 @@ namespace BitTorrent
>+ 				const QVector<bool>& files = QVector<bool> (),
>+ 				LeechCraft::TaskParameters params = LeechCraft::NoParameters);
>+ 		void KillTask (int);
>+-		void RemoveTorrent (int, int opt = libtorrent::session::none);
>++		void RemoveTorrent (int, int opt = 0);
>+ 		void PauseTorrent (int);
>+ 		void ResumeTorrent (int);
>+ 		void ForceReannounce (int);
>+--- plugins/bittorrent/core.cpp.orig	2014-07-28 18:35:44 UTC
>++++ plugins/bittorrent/core.cpp
>+@@ -230,9 +230,11 @@ namespace BitTorrent
>+ 			setLoggingSettings ();
>+ 			tcpPortRangeChanged ();
>+ 
>++#if LIBTORRENT_VERSION_NUM < 010000
>+ 			if (XmlSettingsManager::Instance ()->
>+ 					property ("EnableMetadata").toBool ())
>+ 				Session_->add_extension (&libtorrent::create_metadata_plugin);
>++#endif
>+ 			if (XmlSettingsManager::Instance ()->
>+ 					property ("EnablePEX").toBool ())
>+ 				Session_->add_extension (&libtorrent::create_ut_pex_plugin);
>+@@ -1932,10 +1934,17 @@ namespace BitTorrent
>+ 			atp.paused = pause;
>+ 			atp.duplicate_is_error = true;
>+ #endif
>++
>++#if LIBTORRENT_VERSION_NUM >= 010000
>++			std::copy (resumeData.constData (),
>++					resumeData.constData () + resumeData.size (),
>++					std::back_inserter (atp.resume_data));
>++#else
>+ 			atp.resume_data = new std::vector<char>;
>+ 			std::copy (resumeData.constData (),
>+ 					resumeData.constData () + resumeData.size (),
>+ 					std::back_inserter (*atp.resume_data));
>++#endif
>+ 
>+ 			handle = Session_->add_torrent (atp);
>+ 			if (XmlSettingsManager::Instance ()->property ("ResolveCountries").toBool ())
>+--- plugins/bittorrent/torrentplugin.cpp.orig	2014-07-28 18:35:44 UTC
>++++ plugins/bittorrent/torrentplugin.cpp
>+@@ -555,7 +555,7 @@ namespace LeechCraft
>+ 
>+ 				confirm.exec ();
>+ 
>+-				int roptions = libtorrent::session::none;
>++				int roptions = 0;
>+ 				if (confirm.clickedButton () == deleteTorrentsAndFilesButton)
>+ 					roptions |= libtorrent::session::delete_files;
>+ 				else if (confirm.clickedButton () == deleteTorrentsButton)
>+--- plugins/bittorrent/torrenttab.cpp.orig	2014-07-28 18:35:44 UTC
>++++ plugins/bittorrent/torrenttab.cpp
>+@@ -450,7 +450,7 @@ namespace BitTorrent
>+ 
>+ 		confirm.exec ();
>+ 
>+-		int roptions = libtorrent::session::none;
>++		int roptions = 0;
>+ 		if (confirm.clickedButton () == deleteTorrentsAndFilesButton)
>+ 			roptions |= libtorrent::session::delete_files;
>+ 		else if (confirm.clickedButton () == deleteTorrentsButton)
>
>Property changes on: x11/leechcraft/files/patch-5c29ae8130.diff
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: x11/leechcraft/files/patch-CMakeLists.txt
>===================================================================
>--- x11/leechcraft/files/patch-CMakeLists.txt	(revision 392631)
>+++ x11/leechcraft/files/patch-CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- ./CMakeLists.txt.orig	2014-07-03 17:34:52.000000000 +0400
>-+++ ./CMakeLists.txt	2014-07-16 15:51:51.241009956 +0400
>-@@ -40,7 +40,6 @@
>+--- CMakeLists.txt.orig	2014-07-28 18:35:44 UTC
>++++ CMakeLists.txt
>+@@ -40,7 +40,6 @@ if (UNIX OR (WIN32 AND MINGW))
>  		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")
>  		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQ_COMPILER_LAMBDA -DQ_COMPILER_UNICODE_STRINGS")
>  		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQ_COMPILER_CONSTEXPR -DQ_COMPILER_AUTO_FUNCTION")
>Index: x11/leechcraft/files/patch-plugins__lmp__plugins__fradj__eqbandwidget.cpp
>===================================================================
>--- x11/leechcraft/files/patch-plugins__lmp__plugins__fradj__eqbandwidget.cpp	(revision 392631)
>+++ x11/leechcraft/files/patch-plugins__lmp__plugins__fradj__eqbandwidget.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- ./plugins/lmp/plugins/fradj/eqbandwidget.cpp.orig	2014-07-16 15:52:17.270849299 +0400
>-+++ ./plugins/lmp/plugins/fradj/eqbandwidget.cpp	2014-07-16 15:52:46.079846871 +0400
>-@@ -98,7 +98,7 @@
>+--- plugins/lmp/plugins/fradj/eqbandwidget.cpp.orig	2014-07-28 18:35:44 UTC
>++++ plugins/lmp/plugins/fradj/eqbandwidget.cpp
>+@@ -98,7 +98,7 @@ namespace Fradj
>  				this,
>  				SLOT (setGainBoxValue (int)));
>

Actions: View | Diff

Attachments on bug 201774: 159086 | 159087 | 159090