From owner-svn-ports-all@freebsd.org Wed Oct 30 20:07:39 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D9F2915FCBD; Wed, 30 Oct 2019 20:07:39 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 473KHv5HTxz4WYG; Wed, 30 Oct 2019 20:07:39 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 944F6F849; Wed, 30 Oct 2019 20:07:39 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9UK7dfO060658; Wed, 30 Oct 2019 20:07:39 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9UK7dq9060657; Wed, 30 Oct 2019 20:07:39 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201910302007.x9UK7dq9060657@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Wed, 30 Oct 2019 20:07:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516103 - head/net/wireshark/files X-SVN-Group: ports-head X-SVN-Commit-Author: marcus X-SVN-Commit-Paths: head/net/wireshark/files X-SVN-Commit-Revision: 516103 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2019 20:07:39 -0000 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}) +