Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Jul 2018 20:46:10 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r475034 - head/net-im/psi/files
Message-ID:  <201807202046.w6KKkArD097507@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807202046.w6KKkArD097507>