From owner-dev-commits-ports-main@freebsd.org Tue Apr 6 18:21:27 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EA4075B340A; Tue, 6 Apr 2021 18:21:27 +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 4FFG7W6FjCz4WJk; Tue, 6 Apr 2021 18:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C966C110C7; Tue, 6 Apr 2021 18:21:27 +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 136ILRVQ018344; Tue, 6 Apr 2021 18:21:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136ILRN6018343; Tue, 6 Apr 2021 18:21:27 GMT (envelope-from git) Date: Tue, 6 Apr 2021 18:21:27 GMT Message-Id: <202104061821.136ILRN6018343@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: a0021573392f - main - Fix build of polish/kadu MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0021573392fb27f50e229530ba73e3cc28bea0d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 18:21:28 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0021573392fb27f50e229530ba73e3cc28bea0d commit a0021573392fb27f50e229530ba73e3cc28bea0d Author: Adriaan de Groot AuthorDate: 2021-04-06 18:18:13 +0000 Commit: Adriaan de Groot CommitDate: 2021-04-06 18:18:13 +0000 Fix build of polish/kadu The update of qxmpp to the latest upstream release made qxmpp require C++17, for std::optional. Kadu is forcing C++14, which breaks in the build like this: In file included from plugins/jabber_protocol/services/jabber-room-chat-service.cpp:35: /usr/local/include/qxmpp/QXmppMessage.h:250:10: error: no template named 'optional' in namespace 'std' std::optional mixInvitation() const; Bump the C++ requirement and patch the CMake bits that DTWT. --- polish/kadu/Makefile | 4 ++-- polish/kadu/files/patch-CMakeLists.txt | 23 +++++++++++++++++++++++ polish/kadu/files/patch-cmake_KaduMacros.cmake | 12 ++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile index f0e441bb38f0..a76f8b92d13a 100644 --- a/polish/kadu/Makefile +++ b/polish/kadu/Makefile @@ -2,7 +2,7 @@ PORTNAME= kadu PORTVERSION= 4.3 -PORTREVISION= 22 +PORTREVISION= 23 PORTEPOCH= 1 CATEGORIES= polish net-im MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/:kadu \ @@ -34,7 +34,7 @@ LIB_DEPENDS= libmpdclient.so:audio/libmpdclient \ GG6_EMOTS_DISTFILE= kompatybilne_z_GG6.tar.gz GG7_EMOTS_DISTFILE= dodatkowe_emoty_GG7.tar.gz -USES= cmake:insource compiler:c++11-lib gettext-runtime gnome \ +USES= cmake:insource compiler:c++17-lang gettext-runtime gnome \ libarchive pkgconfig qca qt:5 readline tar:bzip2 xorg USE_XORG= x11 xext xfixes xscrnsaver USE_GNOME= glib20 diff --git a/polish/kadu/files/patch-CMakeLists.txt b/polish/kadu/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..2a96e878a7c6 --- /dev/null +++ b/polish/kadu/files/patch-CMakeLists.txt @@ -0,0 +1,23 @@ +--- CMakeLists.txt.orig 2017-01-24 21:36:21 UTC ++++ CMakeLists.txt +@@ -25,7 +25,11 @@ if (NOT DEFINED CMAKE_CONFIGURATION_TYPES AND NOT CMAK + set (CMAKE_BUILD_TYPE "${default}" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) + endif () + +-# C++14 support, warnings and other flags ++# C++17 support, warnings and other flags ++# ++# 17 is needed for std::optional, in qxmpp ++set (CMAKE_CXX_STANDARD 17) ++set (CMAKE_CXX_STANDARD_REQUIRED ON) + + set (DEFINITIONS QT_NO_CAST_TO_ASCII QT_DISABLE_DEPRECATED_BEFORE=0x040900) + list (APPEND DEFINITIONS KADU_EXPORT_TESTS) +@@ -38,7 +42,6 @@ else () + set (COMMON_COMPILE_FLAGS "-Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -fno-common") + set (C_FLAGS "-Wwrite-strings") + set (CXX_FLAGS "-Woverloaded-virtual -Wnon-virtual-dtor ${CXX_FLAGS}") +- set (CMAKE_CXX_STANDARD 14) + + if (NOT WIN32) + set (COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -fvisibility=hidden") diff --git a/polish/kadu/files/patch-cmake_KaduMacros.cmake b/polish/kadu/files/patch-cmake_KaduMacros.cmake new file mode 100644 index 000000000000..310b7839c1d2 --- /dev/null +++ b/polish/kadu/files/patch-cmake_KaduMacros.cmake @@ -0,0 +1,12 @@ +--- cmake/KaduMacros.cmake.orig 2021-04-03 20:24:23 UTC ++++ cmake/KaduMacros.cmake +@@ -44,7 +44,8 @@ include_directories (${INJEQT_INCLUDEDIR}) + link_directories (${INJEQT_LIBRARY_DIRS}) + + set (CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wnon-virtual-dtor ${CMAKE_CXX_FLAGS}") +-set (CMAKE_CXX_STANDARD 14) ++set (CMAKE_CXX_STANDARD 17) ++set (CMAKE_CXX_STANDARD_REQUIRED ON) + + if (NOT WIN32) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")