Date: Fri, 16 Apr 2021 18:31:38 GMT From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6664a69db471 - main - net/wireguard: fix build with CMake 3.20 Message-ID: <202104161831.13GIVcKG093186@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=6664a69db4711435aaea44b8840c108ea63d2763 commit 6664a69db4711435aaea44b8840c108ea63d2763 Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2021-04-15 19:29:30 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2021-04-16 18:31:05 +0000 net/wireguard: fix build with CMake 3.20 Picked from upstream https://gitlab.com/wireshark/wireshark/-/commit/6ef6e8f607456e239e5f1a326803846930d34fa8 and then `make makepatch`ed in. --- net/wireshark/Makefile | 2 +- net/wireshark/files/patch-CMakeLists.txt | 13 +++++++++++++ net/wireshark/files/patch-doc_CMakeLists.txt | 6 +++--- net/wireshark/files/patch-ui_qt_CMakeLists.txt | 25 +++++++++---------------- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 735b73c1c27e..7269d101fd2a 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -2,7 +2,7 @@ PORTNAME?= wireshark PORTVERSION= 3.4.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ diff --git a/net/wireshark/files/patch-CMakeLists.txt b/net/wireshark/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..c13394013648 --- /dev/null +++ b/net/wireshark/files/patch-CMakeLists.txt @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2021-04-15 19:26:54 UTC ++++ CMakeLists.txt +@@ -1083,6 +1083,10 @@ ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD) + + # Build the Qt GUI? + if(BUILD_wireshark) ++ set(CMAKE_AUTOMOC ON) ++ set(CMAKE_AUTOUIC ON) ++ set(CMAKE_AUTORCC ON) ++ + # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten + # somewhere. The if WIN32 in this place is annoying as well. + if(WIN32) diff --git a/net/wireshark/files/patch-doc_CMakeLists.txt b/net/wireshark/files/patch-doc_CMakeLists.txt index c70bfddb548f..fc2e52b1d1f6 100644 --- a/net/wireshark/files/patch-doc_CMakeLists.txt +++ b/net/wireshark/files/patch-doc_CMakeLists.txt @@ -1,6 +1,6 @@ ---- doc/CMakeLists.txt.orig 2019-03-05 00:29:38 UTC +--- doc/CMakeLists.txt.orig 2021-04-15 19:26:54 UTC +++ doc/CMakeLists.txt -@@ -225,12 +225,12 @@ install( +@@ -221,12 +221,12 @@ install( ${CMAKE_INSTALL_MANDIR}/man4 ) @@ -18,4 +18,4 @@ +#) # - # Editor modelines - http://www.wireshark.org/tools/modelines.html + # Editor modelines - https://www.wireshark.org/tools/modelines.html diff --git a/net/wireshark/files/patch-ui_qt_CMakeLists.txt b/net/wireshark/files/patch-ui_qt_CMakeLists.txt index fb179414b4e2..712144d68d39 100644 --- a/net/wireshark/files/patch-ui_qt_CMakeLists.txt +++ b/net/wireshark/files/patch-ui_qt_CMakeLists.txt @@ -1,20 +1,13 @@ ---- ui/qt/CMakeLists.txt.orig 2019-10-30 19:49:29 UTC +--- ui/qt/CMakeLists.txt.orig 2021-04-15 19:26:54 UTC +++ ui/qt/CMakeLists.txt -@@ -595,14 +595,14 @@ set(CMAKE_AUTOMOC TRUE) - set(CMAKE_AUTOUIC TRUE) - set(CMAKE_AUTORCC TRUE) +@@ -631,10 +631,6 @@ include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ) --if(NOT Qt5Widgets_VERSION VERSION_LESS "5.9") -+#if(NOT Qt5Widgets_VERSION VERSION_LESS "5.9") +-set(CMAKE_AUTOMOC TRUE) +-set(CMAKE_AUTOUIC TRUE) +-set(CMAKE_AUTORCC TRUE) +- + 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?202104161831.13GIVcKG093186>