Date: Wed, 30 Oct 2019 20:07:39 +0000 (UTC) From: Joe Marcus Clarke <marcus@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516103 - head/net/wireshark/files Message-ID: <201910302007.x9UK7dq9060657@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Wed Oct 30 20:07:39 2019 New Revision: 516103 URL: https://svnweb.freebsd.org/changeset/ports/516103 Log: Attempt to fix the build when zstd is present. Apparently, zstd is silently consumed by QT when installed. This breaks reprdoducible builds of wireshark, but I see no other solution if QT can and will use zstd compression. PR: 241548 Added: head/net/wireshark/files/patch-ui_qt_CMakeLists.txt (contents, props changed) Added: head/net/wireshark/files/patch-ui_qt_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/wireshark/files/patch-ui_qt_CMakeLists.txt Wed Oct 30 20:07:39 2019 (r516103) @@ -0,0 +1,20 @@ +--- ui/qt/CMakeLists.txt.orig 2019-10-30 19:49:29 UTC ++++ ui/qt/CMakeLists.txt +@@ -595,14 +595,14 @@ set(CMAKE_AUTOMOC TRUE) + set(CMAKE_AUTOUIC TRUE) + set(CMAKE_AUTORCC TRUE) + +-if(NOT Qt5Widgets_VERSION VERSION_LESS "5.9") ++#if(NOT Qt5Widgets_VERSION VERSION_LESS "5.9") + # Drop the file modification time of source files from generated files + # to help with reproducible builds. We do not use QFileInfo.lastModified + # so this has no unwanted side effects. This mtime started appearing in + # Qt 5.8. The option to force the old file format without mtime was + # added in Qt 5.9. See https://bugreports.qt.io/browse/QTBUG-58769 +- set(CMAKE_AUTORCC_OPTIONS --format-version 1) +-endif() ++ # set(CMAKE_AUTORCC_OPTIONS --format-version 1) ++ #endif() + + QT5_ADD_TRANSLATION(WIRESHARK_QT_QM ${WIRESHARK_QT_TS}) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910302007.x9UK7dq9060657>