svn commit: r446146 - in head/net-im/qTox: . files
Tobias C. Berner
tcberner at FreeBSD.org
Tue Jul 18 16:41:58 UTC 2017
Author: tcberner
Date: Tue Jul 18 16:41:57 2017
New Revision: 446146
URL: https://svnweb.freebsd.org/changeset/ports/446146
Log:
net-im/qTox: Update to 1.11.0
PR: 220814
Submitted by: Yuri Victorovich <yuri at rawbw.com> (maintainer)
Added:
head/net-im/qTox/files/patch-CMakeLists.txt (contents, props changed)
Deleted:
head/net-im/qTox/files/patch-qtox.pro
Modified:
head/net-im/qTox/Makefile
head/net-im/qTox/distinfo
head/net-im/qTox/files/patch-src_main.cpp
Modified: head/net-im/qTox/Makefile
==============================================================================
--- head/net-im/qTox/Makefile Tue Jul 18 16:39:27 2017 (r446145)
+++ head/net-im/qTox/Makefile Tue Jul 18 16:41:57 2017 (r446146)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= qTox
-PORTVERSION= 1.10.2
+PORTVERSION= 1.11.0
DISTVERSIONPREFIX= v
CATEGORIES= net-im net-p2p
@@ -18,6 +18,7 @@ LIB_DEPENDS= libtoxcore.so:net-im/tox \
libavcodec.so:multimedia/ffmpeg \
libvpx.so:multimedia/libvpx \
libfilteraudio.so:audio/libfilteraudio \
+ libopus.so:audio/opus \
libsodium.so:security/libsodium \
libqrencode.so:graphics/libqrencode \
libsqlcipher.so:databases/sqlcipher \
@@ -29,19 +30,22 @@ GH_ACCOUNT= qTox
SUB_FILES= pkg-message
-USES= compiler:c++11-lib desktop-file-utils gettext gmake openal:soft pkgconfig qmake
+USES= compiler:c++11-lib desktop-file-utils gettext openal:soft pkgconfig cmake
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 \
+USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg testlib \
concurrent buildtools_build linguisttools_build
+# bug#220813: qmake isn't needed, but the build fails without qmake_build
+USE_QT5+= qmake_build
+CMAKE_ARGS= -DGIT_DESCRIBE:STRING=${FULLVERSION}
INSTALLS_ICONS= yes
ICON_SIZES= 14x14 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512
-QMAKE_ARGS= FREEBSD_PKGVERSION=${FULLVERSION}
PLIST_FILES= bin/qtox \
share/applications/qtox.desktop \
- share/icons/hicolor/scalable/apps/qtox.svgz
+ share/icons/hicolor/scalable/apps/qtox.svgz \
+ share/appdata/qTox.appdata.xml
.for SZ in ${ICON_SIZES}
PLIST_FILES+= share/icons/hicolor/${SZ}/apps/qtox.png
.endfor
@@ -64,20 +68,16 @@ pre-everything::
@${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}"|' \
- -e 's|INCLUDEPATH += "/usr/include|INCLUDEPATH += "${LOCALBASE}/include|' \
- -e 's|INCLUDEPATH += "/usr/lib64|INCLUDEPATH += "${LOCALBASE}/lib|' \
- -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} < ${WRKSRC}/img/icons/qtox.svg > ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qtox.svgz
+ @${GZIP_CMD} \
+ < ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qtox.svg \
+ > ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qtox.svgz
+ @${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qtox.svg
.for SZ in ${ICON_SIZES}
@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}/apps
${INSTALL_DATA} ${WRKSRC}/img/icons/${SZ}/qtox.png \
Modified: head/net-im/qTox/distinfo
==============================================================================
--- head/net-im/qTox/distinfo Tue Jul 18 16:39:27 2017 (r446145)
+++ head/net-im/qTox/distinfo Tue Jul 18 16:41:57 2017 (r446146)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496411551
-SHA256 (qTox-qTox-v1.10.2_GH0.tar.gz) = 1709ba412149781fc922c0807fddbf36af355e59a8cb4454b568fa739b2a5e80
-SIZE (qTox-qTox-v1.10.2_GH0.tar.gz) = 3647721
+TIMESTAMP = 1500321399
+SHA256 (qTox-qTox-v1.11.0_GH0.tar.gz) = be38517cd915727dbd9b3cd2a51bbaf1cae28290de07a34c759ec8b77c502cd4
+SIZE (qTox-qTox-v1.11.0_GH0.tar.gz) = 3946782
Added: head/net-im/qTox/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/qTox/files/patch-CMakeLists.txt Tue Jul 18 16:41:57 2017 (r446146)
@@ -0,0 +1,26 @@
+--- CMakeLists.txt.orig 2017-07-16 12:33:33 UTC
++++ CMakeLists.txt
+@@ -16,15 +16,15 @@ endif()
+ set(ENV{PKG_CONFIG_PATH}
+ ${CMAKE_SOURCE_DIR}/libs/lib/pkgconfig:/opt/ffmpeg/lib/pkgconfig:$ENV{PKG_CONFIG_PATH})
+
+-execute_process(
+- COMMAND brew --prefix qt5
+- OUTPUT_VARIABLE QT_PREFIX_PATH
+- OUTPUT_STRIP_TRAILING_WHITESPACE)
++#execute_process(
++# COMMAND brew --prefix qt5
++# OUTPUT_VARIABLE QT_PREFIX_PATH
++# OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+-execute_process(
+- COMMAND xcode-select -p
+- OUTPUT_VARIABLE CMAKE_OSX_SYSROOT
+- OUTPUT_STRIP_TRAILING_WHITESPACE)
++#execute_process(
++# COMMAND xcode-select -p
++# OUTPUT_VARIABLE CMAKE_OSX_SYSROOT
++# OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12)
+ set(CMAKE_OSX_SYSROOT
Modified: head/net-im/qTox/files/patch-src_main.cpp
==============================================================================
--- head/net-im/qTox/files/patch-src_main.cpp Tue Jul 18 16:39:27 2017 (r446145)
+++ head/net-im/qTox/files/patch-src_main.cpp Tue Jul 18 16:41:57 2017 (r446146)
@@ -1,7 +1,7 @@
---- src/main.cpp.orig 2017-01-29 12:48:48 UTC
+--- src/main.cpp.orig 2017-07-16 12:33:33 UTC
+++ src/main.cpp
-@@ -317,3 +317,10 @@ int main(int argc, char *argv[])
- #endif
+@@ -322,3 +322,10 @@ int main(int argc, char* argv[])
+ delete a;
return errorcode;
}
+
More information about the svn-ports-all
mailing list