From owner-svn-ports-head@freebsd.org Fri Jul 20 20:46:11 2018 Return-Path: Delivered-To: svn-ports-head@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 4C02C1051FDC; Fri, 20 Jul 2018 20:46:11 +0000 (UTC) (envelope-from tcberner@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 EDE868C934; Fri, 20 Jul 2018 20:46:10 +0000 (UTC) (envelope-from tcberner@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 CF423153C1; Fri, 20 Jul 2018 20:46:10 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6KKkAZV097509; Fri, 20 Jul 2018 20:46:10 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6KKkArD097507; Fri, 20 Jul 2018 20:46:10 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201807202046.w6KKkArD097507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 20 Jul 2018 20:46:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475034 - head/net-im/psi/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/net-im/psi/files X-SVN-Commit-Revision: 475034 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jul 2018 20:46:11 -0000 Author: tcberner Date: Fri Jul 20 20:46:10 2018 New Revision: 475034 URL: https://svnweb.freebsd.org/changeset/ports/475034 Log: net-im/psi: Add patches to fix build Add dependencies on the ui-gen target, this should fix the race condition during the build. PR: 229854 Reported by: antoine Added: head/net-im/psi/files/ head/net-im/psi/files/patch-src_contactmanager_CMakeLists.txt (contents, props changed) head/net-im/psi/files/patch-src_sxe_CMakeLists.txt (contents, props changed) Added: head/net-im/psi/files/patch-src_contactmanager_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/psi/files/patch-src_contactmanager_CMakeLists.txt Fri Jul 20 20:46:10 2018 (r475034) @@ -0,0 +1,9 @@ +--- src/contactmanager/CMakeLists.txt.orig 2018-07-20 20:03:45 UTC ++++ src/contactmanager/CMakeLists.txt +@@ -28,5 +28,6 @@ list(APPEND FORMS + qt4_wrap_ui(UI_FORMS ${FORMS}) + qt_wrap_cpp(MOC_SOURCES ${HEADERS}) + add_library(contactmanager STATIC ${HEADERS} ${MOC_SOURCES} ${UI_FORMS} ${PLAIN_SOURCES}) ++add_dependencies(contactmanager build_ui_files) + target_link_libraries(contactmanager ${QT_LIBRARIES} widgets) + target_include_directories(contactmanager PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) Added: head/net-im/psi/files/patch-src_sxe_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/psi/files/patch-src_sxe_CMakeLists.txt Fri Jul 20 20:46:10 2018 (r475034) @@ -0,0 +1,8 @@ +--- src/sxe/CMakeLists.txt.orig 2018-07-20 20:15:10 UTC ++++ src/sxe/CMakeLists.txt +@@ -34,4 +34,5 @@ set(PLAIN_HEADERS + + qt_wrap_cpp(MOC_SOURCES ${HEADERS}) + add_library(sxe STATIC ${HEADERS} ${MOC_SOURCES} ${PLAIN_SOURCES} ${PLAIN_HEADERS}) ++add_dependencies(sxe build_ui_files) + target_link_libraries(sxe ${QT_LIBRARIES} ${iris_LIB} libpsi_tools widgets)