Index: head/net-im/qTox/Makefile =================================================================== --- head/net-im/qTox/Makefile (revision 431133) +++ head/net-im/qTox/Makefile (revision 431134) @@ -1,84 +1,83 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= qTox -PORTVERSION= 1.6.0 +PORTVERSION= 1.7.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= net-im net-p2p MAINTAINER= yuri@rawbw.com COMMENT= Qt 5 based Tox client LICENSE= GPLv3 BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libtoxcore.so:net-im/tox \ libopencv_highgui.so:graphics/opencv2 \ libopencv_core.so:graphics/opencv2-core \ libavcodec.so:multimedia/ffmpeg \ libvpx.so:multimedia/libvpx \ libfilteraudio.so:audio/libfilteraudio \ libsodium.so:security/libsodium \ libqrencode.so:graphics/libqrencode \ libsqlcipher.so:databases/sqlcipher \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig USE_GITHUB= yes GH_ACCOUNT= qTox SUB_FILES= pkg-message USES= compiler:c++11-lib desktop-file-utils gettext gmake openal:soft pkgconfig qmake USE_GNOME= glib20 gtk20 cairo gdkpixbuf2 USE_XORG= x11 xscrnsaver USE_GL= gl USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \ concurrent buildtools_build linguisttools_build ICON_SIZES= 14x14 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 QMAKE_ARGS= FREEBSD_PKGVERSION=${PKGVERSION} PLIST_FILES= bin/qtox \ share/applications/qTox.desktop \ share/icons/hicolor/scalable/apps/qtox.svgz .for SZ in ${ICON_SIZES} PLIST_FILES+= share/icons/hicolor/${SZ}/apps/qtox.png .endfor .include .if ${CHOSEN_COMPILER_TYPE} == "gcc" && ${ARCH} == i386 && !${CFLAGS:M-march=*} # Needed for __atomic_fetch_add_8 CFLAGS+= -march=i586 .endif pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "Warning: qTox won't build if the option NaCl was selected for Tox!" @${ECHO_MSG} post-patch: @${REINPLACE_CMD} -e 's|$$$$system(git rev-parse HEAD)|"${GH_TAGNAME}"|' \ ${WRKSRC}/qtox.pro @${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/include|INCLUDEPATH += "${LOCALBASE}/include|' \ ${WRKSRC}/qtox.pro @${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 pre-configure: @${REINPLACE_CMD} '/Comment/s,=.*,=${COMMENT},' \ ${WRKSRC}/qTox.desktop post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps @${GZIP_CMD} ${GZIP} < ${WRKSRC}/img/icons/qtox.svg > ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qtox.svgz .for SZ in ${ICON_SIZES} @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}/apps ${INSTALL_DATA} ${WRKSRC}/img/icons/${SZ}/qtox.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}/apps/qtox.png .endfor .include Index: head/net-im/qTox/distinfo =================================================================== --- head/net-im/qTox/distinfo (revision 431133) +++ head/net-im/qTox/distinfo (revision 431134) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480684987 -SHA256 (qTox-qTox-v1.6.0_GH0.tar.gz) = 7450e751da5cc6dce00b58df6d06a309e2674c7bd9311de6af21e53c36c3f155 -SIZE (qTox-qTox-v1.6.0_GH0.tar.gz) = 3481328 +TIMESTAMP = 1483083785 +SHA256 (qTox-qTox-v1.7.1_GH0.tar.gz) = 0d2a94be6f470e64f2722d261b9294b6ecc3418e374c47f722ca1a24058486e8 +SIZE (qTox-qTox-v1.7.1_GH0.tar.gz) = 3563251 Index: head/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp =================================================================== --- head/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp (revision 431133) +++ head/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp (nonexistent) @@ -1,14 +0,0 @@ -Fix build with GCC 4.9 -src/platform/camera/v4l2.cpp:204:24: error: 'printf' was not declared in this scope - printf("BAD!\n"); - ---- src/platform/camera/v4l2.cpp.orig 2016-12-02 20:44:09 UTC -+++ src/platform/camera/v4l2.cpp -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - /** - * Most of this file is adapted from libavdevice's v4l2.c, Property changes on: head/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/qTox/files/patch-src_platform_camera_v4l2.h =================================================================== --- head/net-im/qTox/files/patch-src_platform_camera_v4l2.h (revision 431133) +++ head/net-im/qTox/files/patch-src_platform_camera_v4l2.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/platform/camera/v4l2.h.orig 2016-11-13 15:20:00 UTC -+++ src/platform/camera/v4l2.h -@@ -24,7 +24,7 @@ - #include - #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 - Property changes on: head/net-im/qTox/files/patch-src_platform_camera_v4l2.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/qTox/files/patch-src_video_cameradevice.cpp =================================================================== --- head/net-im/qTox/files/patch-src_video_cameradevice.cpp (revision 431133) +++ head/net-im/qTox/files/patch-src_video_cameradevice.cpp (nonexistent) @@ -1,74 +0,0 @@ ---- src/video/cameradevice.cpp.orig 2016-11-13 15:20:00 UTC -+++ src/video/cameradevice.cpp -@@ -31,7 +31,7 @@ extern "C" { - #ifdef Q_OS_WIN - #include "src/platform/camera/directshow.h" - #endif --#ifdef Q_OS_LINUX -+#ifdef Q_OS_UNIX - #include "src/platform/camera/v4l2.h" - #endif - #ifdef Q_OS_OSX -@@ -150,7 +150,7 @@ CameraDevice* CameraDevice::open(QString - - AVDictionary* options = nullptr; - if (!iformat); --#ifdef Q_OS_LINUX -+#ifdef Q_OS_UNIX - else if (devName.startsWith("x11grab#")) - { - QSize screen; -@@ -359,7 +359,7 @@ QVector> CameraD - else if (iformat->name == QString("dshow")) - devices += DirectShow::getDeviceList(); - #endif --#ifdef Q_OS_LINUX -+#ifdef Q_OS_UNIX - else if (iformat->name == QString("video4linux2,v4l2")) - devices += v4l2::getDeviceList(); - #endif -@@ -467,7 +467,7 @@ QVector CameraDevice::getVide - else if (iformat->name == QString("dshow")) - return DirectShow::getDeviceModes(devName); - #endif --#ifdef Q_OS_LINUX -+#ifdef Q_OS_UNIX - else if (iformat->name == QString("video4linux2,v4l2")) - return v4l2::getDeviceModes(devName); - #endif -@@ -488,7 +488,7 @@ QVector CameraDevice::getVide - */ - QString CameraDevice::getPixelFormatString(uint32_t pixel_format) - { --#ifdef Q_OS_LINUX -+#ifdef Q_OS_UNIX - return v4l2::getPixelFormatString(pixel_format); - #else - return QString("unknown"); -@@ -504,7 +504,7 @@ QString CameraDevice::getPixelFormatStri - */ - bool CameraDevice::betterPixelFormat(uint32_t a, uint32_t b) - { --#ifdef Q_OS_LINUX -+#ifdef Q_OS_UNIX - return v4l2::betterPixelFormat(a, b); - #else - return false; -@@ -524,7 +524,7 @@ bool CameraDevice::getDefaultInputFormat - avdevice_register_all(); - - // Desktop capture input formats --#ifdef Q_OS_LINUX -+#ifdef Q_OS_UNIX - idesktopFormat = av_find_input_format("x11grab"); - #endif - #ifdef Q_OS_WIN -@@ -532,7 +532,7 @@ bool CameraDevice::getDefaultInputFormat - #endif - - // Webcam input formats --#ifdef Q_OS_LINUX -+#ifdef Q_OS_UNIX - if ((iformat = av_find_input_format("v4l2"))) - return true; - #endif Property changes on: head/net-im/qTox/files/patch-src_video_cameradevice.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/qTox/files/patch-qtox.pro =================================================================== --- head/net-im/qTox/files/patch-qtox.pro (revision 431133) +++ head/net-im/qTox/files/patch-qtox.pro (revision 431134) @@ -1,32 +1,32 @@ ---- qtox.pro.orig 2016-11-13 15:20:00 UTC +--- qtox.pro.orig 2016-12-25 17:46:01 UTC +++ qtox.pro -@@ -53,11 +53,11 @@ include(translations/i18n.pri) +@@ -68,11 +68,11 @@ include(translations/i18n.pri) system($$fromfile(translations/i18n.pri, updateallqm)) isEmpty(GIT_VERSION) { - GIT_VERSION = $$system(git rev-parse HEAD 2> /dev/null || echo "built without git") + GIT_VERSION = $$system(echo "n/a") } DEFINES += GIT_VERSION=\"\\\"$$quote($$GIT_VERSION)\\\"\" isEmpty(GIT_DESCRIBE) { - GIT_DESCRIBE = $$system(git describe --tags 2> /dev/null || echo "Nightly") + GIT_DESCRIBE = $$FREEBSD_PKGVERSION } DEFINES += GIT_DESCRIBE=\"\\\"$$quote($$GIT_DESCRIBE)\\\"\" # date works on linux/mac, but it would hangs qmake on windows -@@ -493,3 +493,15 @@ SOURCES += \ +@@ -510,3 +510,15 @@ SOURCES += \ src/widget/form/groupinviteform.cpp \ src/widget/tool/profileimporter.cpp \ src/widget/passwordedit.cpp + +unix { + target.path = $$PREFIX/bin + + desktop.files = qTox.desktop + desktop.path = $$PREFIX/share/applications + + icon.files = img/qtox.png + icon.path = $$PREFIX/share/pixmaps + + INSTALLS = target desktop icon +} Index: head/net-im/qTox/files/patch-src_main.cpp =================================================================== --- head/net-im/qTox/files/patch-src_main.cpp (revision 431133) +++ head/net-im/qTox/files/patch-src_main.cpp (revision 431134) @@ -1,13 +1,13 @@ ---- src/main.cpp.orig 2016-11-13 15:20:00 UTC +--- src/main.cpp.orig 2016-12-25 17:46:01 UTC +++ src/main.cpp @@ -317,3 +317,10 @@ int main(int argc, char *argv[]) #endif return errorcode; } + +// Missing in libxccrt.so function __cxa_deleted_virtual, see FreeBSD Bug#200863 +extern "C" void __cxa_deleted_virtual() +{ + abort(); +} + Index: head/net-im/qTox/files/patch-src_video_videomode.cpp =================================================================== --- head/net-im/qTox/files/patch-src_video_videomode.cpp (revision 431133) +++ head/net-im/qTox/files/patch-src_video_videomode.cpp (revision 431134) @@ -1,10 +1,10 @@ ---- src/video/videomode.cpp.orig 2016-11-13 15:20:00 UTC +--- src/video/videomode.cpp.orig 2016-12-25 17:46:01 UTC +++ src/video/videomode.cpp @@ -18,6 +18,7 @@ */ #include "videomode.h" +#include /** * @struct VideoMode Index: head/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui =================================================================== --- head/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui (revision 431133) +++ head/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui (revision 431134) @@ -1,12 +1,12 @@ ---- src/widget/form/settings/aboutsettings.ui.orig 2016-11-13 15:20:00 UTC +--- src/widget/form/settings/aboutsettings.ui.orig 2016-12-25 17:46:01 UTC +++ src/widget/form/settings/aboutsettings.ui @@ -111,6 +111,9 @@ {GIT_VERSION} + + false + true