From nobody Thu Sep 22 12:10:48 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 4MYDdN5cNHz4dCDX; Thu, 22 Sep 2022 12:10:48 +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 4MYDdN56xfz43Q4; Thu, 22 Sep 2022 12:10:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663848648; 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=BZWpi6UqPWaQGe+LKVGRVpr5hc0wWJGfQ9CcRGJpMoM=; b=yjPqG24TNwnzgDr6FiE+Bzw15sVIOPhBMd6Ca0PGsJh9YrvbVldn4l11yDQ7W0J6oTEYHg 3OfFBcsieAz4PbLr+RVktojd0Hivc6CIy6Mmj970rPrcK90B9mJhncwEFPRAodAjcOBSZe 1fR7T9OUB7g0Cw3NquNYvXjFmGwk/ipsRtruSp0plqfNR1jkuZ+nTMnc4knc1/7rdx6xXT jaMEU3IRZ3bsmnz3asIY+8sBEaFXy97v0CqyZWLyNdv5Tt3tIX19DIysCJRb/eWgbjr9gm 4u2wNYT3OGIS5RmsoOx8ugw4vDpk4945Ee8Tr4PanpwcsazQCMzJnzzxXf5bOw== 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 4MYDdN49ljzPMT; Thu, 22 Sep 2022 12:10:48 +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 28MCAmhA049527; Thu, 22 Sep 2022 12:10:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28MCAmqh049526; Thu, 22 Sep 2022 12:10:48 GMT (envelope-from git) Date: Thu, 22 Sep 2022 12:10:48 GMT Message-Id: <202209221210.28MCAmqh049526@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: 145eaa96fce4 - main - graphics/heimer: Use upstream patch for qt6 issue 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: 145eaa96fce483946b653b7d5ad2eee3fd2e51fa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663848648; 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=BZWpi6UqPWaQGe+LKVGRVpr5hc0wWJGfQ9CcRGJpMoM=; b=FLot8iOjjqDD/Bf7T2KsbpWlut9iaLiEJ3Nfr2IzJPJQ0vzwDQHkvNh7I/VMgbFK+GpNuE Cd21amZb9hjhkz4NPl8ZW6drmY/X41IKeZpHfLN3+TjWc45NeEyLvxgKULlppU7xsbSeK9 MOlQ4TKkVpst9uBSUB5cOsaKldm5Xg4OH8TUAdoKZkgdeVF6nD6vpJ0SGu1w0SlnxWCFsv pnNpbA0U6fjftvhQq7ZcwM6YTUP+AG0NJtdXQt6Bm+W4A4g5+NpqkGC4o2Wv3SegPDUo4i EdZmGzXXzCJ+TDcgsiF2jR71YgdLuzyY667cZk8kkkJKRsgbZbs4NRlFolLddA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663848648; a=rsa-sha256; cv=none; b=bkdnfQDV+X/IwKbNCFYYz7QBtXgUvoQEPEyAyOEcqJNB0eCpBc9vQotZf2VuTA12X9wgJ6 rbUK/gYgRyy0lMTQp+r1/eKaLELm+VgKSatT5QlAiI6crK4+mnyijlQUa9VJw1lknuqB+i bs/T32y3RQdmvyMz+uM36GXOFlFQzmp06FvciAfk5uv6bXCdoD3HoimTD5441KDo6Alif3 qEegngXQlph4px+TjnJFwVDMZon/wrhmoOaOqZEsyisI/wAB4ZEkMp3bofdGKuQe8xMZl+ Sof5Amf13c09D6+BcwNkb1S/1FSa4s73r7onn9oNzYRVB7xPSLGLoh5HcWvy/A== 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=145eaa96fce483946b653b7d5ad2eee3fd2e51fa commit 145eaa96fce483946b653b7d5ad2eee3fd2e51fa Author: Nuno Teixeira AuthorDate: 2022-09-22 12:03:49 +0000 Commit: Nuno Teixeira CommitDate: 2022-09-22 12:09:33 +0000 graphics/heimer: Use upstream patch for qt6 issue - Use upstream patch for previous commit ea46396 - Bump PORTREVISION --- graphics/heimer/Makefile | 4 ++++ graphics/heimer/distinfo | 4 +++- graphics/heimer/files/patch-CMakeLists.txt | 20 -------------------- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/graphics/heimer/Makefile b/graphics/heimer/Makefile index a09b1f5fdc6c..14cf1c4a66df 100644 --- a/graphics/heimer/Makefile +++ b/graphics/heimer/Makefile @@ -1,8 +1,12 @@ PORTNAME= heimer DISTVERSION= 3.6.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://github.com/juzzlin/Heimer/releases/download/${DISTVERSION}/ +PATCH_SITES= https://github.com/juzzlin/Heimer/commit/ +PATCHFILES= 362882348743b360825fa95b690c05a21078a184.patch:-p1 # https://github.com/juzzlin/Heimer/pull/223 + MAINTAINER= eduardo@FreeBSD.org COMMENT= Simple mind map, diagram, and note-taking tool WWW= https://github.com/juzzlin/Heimer diff --git a/graphics/heimer/distinfo b/graphics/heimer/distinfo index ed31e75ae87a..c4585457168c 100644 --- a/graphics/heimer/distinfo +++ b/graphics/heimer/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1663788092 +TIMESTAMP = 1663846679 SHA256 (heimer-3.6.1.tar.gz) = 55b44a518cd34059e2df50ba4e881029c7963872d5c7a1cff6efa68bd92b2108 SIZE (heimer-3.6.1.tar.gz) = 1441252 +SHA256 (362882348743b360825fa95b690c05a21078a184.patch) = 15d6df6dedf9b2cec05f7a56e84f6218853a7975d7c851c44ba69a9f85fb37cf +SIZE (362882348743b360825fa95b690c05a21078a184.patch) = 1305 diff --git a/graphics/heimer/files/patch-CMakeLists.txt b/graphics/heimer/files/patch-CMakeLists.txt deleted file mode 100644 index a469a5102378..000000000000 --- a/graphics/heimer/files/patch-CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ ---- 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()