Attachment 157749 Details for Bug 200865 – patch for qTox

[patch] patch for qTox

qTox-2015-06-14.patch (text/plain), 5.43 KB, created by Yuri Victorovich on 2015-06-15 03:54:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2015-06-15 03:54:26 UTC

Size: 5.43 KB

patch

obsolete

>diff -ruN net-im/qTox/Makefile net-im/qTox/Makefile
>--- net-im/qTox/Makefile	2015-06-14 20:38:04.255916000 -0700
>+++ net-im/qTox/Makefile	2015-06-14 20:52:58.022446000 -0700
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/net-im/qTox/Makefile 389468 2015-06-13 16:14:54Z vsevolod $
> 
> PORTNAME=	qTox
>-PORTVERSION=	0.150426
>-PORTREVISION=	3
>+PORTVERSION=	0.150614
> CATEGORIES=	net-im net-p2p
> 
> MAINTAINER=	yuri@rawbw.com
>@@ -11,24 +10,27 @@
> 
> LICENSE=	GPLv3
> 
>-BUILD_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
>-LIB_DEPENDS=	libopencv_highgui.so:${PORTSDIR}/graphics/opencv \
>+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
>+LIB_DEPENDS=	libtoxcore.so:${PORTSDIR}/net-im/tox \
>+		libopencv_highgui.so:${PORTSDIR}/graphics/opencv \
> 		libopencv_core.so:${PORTSDIR}/graphics/opencv-core \
>+		libavcodec26.so:${PORTSDIR}/multimedia/ffmpeg26 \
> 		libvpx.so:${PORTSDIR}/multimedia/libvpx \
> 		libfilteraudio.so:${PORTSDIR}/audio/libfilteraudio \
> 		libsodium.so:${PORTSDIR}/security/libsodium \
> 		libqrencode.so:${PORTSDIR}/graphics/libqrencode
>-RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	tux3
>-GH_TAGNAME=	25329d3
>+GH_TAGNAME=	ce2c830
> 
> USES=		compiler:c++11-lib desktop-file-utils openal:soft qmake gmake
> USE_GNOME=	glib20 gtk20 cairo gdkpixbuf2
> USE_XORG=	x11 xscrnsaver
> USE_QT5=	core gui network xml opengl sql sql-sqlite3_run widgets svg \
> 		concurrent buildtools_build linguisttools_build
>+CXXFLAGS+=	-I${LOCALBASE}/include/ffmpeg26
>+LDFLAGS+=	-L${LOCALBASE}/lib/ffmpeg26 -Wl,-rpath,${LOCALBASE}/lib/ffmpeg26
> 
> PLIST_FILES=	bin/qtox \
> 		share/applications/qTox.desktop
>@@ -41,9 +43,13 @@
> post-patch:
> 	@${REINPLACE_CMD} -e 's|$$$$system(git rev-parse HEAD)|"${GH_TAGNAME}"|' \
> 		${WRKSRC}/qtox.pro
>-	@${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/include|INCLUDEPATH += "/usr/local/include|' \
>+	@${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/include|INCLUDEPATH += "${LOCALBASE}/include|' \
> 		${WRKSRC}/qtox.pro
>-	@${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/lib|INCLUDEPATH += "/usr/local/lib|' \
>+	@${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/lib64|INCLUDEPATH += "${LOCALBASE}/lib|' \
>+		${WRKSRC}/qtox.pro
>+	@${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/lib|INCLUDEPATH += "${LOCALBASE}/lib|' \
>+		${WRKSRC}/qtox.pro
>+	@${REINPLACE_CMD} -e 's|-lavformat -lavdevice -lavcodec -lavutil -lswscale|-lavformat26 -lavdevice26 -lavcodec26 -lavutil26 -lswscale26|' \
> 		${WRKSRC}/qtox.pro
> 
> pre-configure:
>diff -ruN net-im/qTox/distinfo net-im/qTox/distinfo
>--- net-im/qTox/distinfo	2015-06-14 20:38:04.256499000 -0700
>+++ net-im/qTox/distinfo	2015-06-14 14:34:04.044886000 -0700
>@@ -1,2 +1,2 @@
>-SHA256 (tux3-qTox-0.150426-25329d3_GH0.tar.gz) = aa8615a0e57fce5dd4ed4bf19a9934b8e1d8f34bf6dbaeb1d16ece2ef9405869
>-SIZE (tux3-qTox-0.150426-25329d3_GH0.tar.gz) = 4643786
>+SHA256 (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = c59580b98886acf9ec5acb1a85b7f6544d53bc2d72491dddeb8865b4d64dd3f6
>+SIZE (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = 4556369
>diff -ruN net-im/qTox/files/patch-qtox.pro net-im/qTox/files/patch-qtox.pro
>--- net-im/qTox/files/patch-qtox.pro	2015-06-14 20:38:04.255002000 -0700
>+++ net-im/qTox/files/patch-qtox.pro	2015-06-14 17:20:30.412771000 -0700
>@@ -1,8 +1,8 @@
>---- qtox.pro.orig	2015-04-27 03:03:27 UTC
>+--- qtox.pro.orig	2015-06-12 10:53:59 UTC
> +++ qtox.pro
>-@@ -433,6 +433,18 @@ SOURCES += \
>-     src/profilelocker.cpp \
>-     src/avatarbroadcaster.cpp
>+@@ -483,6 +483,18 @@ SOURCES += \
>+     src/widget/translator.cpp \
>+     src/persistence/settingsserializer.cpp
>  
> +unix {
> +    target.path  = $$PREFIX/bin
>@@ -17,5 +17,5 @@
> +}
> +
>  HEADERS += \
>-     src/audio.h \
>+     src/audio/audio.h \
>      src/core/core.h \
>diff -ruN net-im/qTox/files/patch-src_main.cpp net-im/qTox/files/patch-src_main.cpp
>--- net-im/qTox/files/patch-src_main.cpp	1969-12-31 16:00:00.000000000 -0800
>+++ net-im/qTox/files/patch-src_main.cpp	2015-06-14 20:25:52.299689000 -0700
>@@ -0,0 +1,13 @@
>+--- src/main.cpp.orig	2015-06-12 10:53:59 UTC
>++++ src/main.cpp
>+@@ -280,3 +280,10 @@ int main(int argc, char *argv[])
>+     qDebug() << "Clean exit with status"<<errorcode;
>+     return errorcode;
>+ }
>++
>++// Missing in libxccrt.so function __cxa_deleted_virtual, see FreeBSD Bug#200863
>++extern "C" void __cxa_deleted_virtual()
>++{
>++  abort();
>++}
>++
>diff -ruN net-im/qTox/files/patch-src_platform_camera_v4l2.cpp net-im/qTox/files/patch-src_platform_camera_v4l2.cpp
>--- net-im/qTox/files/patch-src_platform_camera_v4l2.cpp	1969-12-31 16:00:00.000000000 -0800
>+++ net-im/qTox/files/patch-src_platform_camera_v4l2.cpp	2015-06-14 20:25:52.308718000 -0700
>@@ -0,0 +1,10 @@
>+--- src/platform/camera/v4l2.cpp.orig	2015-06-15 03:25:21 UTC
>++++ src/platform/camera/v4l2.cpp
>+@@ -26,6 +26,7 @@
>+ #include <fcntl.h>
>+ #include <sys/ioctl.h>
>+ #include <linux/videodev2.h>
>++#include <errno.h>
>+ 
>+ /**
>+  * Most of this file is adapted from libavdevice's v4l2.c,
>diff -ruN net-im/qTox/files/patch-src_platform_camera_v4l2.h net-im/qTox/files/patch-src_platform_camera_v4l2.h
>--- net-im/qTox/files/patch-src_platform_camera_v4l2.h	1969-12-31 16:00:00.000000000 -0800
>+++ net-im/qTox/files/patch-src_platform_camera_v4l2.h	2015-06-14 20:25:52.317699000 -0700
>@@ -0,0 +1,11 @@
>+--- src/platform/camera/v4l2.h.orig	2015-06-12 10:53:59 UTC
>++++ src/platform/camera/v4l2.h
>+@@ -24,7 +24,7 @@
>+ #include <QPair>
>+ #include "src/video/videomode.h"
>+ 
>+-#ifndef Q_OS_LINUX
>++#ifndef Q_OS_UNIX
>+ #error "This file is only meant to be compiled for Linux targets"
>+ #endif
>+

Actions: View | Diff

Attachments on bug 200865: 157745 | 157746 | 157747 | 157748 | 157749 | 157754 | 157767 | 157793 | 157860