Index: head/net-im/qTox/Makefile =================================================================== --- head/net-im/qTox/Makefile (revision 420235) +++ head/net-im/qTox/Makefile (revision 420236) @@ -1,76 +1,76 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= qTox -PORTVERSION= 1.4.1 +PORTVERSION= 1.5.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/opencv \ libopencv_core.so:graphics/opencv-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= tux3 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 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 - @${CP} ${WRKSRC}/img/icons/${SZ}/qtox.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}/apps/qtox.png + ${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 420235) +++ head/net-im/qTox/distinfo (revision 420236) @@ -1,2 +1,3 @@ -SHA256 (tux3-qTox-v1.4.1_GH0.tar.gz) = 752e5efdde5e0dfb66d9f5cd0660eb989b41bd4fcfcd3a1e607bee8bde496c84 -SIZE (tux3-qTox-v1.4.1_GH0.tar.gz) = 3021986 +TIMESTAMP = 1470843999 +SHA256 (tux3-qTox-v1.5.1_GH0.tar.gz) = 5b2ee896dfe33db29f7a2775faadb9e1063a4520893333fe0c93949e06ab2578 +SIZE (tux3-qTox-v1.5.1_GH0.tar.gz) = 3452448 Index: head/net-im/qTox/files/patch-qtox.pro =================================================================== --- head/net-im/qTox/files/patch-qtox.pro (revision 420235) +++ head/net-im/qTox/files/patch-qtox.pro (revision 420236) @@ -1,35 +1,32 @@ ---- qtox.pro.orig 2016-04-24 12:44:18 UTC +--- qtox.pro.orig 2016-08-09 23:12:33 UTC +++ qtox.pro -@@ -49,11 +49,11 @@ include(translations/i18n.pri) +@@ -48,11 +48,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 -@@ -485,6 +485,18 @@ SOURCES += \ - src/persistence/history.cpp \ - src/widget/form/groupinviteform.cpp - +@@ -481,3 +481,15 @@ SOURCES += \ + src/widget/tool/profileimporter.cpp \ + src/widget/passwordedit.cpp \ + src/video/videomode.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 +} -+ - HEADERS += \ - src/audio/audio.h \ - src/core/core.h \ Index: head/net-im/qTox/files/patch-src_main.cpp =================================================================== --- head/net-im/qTox/files/patch-src_main.cpp (revision 420235) +++ head/net-im/qTox/files/patch-src_main.cpp (revision 420236) @@ -1,13 +1,13 @@ ---- src/main.cpp.orig 2016-04-24 12:44:18 UTC +--- src/main.cpp.orig 2016-08-09 23:12:33 UTC +++ src/main.cpp -@@ -303,3 +303,10 @@ int main(int argc, char *argv[]) +@@ -306,3 +306,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_platform_camera_v4l2.h =================================================================== --- head/net-im/qTox/files/patch-src_platform_camera_v4l2.h (revision 420235) +++ head/net-im/qTox/files/patch-src_platform_camera_v4l2.h (revision 420236) @@ -1,11 +1,11 @@ ---- src/platform/camera/v4l2.h.orig 2016-04-24 12:44:18 UTC +--- src/platform/camera/v4l2.h.orig 2016-08-09 23:12:33 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 Index: head/net-im/qTox/files/patch-src_video_cameradevice.cpp =================================================================== --- head/net-im/qTox/files/patch-src_video_cameradevice.cpp (revision 420235) +++ head/net-im/qTox/files/patch-src_video_cameradevice.cpp (revision 420236) @@ -1,65 +1,74 @@ ---- src/video/cameradevice.cpp.orig 2016-04-24 12:44:18 UTC +--- src/video/cameradevice.cpp.orig 2016-08-09 23:12:33 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 -@@ -122,7 +122,7 @@ CameraDevice* CameraDevice::open(QString +@@ -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; -@@ -168,7 +168,7 @@ CameraDevice* CameraDevice::open(QString - av_dict_set(&options, "framerate", QString().setNum(mode.FPS).toStdString().c_str(), 0); - } - #endif --#ifdef Q_OS_LINUX -+#ifdef Q_OS_UNIX - else if (iformat->name == QString("video4linux2,v4l2") && mode) - { - av_dict_set(&options, "video_size", QString("%1x%2").arg(mode.width).arg(mode.height).toStdString().c_str(), 0); -@@ -311,7 +311,7 @@ QVector> CameraD +@@ -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 -@@ -358,7 +358,7 @@ QVector CameraDevice::getVide +@@ -461,7 +461,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 -@@ -400,7 +400,7 @@ bool CameraDevice::getDefaultInputFormat +@@ -482,7 +482,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"); +@@ -498,7 +498,7 @@ false otherwise (such as if there's no p + */ + 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; +@@ -518,7 +518,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 -@@ -408,7 +408,7 @@ bool CameraDevice::getDefaultInputFormat +@@ -526,7 +526,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 Index: head/net-im/qTox/files/patch-src_video_videomode.cpp =================================================================== --- head/net-im/qTox/files/patch-src_video_videomode.cpp (nonexistent) +++ head/net-im/qTox/files/patch-src_video_videomode.cpp (revision 420236) @@ -0,0 +1,10 @@ +--- src/video/videomode.cpp.orig 2016-08-10 16:00:51 UTC ++++ src/video/videomode.cpp +@@ -18,6 +18,7 @@ + */ + + #include "videomode.h" ++#include + + /** + @struct VideoMode Property changes on: head/net-im/qTox/files/patch-src_video_videomode.cpp ___________________________________________________________________ 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: 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 420235) +++ head/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui (revision 420236) @@ -1,12 +1,12 @@ ---- src/widget/form/settings/aboutsettings.ui.orig 2016-04-25 21:28:44 UTC +--- src/widget/form/settings/aboutsettings.ui.orig 2016-08-09 23:12:33 UTC +++ src/widget/form/settings/aboutsettings.ui @@ -111,6 +111,9 @@ - Commit hash: <a href="https://github.com/tux3/qTox/commit/$GIT_VERSION">$GIT_VERSION</a> + Commit hash: <a href="https://github.com/qTox/qTox/commit/$GIT_VERSION">$GIT_VERSION</a> + + false + true