From nobody Tue May 7 09:05:29 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VYXRt0pxzz5KPVV; Tue, 07 May 2024 09:05:30 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VYXRt08B6z4dFb; Tue, 7 May 2024 09:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715072730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zG35KhkzoQ5eFNfMSwZYLePVsd66Sb6HTSOBEpDbya0=; b=S3LCRhb3/EuOMcbTa+jvapYpE6IMvfDA59l/y6xI4OqPszhU8FnDNcHv0Y1DNZKjzVDYpj mkl9tZNK65I7EK3LFWurkBjRFI+aNcktczCIVGH5g76e2wqObmfY71JQ18VL4P5gep27z/ YMEpQu1gZiMqVSnL8WdNMoLZYlPqB4a+GMe+DqafpH0kJDkJgt7mbNob6BLZWKzFyJloA8 RFOH4BaifdidfpTW9WmuqcKZaxplyDW2z4FhJLJIEG2wy5C28BVpU+uqb4Neaz55AFZM/k 5xUPT/bMvii6FHapqjGWQ4H7brEbFlBYldTL8SZT78X1nMFK+VLtbWzeddLL5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715072730; a=rsa-sha256; cv=none; b=EKlX1RPtDCKi/JijOviAF5I6md5lsCQHud2uqho+JZ7B3RqrPkTt+fTiGhfKdmSHGeonS8 LnVWqGbSAFblCRA35nihB3o2E+QxNB3egmZnA+ZBw5wFw56Dchlvs4VawF/EPPFdgtLXXV 60xxf6mFhO/1aDdCUphDJeVLgN/HboMTvMkDrPcgWwY9Qhj5HYSksoRSEwozyKktrmPaif gQHJV7/cvTsENAP9VjHk0Ozys2sMVsVbatOOTo4Osd5givzXlAiIPsTA0C021nQ+v3yBPM KiIo6STd3C20nxi/6Qw1o5GqeCs72rc5whR4DLgXbMfYEGXhu+GZVkiQhqBpjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715072730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zG35KhkzoQ5eFNfMSwZYLePVsd66Sb6HTSOBEpDbya0=; b=c/ZQnstVmCs4EJB4lbOYtpiVag0LT6Vwi5TZ60e9M/rQau5VNSReT81Jc06sj1IDxUw38T 2a0/j6r68HZmwvlkFQs84Y028VIQ+YzdgVlYeVT8ek38OgPR1A8n6nzSkAaHlpFe5+i/bh /TUxY4VUOV1ao1Lg5yL9sYWKOoX+mKDs8KioSBe5CD3kk1Txh0/CBZy5iw4LHQyrniLOs9 CPk4IUKHVfZ3//HR3QwRLUteZ9s9P3+Y9v8pYqhDCLDfG/JOr/b04yltVngKUrMeQEDAn5 lm1bUurUU0CqC6M4Fvjf+S+x8DdGnH6gr1cwTHRbN0uDxBDiRMcxU5d1jOFn8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VYXRs6ryYzbKg; Tue, 7 May 2024 09:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44795T00039489; Tue, 7 May 2024 09:05:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44795TDs039486; Tue, 7 May 2024 09:05:29 GMT (envelope-from git) Date: Tue, 7 May 2024 09:05:29 GMT Message-Id: <202405070905.44795TDs039486@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: bf067dc10cfd - main - net-im/psi: Fix build with ninja >= 1.12.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf067dc10cfd953b3a49ce2fdd4b89e34b3dcf98 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf067dc10cfd953b3a49ce2fdd4b89e34b3dcf98 commit bf067dc10cfd953b3a49ce2fdd4b89e34b3dcf98 Author: Jason E. Hale AuthorDate: 2024-05-07 08:11:25 +0000 Commit: Jason E. Hale CommitDate: 2024-05-07 09:05:20 +0000 net-im/psi: Fix build with ninja >= 1.12.0 Address a race condition where included headers generated by uic are not created before they used in the build. Not upstreaming this as the last release was in 2020 and the codebase has diverged too much since then. PR: 278693 Approved by: portmgr (blanket) --- net-im/psi/files/patch-src_tabs_CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net-im/psi/files/patch-src_tabs_CMakeLists.txt b/net-im/psi/files/patch-src_tabs_CMakeLists.txt new file mode 100644 index 000000000000..7065720f7dfe --- /dev/null +++ b/net-im/psi/files/patch-src_tabs_CMakeLists.txt @@ -0,0 +1,10 @@ +Fix a race condition with ninja >= 1.12.0 where included headers have not +yet been generated by uic. + +--- src/tabs/CMakeLists.txt.orig 2020-09-06 07:44:34 UTC ++++ src/tabs/CMakeLists.txt +@@ -22,3 +22,4 @@ target_include_directories(tabs PUBLIC ${CMAKE_CURRENT + add_library(tabs STATIC ${HEADERS} ${MOC_SOURCES} ${PLAIN_SOURCES}) + target_link_libraries(tabs ${QT_LIBRARIES} ${iris_LIB} tools widgets) + target_include_directories(tabs PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) ++add_dependencies(tabs build_ui_files)