diff options
| author | jkim <jkim@FreeBSD.org> | 2017-01-19 14:36:46 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2017-01-19 14:36:46 +0800 |
| commit | bb0c23fd5d5650e429ee116330dc3d2149251fb5 (patch) | |
| tree | a2ed0e79938e033fc0b8bed3b47449c6aa886e8d /emulators/virtualbox-ose | |
| parent | 433948b4688a7112ff447104bc740ec58df7f423 (diff) | |
| download | freebsd-ports-gnome-bb0c23fd5d5650e429ee116330dc3d2149251fb5.tar.gz freebsd-ports-gnome-bb0c23fd5d5650e429ee116330dc3d2149251fb5.tar.zst freebsd-ports-gnome-bb0c23fd5d5650e429ee116330dc3d2149251fb5.zip | |
Fix build with QT4.
Reported by: ler
Tested by: ler
Diffstat (limited to 'emulators/virtualbox-ose')
3 files changed, 24 insertions, 0 deletions
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 26bf6371fdfc..32f74a21fc0d 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -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 diff --git a/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderAdditions.cpp b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderAdditions.cpp new file mode 100644 index 000000000000..23ac13f74c7c --- /dev/null +++ b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderAdditions.cpp @@ -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]; diff --git a/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderExtensionPack.cpp b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderExtensionPack.cpp new file mode 100644 index 000000000000..ab47ece4df6d --- /dev/null +++ b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderExtensionPack.cpp @@ -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]; |