Index: head/net-im/qTox/Makefile =================================================================== --- head/net-im/qTox/Makefile (revision 414127) +++ head/net-im/qTox/Makefile (revision 414128) @@ -1,72 +1,75 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= qTox -PORTVERSION= 1.3.0 -PORTREVISION= 1 +PORTVERSION= 1.4.0 DISTVERSIONPREFIX= v 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 + 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 openal:soft qmake gmake +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/qtox-${SZ}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}/apps/qtox.png + @${CP} ${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 414127) +++ head/net-im/qTox/distinfo (revision 414128) @@ -1,2 +1,2 @@ -SHA256 (tux3-qTox-v1.3.0_GH0.tar.gz) = a2d1483a9aa6e99684853733a0a0a04c8cde168a775b9d2bdab94771fd82bc0a -SIZE (tux3-qTox-v1.3.0_GH0.tar.gz) = 4679256 +SHA256 (tux3-qTox-v1.4.0_GH0.tar.gz) = f869aafddb597286dc03b828b48e2560a97983f180914c396fdcf2f1ca07ae79 +SIZE (tux3-qTox-v1.4.0_GH0.tar.gz) = 3021956 Index: head/net-im/qTox/files/patch-qtox.pro =================================================================== --- head/net-im/qTox/files/patch-qtox.pro (revision 414127) +++ head/net-im/qTox/files/patch-qtox.pro (revision 414128) @@ -1,21 +1,35 @@ ---- qtox.pro.orig 2015-06-12 10:53:59 UTC +--- qtox.pro.orig 2016-04-24 12:44:18 UTC +++ qtox.pro -@@ -483,6 +483,18 @@ SOURCES += \ - src/widget/translator.cpp \ - src/persistence/settingsserializer.cpp +@@ -49,11 +49,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 +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 414127) +++ head/net-im/qTox/files/patch-src_main.cpp (revision 414128) @@ -1,13 +1,13 @@ ---- src/main.cpp.orig 2015-11-14 22:51:30 UTC +--- src/main.cpp.orig 2016-04-24 12:44:18 UTC +++ src/main.cpp -@@ -269,3 +269,10 @@ int main(int argc, char *argv[]) - qDebug() << "Clean exit with status"< #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 414127) +++ head/net-im/qTox/files/patch-src_video_cameradevice.cpp (revision 414128) @@ -1,65 +1,65 @@ ---- src/video/cameradevice.cpp.orig 2015-11-15 08:11:58 UTC +--- src/video/cameradevice.cpp.orig 2016-04-24 12:44:18 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 -@@ -105,7 +105,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; -@@ -142,7 +142,7 @@ CameraDevice* CameraDevice::open(QString +@@ -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); -@@ -264,7 +264,7 @@ QVector> CameraD +@@ -311,7 +311,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 -@@ -307,7 +307,7 @@ QVector CameraDevice::getVide +@@ -358,7 +358,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 -@@ -327,7 +327,7 @@ bool CameraDevice::getDefaultInputFormat +@@ -400,7 +400,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 -@@ -335,7 +335,7 @@ bool CameraDevice::getDefaultInputFormat +@@ -408,7 +408,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_widget_form_settings_aboutsettings.ui =================================================================== --- head/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui (nonexistent) +++ head/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui (revision 414128) @@ -0,0 +1,12 @@ +--- src/widget/form/settings/aboutsettings.ui.orig 2016-04-25 21:28:44 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> + ++ ++ false ++ + + true + Property changes on: head/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui ___________________________________________________________________ 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/pkg-descr =================================================================== --- head/net-im/qTox/pkg-descr (revision 414127) +++ head/net-im/qTox/pkg-descr (revision 414128) @@ -1,3 +1,4 @@ -qTox is a graphical user interface for Tox written using Qt 5. +Powerful Tox chat client written using Qt 5 that follows the Tox +design guidelines. WWW: https://github.com/tux3/qTox