Date: Thu, 22 Sep 2022 12:10:48 GMT From: Nuno Teixeira <eduardo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 145eaa96fce4 - main - graphics/heimer: Use upstream patch for qt6 issue Message-ID: <202209221210.28MCAmqh049526@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=145eaa96fce483946b653b7d5ad2eee3fd2e51fa commit 145eaa96fce483946b653b7d5ad2eee3fd2e51fa Author: Nuno Teixeira <eduardo@FreeBSD.org> AuthorDate: 2022-09-22 12:03:49 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> 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()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209221210.28MCAmqh049526>