svn commit: r431852 - in head/emulators/virtualbox-ose: . files

[Jung-uk Kim]

Author: jkim
Date: Thu Jan 19 06:36:46 2017
New Revision: 431852
URL: https://svnweb.freebsd.org/changeset/ports/431852

Log:
  Fix build with QT4.
  
  Reported by:	ler
  Tested by:	ler

Added:
  head/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderAdditions.cpp   (contents, props changed)
  head/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderExtensionPack.cpp   (contents, props changed)
Modified:
  head/emulators/virtualbox-ose/Makefile

Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile	Thu Jan 19 05:39:23 2017	(r431851)
+++ head/emulators/virtualbox-ose/Makefile	Thu Jan 19 06:36:46 2017	(r431852)
@@ -169,6 +169,8 @@ VBOX_PROGS+=	VirtualBox
 VBOX_UTILS+=	VBoxTestOGL
 VBOX_WITH_QT=	1
 .if ${PORT_OPTIONS:MQT4}
+EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderAdditions.cpp \
+		${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderExtensionPack.cpp
 CONFIGURE_ARGS+=	--enable-qt4
 USE_QT4=	corelib gui linguist_build moc_build network opengl
 USE_QT4+=	rcc_build uic_build

Added: head/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderAdditions.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderAdditions.cpp	Thu Jan 19 06:36:46 2017	(r431852)
@@ -0,0 +1,11 @@
+--- src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp.orig	2017-01-17 07:26:50 UTC
++++ src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp
+@@ -143,7 +143,7 @@ void UIDownloaderAdditions::handleVerifi
+         {
+             const QString strFileName = strRecord.section(" *", 1);
+             const QString strDownloadedSumm = strRecord.section(" *", 0, 0);
+-            if (strFileName == source().fileName())
++            if (strFileName == QFileInfo(source().toString()).fileName())
+             {
+                 /* Calc the SHA-256 on the bytes, creating a string: */
+                 uint8_t abHash[RTSHA256_HASH_SIZE];

Added: head/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderExtensionPack.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderExtensionPack.cpp	Thu Jan 19 06:36:46 2017	(r431852)
@@ -0,0 +1,11 @@
+--- src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp.orig	2017-01-17 07:26:50 UTC
++++ src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp
+@@ -127,7 +127,7 @@ void UIDownloaderExtensionPack::handleVe
+         {
+             const QString strFileName = strRecord.section(" *", 1);
+             const QString strDownloadedSumm = strRecord.section(" *", 0, 0);
+-            if (strFileName == source().fileName())
++            if (strFileName == QFileInfo(source().toString()).fileName())
+             {
+                 /* Calc the SHA-256 on the bytes, creating a string: */
+                 uint8_t abHash[RTSHA256_HASH_SIZE];