Page MenuHomeFreeBSD
Files F171756288

D9462.id24804.diff
No OneTemporary
Actions

D9462.id24804.diff
View Options

Index: net-im/qTox/Makefile
===================================================================
--- net-im/qTox/Makefile
+++ net-im/qTox/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= qTox
-PORTVERSION= 1.7.1
+PORTVERSION= 1.8.1
DISTVERSIONPREFIX= v
CATEGORIES= net-im net-p2p
@@ -35,8 +35,9 @@
USE_GL= gl
USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \
concurrent buildtools_build linguisttools_build
+INSTALLS_ICONS= yes
ICON_SIZES= 14x14 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512
-QMAKE_ARGS= FREEBSD_PKGVERSION=${PKGVERSION}
+QMAKE_ARGS= FREEBSD_PKGVERSION=${FULLVERSION}
PLIST_FILES= bin/qtox \
share/applications/qTox.desktop \
@@ -52,6 +53,12 @@
CFLAGS+= -march=i586
.endif
+.if !defined(GH_TAGNAME)
+FULLVERSION= ${PKGVERSION}
+.else
+FULLVERSION= "${PKGVERSION} (rev.${GH_TAGNAME})"
+.endif
+
pre-everything::
@${ECHO_MSG}
@${ECHO_MSG} "Warning: qTox won't build if the option NaCl was selected for Tox!"
@@ -59,13 +66,10 @@
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
+ -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},' \
@@ -73,7 +77,7 @@
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
+ @${GZIP_CMD} < ${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 \
Index: net-im/qTox/distinfo
===================================================================
--- net-im/qTox/distinfo
+++ net-im/qTox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483083785
-SHA256 (qTox-qTox-v1.7.1_GH0.tar.gz) = 0d2a94be6f470e64f2722d261b9294b6ecc3418e374c47f722ca1a24058486e8
-SIZE (qTox-qTox-v1.7.1_GH0.tar.gz) = 3563251
+TIMESTAMP = 1486369731
+SHA256 (qTox-qTox-v1.8.1_GH0.tar.gz) = 32837b5f824b6987a68f9211f93a7ec32b892be895605012d35784d702f13d6c
+SIZE (qTox-qTox-v1.8.1_GH0.tar.gz) = 3594727
Index: net-im/qTox/files/patch-qtox.pro
===================================================================
--- net-im/qTox/files/patch-qtox.pro
+++ net-im/qTox/files/patch-qtox.pro
@@ -1,6 +1,6 @@
---- qtox.pro.orig 2016-12-25 17:46:01 UTC
+--- qtox.pro.orig 2017-01-29 12:48:48 UTC
+++ qtox.pro
-@@ -68,11 +68,11 @@ include(translations/i18n.pri)
+@@ -75,11 +75,11 @@ include(translations/i18n.pri)
system($$fromfile(translations/i18n.pri, updateallqm))
isEmpty(GIT_VERSION) {
@@ -14,10 +14,10 @@
}
DEFINES += GIT_DESCRIBE=\"\\\"$$quote($$GIT_DESCRIBE)\\\"\"
# date works on linux/mac, but it would hangs qmake on windows
-@@ -510,3 +510,15 @@ SOURCES += \
- src/widget/form/groupinviteform.cpp \
- src/widget/tool/profileimporter.cpp \
- src/widget/passwordedit.cpp
+@@ -663,3 +663,15 @@ SOURCES += \
+ src/widget/tool/toolboxgraphicsitem.cpp \
+ src/widget/translator.cpp \
+ src/widget/widget.cpp
+
+unix {
+ target.path = $$PREFIX/bin
Index: net-im/qTox/files/patch-src_main.cpp
===================================================================
--- net-im/qTox/files/patch-src_main.cpp
+++ net-im/qTox/files/patch-src_main.cpp
@@ -1,4 +1,4 @@
---- src/main.cpp.orig 2016-12-25 17:46:01 UTC
+--- src/main.cpp.orig 2017-01-29 12:48:48 UTC
+++ src/main.cpp
@@ -317,3 +317,10 @@ int main(int argc, char *argv[])
#endif
Index: net-im/qTox/files/patch-src_video_videomode.cpp
===================================================================
--- net-im/qTox/files/patch-src_video_videomode.cpp
+++ net-im/qTox/files/patch-src_video_videomode.cpp
@@ -1,4 +1,4 @@
---- src/video/videomode.cpp.orig 2016-12-25 17:46:01 UTC
+--- src/video/videomode.cpp.orig 2017-01-29 12:48:48 UTC
+++ src/video/videomode.cpp
@@ -18,6 +18,7 @@
*/
Index: net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui
===================================================================
--- net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui
+++ net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui
@@ -1,4 +1,4 @@
---- src/widget/form/settings/aboutsettings.ui.orig 2016-12-25 17:46:01 UTC
+--- src/widget/form/settings/aboutsettings.ui.orig 2017-01-29 12:48:48 UTC
+++ src/widget/form/settings/aboutsettings.ui
@@ -111,6 +111,9 @@
<property name="text">

File Metadata

Mime Type
text/plain
Expires
Mon, Sep 14, 7:35 AM (17 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38894474
Default Alt Text
D9462.id24804.diff (5 KB)

Event Timeline