Attachment 184459 Details for Bug 220814 – patch

[patch] patch

qTox.patch (text/plain), 7.81 KB, created by Yuri Victorovich on 2017-07-18 02:45:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2017-07-18 02:45:09 UTC

Size: 7.81 KB

patch

obsolete

>Index: net-im/qTox/Makefile
>===================================================================
>--- net-im/qTox/Makefile	(revision 446121)
>+++ net-im/qTox/Makefile	(working copy)
>@@ -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 @@
> 		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 @@
> 
> 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,13 +68,6 @@
> 	@${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
>@@ -77,7 +74,10 @@
> 
> 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 \
>Index: net-im/qTox/distinfo
>===================================================================
>--- net-im/qTox/distinfo	(revision 446121)
>+++ net-im/qTox/distinfo	(working copy)
>@@ -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
>Index: net-im/qTox/files/patch-CMakeLists.txt
>===================================================================
>--- net-im/qTox/files/patch-CMakeLists.txt	(nonexistent)
>+++ net-im/qTox/files/patch-CMakeLists.txt	(working copy)
>@@ -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
>
>Property changes on: net-im/qTox/files/patch-CMakeLists.txt
>___________________________________________________________________
>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: net-im/qTox/files/patch-qtox.pro
>===================================================================
>--- net-im/qTox/files/patch-qtox.pro	(revision 446121)
>+++ net-im/qTox/files/patch-qtox.pro	(nonexistent)
>@@ -1,32 +0,0 @@
>---- qtox.pro.orig	2017-01-29 12:48:48 UTC
>-+++ qtox.pro
>-@@ -75,11 +75,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
>-@@ -663,3 +663,15 @@ SOURCES += \
>-     src/widget/tool/toolboxgraphicsitem.cpp \
>-     src/widget/translator.cpp \
>-     src/widget/widget.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
>-+}
>
>Property changes on: net-im/qTox/files/patch-qtox.pro
>___________________________________________________________________
>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: net-im/qTox/files/patch-src_main.cpp
>===================================================================
>--- net-im/qTox/files/patch-src_main.cpp	(revision 446121)
>+++ net-im/qTox/files/patch-src_main.cpp	(working copy)
>@@ -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;
>  }
> +
>Index: net-im/qTox/files/patch-src_video_videomode.cpp
>===================================================================
>--- net-im/qTox/files/patch-src_video_videomode.cpp	(revision 446121)
>+++ net-im/qTox/files/patch-src_video_videomode.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- src/video/videomode.cpp.orig	2017-01-29 12:48:48 UTC
>+--- src/video/videomode.cpp.orig	2017-07-16 12:33:33 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	(revision 446121)
>+++ net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui	(working copy)
>@@ -1,4 +1,4 @@
>---- src/widget/form/settings/aboutsettings.ui.orig	2017-01-29 12:48:48 UTC
>+--- src/widget/form/settings/aboutsettings.ui.orig	2017-07-16 12:33:33 UTC
> +++ src/widget/form/settings/aboutsettings.ui
> @@ -111,6 +111,9 @@
>              <property name="text">

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 220814: 184459