From nobody Wed Sep 21 23:37:05 2022 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 4MXvvk1Lbpz4cg97; Wed, 21 Sep 2022 23:37:06 +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 4MXvvk0BZ1z42bL; Wed, 21 Sep 2022 23:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663803426; 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=R834q9AmgQud5k6ltWSWYROkO0dPXeBa+kyOws6PJ9w=; b=dMCZEUpoJXGFoCbYCfnpUt6GGrBsQiNN6A528ZyVfyi945cxBykYfRBvDB/6wSfiQivMDY +Cy+SwUmx3KbCNy1Uveb82yIv8JUOeYKFz1Z98IY/fZ5p0khgpFhsbqnNcn85qXia4lfLp 5EJSnTk1Rw0oFO2bi6IdkGHHy6RCMi1+n2OqCNNbi+gr8yNEgtjKJtUuFYdIh8tjYg0mRJ LogMaPf5Gbxo704e3AsG3BIoTRQM0JIiGuhjqrhw72enN327/GuQJkXCdNU0J6NoPb2bpV dGLiggP5BnvYEkPQiFY3bhQuIrRGXiEL9c/L6i9Ze+beJgTRKHgurBZOn1MKPw== 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 4MXvvj64pczDd8; Wed, 21 Sep 2022 23:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28LNb5dO009921; Wed, 21 Sep 2022 23:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28LNb58o009920; Wed, 21 Sep 2022 23:37:05 GMT (envelope-from git) Date: Wed, 21 Sep 2022 23:37:05 GMT Message-Id: <202209212337.28LNb58o009920@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: ea463968d099 - main - graphics/heimer: Update to 3.6.1 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea463968d0995720473904f87d765fc2c363fdea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663803426; 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=R834q9AmgQud5k6ltWSWYROkO0dPXeBa+kyOws6PJ9w=; b=k6jimJgWW9nrwrujj4aEWdvd86r9o+Ymf9OI/ysLOsIIj8/Qf510DBsXPyd4fEnXWvuPfi Cd9epsvjSBHfb1Z8byHmg8+8GscPM08VJEpLJ/ED96+EbSFGxmWxgkyzeHqU66TCo/o39H cMT3f8sdvZ6L/arCVkJSZA/Y3svhgkUrB2/rNK1dyFFLWjGKpRcQ1FPjiSGwuJuLBxBaU0 PfnnQxLTxu+ii2wvu9NnjP52mZtK1n0FA+69Fp90mC+GkcQmUFeijaKJWnxnU9eTOj/Sma d95xc7sGIImXRuMLFDJ94IC+kCk/XHhr5Wly8IT8063cGPJdT0m9xYFHjuIkFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663803426; a=rsa-sha256; cv=none; b=RlJYLmhhp2EsWZ17Ww+Nce9jJAn9OqMseJwPJP2Cf1DqCRijiw6hrTvUgy8F6/mnWPm1a8 8yz9wBAJ5sfmNSem2uxjZYwHeaFyejPCFwPwQj2q7qiOyG6AD/RoXlaX28rOrezV19x5QN qfG8cmPPb9/5YEW9o0xsGmT/rak8O+QVwxmfdTgAF8XrIU0jtI8JuC+g5+/QODHndQTMe3 bKpvPjeL25OtCuVqljZfC9p8JQwZoB8iM5Ba69IlcV2MS6JOBNoo01f30iquFoAHWlfmf6 MWDgeNPk193mHV0/T3uVp+3SKXlVGx2PHsJqo8aDTJLJluSkiGzj+ThLEvBFww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=ea463968d0995720473904f87d765fc2c363fdea commit ea463968d0995720473904f87d765fc2c363fdea Author: Nuno Teixeira AuthorDate: 2022-09-21 23:29:24 +0000 Commit: Nuno Teixeira CommitDate: 2022-09-21 23:36:53 +0000 graphics/heimer: Update to 3.6.1 Add workaround patch to prevent building with qt6 on machines with qt5 and/or qt6 installed. qt6 is still experimental and not used on this port (yet). https://github.com/juzzlin/Heimer/pull/223 ChangeLog: https://github.com/juzzlin/Heimer/blob/master/CHANGELOG --- graphics/heimer/Makefile | 3 +-- graphics/heimer/distinfo | 6 +++--- graphics/heimer/files/patch-CMakeLists.txt | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/graphics/heimer/Makefile b/graphics/heimer/Makefile index d6fa796182ee..a09b1f5fdc6c 100644 --- a/graphics/heimer/Makefile +++ b/graphics/heimer/Makefile @@ -1,6 +1,5 @@ PORTNAME= heimer -DISTVERSION= 3.6.0 -PORTREVISION= 1 +DISTVERSION= 3.6.1 CATEGORIES= graphics MASTER_SITES= https://github.com/juzzlin/Heimer/releases/download/${DISTVERSION}/ diff --git a/graphics/heimer/distinfo b/graphics/heimer/distinfo index 9555b54c0f1d..ed31e75ae87a 100644 --- a/graphics/heimer/distinfo +++ b/graphics/heimer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661638484 -SHA256 (heimer-3.6.0.tar.gz) = 8a580a74a649fcf25fd137d2c5d5e8b4fa9634a7e943168f94aeacee210df184 -SIZE (heimer-3.6.0.tar.gz) = 1440530 +TIMESTAMP = 1663788092 +SHA256 (heimer-3.6.1.tar.gz) = 55b44a518cd34059e2df50ba4e881029c7963872d5c7a1cff6efa68bd92b2108 +SIZE (heimer-3.6.1.tar.gz) = 1441252 diff --git a/graphics/heimer/files/patch-CMakeLists.txt b/graphics/heimer/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..a469a5102378 --- /dev/null +++ b/graphics/heimer/files/patch-CMakeLists.txt @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2022-09-21 22:58:24 UTC ++++ CMakeLists.txt +@@ -96,8 +96,15 @@ set(QT_MIN_VER 5.9.5) # The version in Ubuntu 18.04 LT + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(QT_MIN_VER 5.9.5) # The version in Ubuntu 18.04 LTS + # This is what Qt Creator 4.13.2 would generate +-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) +-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Xml Widgets LinguistTools Svg Test Network REQUIRED) ++ ++OPTION(WITH_QT6 "Enable Qt 6" OFF) ++if (WITH_QT6) ++ find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED) ++ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Xml Widgets LinguistTools Svg Test Network REQUIRED) ++else() ++ find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED) ++ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Xml Widgets LinguistTools Svg Test Network REQUIRED) ++endif() + + # Install paths depend on the build type and target platform + setup_install_targets()