From nobody Sat Jan 25 17:32:28 2025 X-Original-To: dev-commits-ports-main@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 4YgMFT1RQPz5lfXw; Sat, 25 Jan 2025 17:32:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YgMFS5xG7z4PHb; Sat, 25 Jan 2025 17:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737826348; 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=m2GMasl3DV9jFFRepaByjjZcrBfyMGsEVwm6XCXWn9M=; b=IZMYsp1xx78l0WdEZ9mWrYbtaf1WDrkbnh5yQjUMnwZyCBh8svVLOk8BV1ELN+KfaA5AXp CdDoJxjUsXRGa5R6uVLEFV/HQ3XEf6QaLxOWDvqSZ0QwldKu0r9SlAft6JG09StDM1AuPY U1PBrHi4/Dla9eXjq8VBi7LCiC9eHNggL4+80kgyOFHVjDkRPoa1JGa1oC3NV7H3RYJn3C /EfcA4D8f0RPGgI0tAC4z7YtQ3Hm9Ysm2ZrZtQwlTlAKQyGB5yXOgOW8bAzxLi2URHJR3y LuAwFHm1kK3I7qvIQ/gq4Cqy0PuqYxuo9i74ern/SMw/waLtST2KEWapiXbNMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737826348; 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=m2GMasl3DV9jFFRepaByjjZcrBfyMGsEVwm6XCXWn9M=; b=ShH7rZy/WOx7uvsyTGzPzQYbnNalD7gCF1/7iXlSKLWG8623seKpYr6rkU0QnpaaTNJjKB px1HfhH5XlkK4OQjkAt1r3aXVlDnXRSI9G22UnYR6Ig3vj87WQNefAOUV8zyj34U5fd7ws AXH8XVUVcl0jfBlQYsXhP67G8sI33Gd8gpgPUqfSqCs4HLKdGJaE9D5qw32YIBo9qqDEdT I5I51siEKBPHzwDCYx5PD0niNDHqckSKPs5nwlGAZgKN3WP4UCrVs/5MWcGsluCCk7DsRg SrAjH6ucpqpBuL4WZvaycRT+MnyrahieZJNqStAngnglppOzehd6zK3k1qzUow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737826348; a=rsa-sha256; cv=none; b=cjyvKwwZZIP7ZRJg1tGUJloo7RPFikDmBsrV3/INqsEwEIQgLQMXdc7yCwCvVNlTOO+zB3 3GwY+vE2vHwMIxG+UWyPK5PS+VJPJj3ZY5upFGQrmteSYQaQ7/k/7AkOxc3ZA2d8U1lTE+ 9BTqATb2tUic+yJ2bEAL1IOz+jht2ooAaRdOM2v1vI9w02MiJ0VDGFkwGIDoX83k+LFEta Lm5neI8u7Ni4aysJhrIoFyX4Z93Npxjp4xIxktN9hz5Wqea+9OsaRhJ7RGKdYMddL8e1RS j1ZyIe1UJipo/rZZQj6Pj6EZDzm+i1B6Vt4Bkth2R+AUrJ4p9/e7cF86JrT0ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YgMFS5VWbz1LWN; Sat, 25 Jan 2025 17:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50PHWSBg043961; Sat, 25 Jan 2025 17:32:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50PHWSKv043958; Sat, 25 Jan 2025 17:32:28 GMT (envelope-from git) Date: Sat, 25 Jan 2025 17:32:28 GMT Message-Id: <202501251732.50PHWSKv043958@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 167f75b07993 - main - graphics/maim: Fix build with ICU 76+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 167f75b0799322f55c0208061c578e8e104f951e Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=167f75b0799322f55c0208061c578e8e104f951e commit 167f75b0799322f55c0208061c578e8e104f951e Author: Daniel Engberg AuthorDate: 2025-01-25 16:16:49 +0000 Commit: Daniel Engberg CommitDate: 2025-01-25 17:31:49 +0000 graphics/maim: Fix build with ICU 76+ * Bump C++ version to c++17 * Adjust CMake build script to include all required ICU libraries PR: 278420 Approved by: portmgr (blanket, build fix) --- graphics/maim/Makefile | 2 +- graphics/maim/files/patch-CMakeLists.txt | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/graphics/maim/Makefile b/graphics/maim/Makefile index 28799252ca1b..42527c44d114 100644 --- a/graphics/maim/Makefile +++ b/graphics/maim/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libicuuc.so:devel/icu \ libslopy.so:x11/slop \ libwebp.so:graphics/webp -USES= cmake compiler:c++11-lang gl jpeg xorg +USES= cmake compiler:c++17-lang gl jpeg xorg USE_GITHUB= yes GH_ACCOUNT= naelstrof USE_GL= gl diff --git a/graphics/maim/files/patch-CMakeLists.txt b/graphics/maim/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..be0a132e6b0f --- /dev/null +++ b/graphics/maim/files/patch-CMakeLists.txt @@ -0,0 +1,27 @@ +--- CMakeLists.txt.orig 2025-01-25 11:05:57 UTC ++++ CMakeLists.txt +@@ -38,7 +38,7 @@ set_property(TARGET ${BIN_TARGET} PROPERTY CXX_STANDAR + find_package( GLM REQUIRED ) + + set_property(TARGET ${BIN_TARGET} PROPERTY CXX_STANDARD_REQUIRED ON) +-set_property(TARGET ${BIN_TARGET} PROPERTY CXX_STANDARD 11) ++set_property(TARGET ${BIN_TARGET} PROPERTY CXX_STANDARD 17) + set_property(TARGET ${BIN_TARGET} PROPERTY CXX_EXTENSIONS OFF) + + # Includes +@@ -70,13 +70,13 @@ else() + if( ${CMAKE_VERSION} VERSION_LESS 3.7 ) + message( WARNING "CMake version is below 3.7, CMake version >= 3.7 is required for unicode support." ) + else() +- find_package(ICU COMPONENTS uc) ++ find_package(ICU COMPONENTS i18n uc) + set( MAIM_UNICODE TRUE CACHE BOOL "To enable or disable unicode support." ) + if ( MAIM_UNICODE AND ICU_FOUND ) + # ICU is required for old nvidia drivers to work for whatever reason. + add_definitions(-DCXXOPTS_USE_UNICODE) + include_directories( ${ICU_INCLUDE_DIR} ) +- target_link_libraries( ${BIN_TARGET} ${ICU_UC_LIBRARIES} ) ++ target_link_libraries( ${BIN_TARGET} ${ICU_I18N_LIBRARIES} ${ICU_UC_LIBRARIES} ) + endif() + endif() +