Date: Wed, 21 Sep 2022 23:37:05 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: ea463968d099 - main - graphics/heimer: Update to 3.6.1 Message-ID: <202209212337.28LNb58o009920@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=ea463968d0995720473904f87d765fc2c363fdea commit ea463968d0995720473904f87d765fc2c363fdea Author: Nuno Teixeira <eduardo@FreeBSD.org> AuthorDate: 2022-09-21 23:29:24 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> 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()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209212337.28LNb58o009920>