From owner-svn-ports-all@freebsd.org Sat Sep 1 15:22:39 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E991FF267F; Sat, 1 Sep 2018 15:22:39 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 38DE77017A; Sat, 1 Sep 2018 15:22:39 +0000 (UTC) (envelope-from jhale@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 33AF54406; Sat, 1 Sep 2018 15:22:39 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w81FMcnT010052; Sat, 1 Sep 2018 15:22:38 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w81FMcq4010051; Sat, 1 Sep 2018 15:22:38 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201809011522.w81FMcq4010051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Sat, 1 Sep 2018 15:22:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478704 - in head/games/multimc: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: in head/games/multimc: . files X-SVN-Commit-Revision: 478704 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.27 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: Sat, 01 Sep 2018 15:22:39 -0000 Author: jhale Date: Sat Sep 1 15:22:38 2018 New Revision: 478704 URL: https://svnweb.freebsd.org/changeset/ports/478704 Log: Fix build with Qt 5.11 Qt buildtools and qmake should only be in BUILD_DEPENDS Bump PORTREVISION for dependency change PR: 230884 Obtained from: upstream Added: head/games/multimc/files/patch-git_4d68c1b (contents, props changed) Modified: head/games/multimc/Makefile Modified: head/games/multimc/Makefile ============================================================================== --- head/games/multimc/Makefile Sat Sep 1 14:55:42 2018 (r478703) +++ head/games/multimc/Makefile Sat Sep 1 15:22:38 2018 (r478704) @@ -2,6 +2,7 @@ PORTNAME= multimc DISTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= games java MAINTAINER= me@tsundoku.ne.jp @@ -20,7 +21,8 @@ GH_TUPLE= MultiMC:libnbtplusplus:508eda8:libnbtplusplu MultiMC:quazip:3691d57:quazip/libraries/quazip USE_LDCONFIG= yes USE_JAVA= 1.8+ -USE_QT= buildtools core concurrent gui network qmake testlib_build widgets xml +USE_QT= core concurrent gui network testlib_build widgets xml \ + buildtools_build qmake_build CMAKE_ARGS= -DMultiMC_LAYOUT="lin-system" CMAKE_OFF= MultiMC_UPDATER Added: head/games/multimc/files/patch-git_4d68c1b ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/multimc/files/patch-git_4d68c1b Sat Sep 1 15:22:38 2018 (r478704) @@ -0,0 +1,199 @@ +From 4d68c1b509cd289e9f02cbf258e69f2539349029 Mon Sep 17 00:00:00 2001 +From: Sergey Shatunov +Date: Fri, 1 Jun 2018 21:20:33 +0700 +Subject: [PATCH] GH-2291 Fix build with Qt 5.11+ + +--- api/gui/CMakeLists.txt.orig 2018-04-08 21:43:03 UTC ++++ api/gui/CMakeLists.txt +@@ -21,8 +21,7 @@ set_target_properties(MultiMC_gui PROPERTIES CXX_VISIB + generate_export_header(MultiMC_gui) + + # Link +-target_link_libraries(MultiMC_gui MultiMC_iconfix MultiMC_logic) +-qt5_use_modules(MultiMC_gui Gui) ++target_link_libraries(MultiMC_gui MultiMC_iconfix MultiMC_logic Qt5::Gui) + + # Mark and export headers + target_include_directories(MultiMC_gui PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") +--- api/logic/CMakeLists.txt.orig 2018-04-08 21:43:03 UTC ++++ api/logic/CMakeLists.txt +@@ -476,7 +476,7 @@ generate_export_header(MultiMC_logic) + + # Link + target_link_libraries(MultiMC_logic xz-embedded MultiMC_unpack200 systeminfo MultiMC_quazip MultiMC_classparser ${NBT_NAME} ${ZLIB_LIBRARIES}) +-qt5_use_modules(MultiMC_logic Core Xml Network Concurrent) ++target_link_libraries(MultiMC_logic Qt5::Core Qt5::Xml Qt5::Network Qt5::Concurrent) + + # Mark and export headers + target_include_directories(MultiMC_logic PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" PRIVATE "${ZLIB_INCLUDE_DIRS}") +--- application/dialogs/NotificationDialog.cpp.orig 2018-04-08 21:43:03 UTC ++++ application/dialogs/NotificationDialog.cpp +@@ -2,6 +2,7 @@ + #include "ui_NotificationDialog.h" + + #include ++#include + + NotificationDialog::NotificationDialog(const NotificationChecker::NotificationEntry &entry, QWidget *parent) : + QDialog(parent, Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint | Qt::CustomizeWindowHint), +--- application/pages/global/ExternalToolsPage.cpp.orig 2018-04-08 21:43:03 UTC ++++ application/pages/global/ExternalToolsPage.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "settings/SettingsObject.h" + #include "tools/BaseProfiler.h" +--- application/pages/global/JavaPage.cpp.orig 2018-04-08 21:43:03 UTC ++++ application/pages/global/JavaPage.cpp +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "dialogs/VersionSelectDialog.h" + +--- application/pages/global/MinecraftPage.cpp.orig 2018-04-08 21:43:03 UTC ++++ application/pages/global/MinecraftPage.cpp +@@ -18,6 +18,7 @@ + + #include + #include ++#include + + #include "settings/SettingsObject.h" + #include "MultiMC.h" +--- application/pages/global/PasteEEPage.cpp.orig 2018-04-08 21:43:03 UTC ++++ application/pages/global/PasteEEPage.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "settings/SettingsObject.h" + #include "tools/BaseProfiler.h" +--- application/pages/global/ProxyPage.cpp.orig 2018-04-08 21:43:03 UTC ++++ application/pages/global/ProxyPage.cpp +@@ -16,6 +16,8 @@ + #include "ProxyPage.h" + #include "ui_ProxyPage.h" + ++#include ++ + #include "settings/SettingsObject.h" + #include "MultiMC.h" + +--- application/pages/instance/NotesPage.cpp.orig 2018-04-08 21:43:03 UTC ++++ application/pages/instance/NotesPage.cpp +@@ -1,5 +1,6 @@ + #include "NotesPage.h" + #include "ui_NotesPage.h" ++#include + + NotesPage::NotesPage(BaseInstance *inst, QWidget *parent) + : QWidget(parent), ui(new Ui::NotesPage), m_inst(inst) +--- application/pages/modplatform/ImportPage.cpp.orig 2018-04-08 21:43:03 UTC ++++ application/pages/modplatform/ImportPage.cpp +@@ -7,6 +7,7 @@ + #include "dialogs/ProgressDialog.h" + #include "dialogs/NewInstanceDialog.h" + #include ++#include + #include + + class UrlValidator : public QValidator +--- application/pages/modplatform/VanillaPage.cpp.orig 2018-04-08 21:43:03 UTC ++++ application/pages/modplatform/VanillaPage.cpp +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + VanillaPage::VanillaPage(NewInstanceDialog *dialog, QWidget *parent) + : QWidget(parent), dialog(dialog), ui(new Ui::VanillaPage) +--- cmake/UnitTest.cmake.orig 2018-04-08 21:43:03 UTC ++++ cmake/UnitTest.cmake +@@ -7,7 +7,7 @@ message(${TEST_RESOURCE_PATH}) + function(add_unit_test name) + set(options "") + set(oneValueArgs DATA) +- set(multiValueArgs SOURCES LIBS QT) ++ set(multiValueArgs SOURCES LIBS) + + cmake_parse_arguments(OPT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) + +@@ -40,8 +40,7 @@ function(add_unit_test name) + endif() + endif() + +- target_link_libraries(${name}_test ${OPT_LIBS}) +- qt5_use_modules(${name}_test Test ${OPT_QT}) ++ target_link_libraries(${name}_test Qt5::Test ${OPT_LIBS}) + + target_include_directories(${name}_test PRIVATE "${TEST_RESOURCE_PATH}/UnitTest/") + +--- libraries/LocalPeer/CMakeLists.txt.orig 2018-04-08 21:43:03 UTC ++++ libraries/LocalPeer/CMakeLists.txt +@@ -26,4 +26,4 @@ endif() + add_library(LocalPeer STATIC ${SINGLE_SOURCES}) + target_include_directories(LocalPeer PUBLIC include) + +-qt5_use_modules(LocalPeer Core Network) ++target_link_libraries(LocalPeer Qt5::Core Qt5::Network) +--- libraries/classparser/CMakeLists.txt.orig 2018-04-08 21:43:03 UTC ++++ libraries/classparser/CMakeLists.txt +@@ -38,5 +38,4 @@ add_definitions(-DCLASSPARSER_LIBRARY) + + add_library(MultiMC_classparser STATIC ${CLASSPARSER_SOURCES} ${CLASSPARSER_HEADERS}) + target_include_directories(MultiMC_classparser PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +-target_link_libraries(MultiMC_classparser MultiMC_quazip) +-qt5_use_modules(MultiMC_classparser Core) ++target_link_libraries(MultiMC_classparser MultiMC_quazip Qt5::Core) +--- libraries/ganalytics/CMakeLists.txt.orig 2018-04-08 21:43:03 UTC ++++ libraries/ganalytics/CMakeLists.txt +@@ -12,6 +12,6 @@ include/ganalytics.h + ) + + add_library(ganalytics STATIC ${ganalytics_SOURCES}) +-qt5_use_modules(ganalytics Core Gui Network) ++target_link_libraries(ganalytics Qt5::Core Qt5::Gui Qt5::Network) + target_include_directories(ganalytics PUBLIC include) + target_link_libraries(ganalytics systeminfo) +--- libraries/iconfix/CMakeLists.txt.orig 2018-04-08 21:43:03 UTC ++++ libraries/iconfix/CMakeLists.txt +@@ -15,7 +15,7 @@ internal/qiconloader_p.h + add_library(MultiMC_iconfix SHARED ${ICONFIX_SOURCES}) + target_include_directories(MultiMC_iconfix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}" ) + +-qt5_use_modules(MultiMC_iconfix Core Widgets) ++target_link_libraries(MultiMC_iconfix Qt5::Core Qt5::Widgets) + + set_target_properties(MultiMC_iconfix PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1) + generate_export_header(MultiMC_iconfix) +--- libraries/rainbow/CMakeLists.txt.orig 2018-04-08 21:43:03 UTC ++++ libraries/rainbow/CMakeLists.txt +@@ -12,7 +12,7 @@ add_definitions(-DRAINBOW_LIBRARY) + add_library(MultiMC_rainbow SHARED ${RAINBOW_SOURCES}) + target_include_directories(MultiMC_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") + +-qt5_use_modules(MultiMC_rainbow Core Gui) ++target_link_libraries(MultiMC_rainbow Qt5::Core Qt5::Gui) + + # Install it + install( +--- libraries/systeminfo/CMakeLists.txt.orig 2018-04-08 21:43:03 UTC ++++ libraries/systeminfo/CMakeLists.txt +@@ -19,7 +19,7 @@ elseif (UNIX) + endif() + + add_library(systeminfo STATIC ${systeminfo_SOURCES}) +-qt5_use_modules(systeminfo Core Gui Network) ++target_link_libraries(systeminfo Qt5::Core Qt5::Gui Qt5::Network) + target_include_directories(systeminfo PUBLIC include) + + include (UnitTest)