From nobody Sat Aug 05 15:03:36 2023 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 4RJ5ST0m4jz4m87J; Sat, 5 Aug 2023 15:03:37 +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 4RJ5ST0Kbmz3dDg; Sat, 5 Aug 2023 15:03:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691247817; 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=Ep+Q4cZsAF4850hdfYfUp2oO5Kv0ulJR+GRAaYxR4uw=; b=mO4D6bjkU11kabxIq907fNWFuFHsojz/qAQ5gDWgHT+T5vhaDjiXtYfdGDyYm7fi6kTkes oxybgOrkLrpKN3Ngq/+x8XL5hYoQ3YBj4bBRQYfuq59ad8iYSxohtsBfrmhnQECVDKOaEu aFS/lBDVHyhCTzGeGEYbI0KyzADNp1t4WHn1+IoiYSeIWTPhlyAYGcZ+OTXonjCfduVo8y UikQehgviuBc6nL5oJI0OXsZbtMmOdsUQr6GlFnpj/wFlkJa4WtURoCZSkaIPw7so+r8sk B7kVkjTcX5vm2Rn69xmWQvqJoPiaf3jdWHd9kSR6PU2dyHfqq4RkitU9ihAP1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691247817; 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=Ep+Q4cZsAF4850hdfYfUp2oO5Kv0ulJR+GRAaYxR4uw=; b=k+T0YOAqh/1xuFzAXzHvzThssdk5CtsHZqbRBki2U4skJFE57TcMqFVKXKuyw8v0ohCiL5 KXIjz4mRZp7cgVEvmm9jYrGHqw5CaHi0cXnivss6+rXzYLip7iMQbjr6aHK0onkTSIUpMQ Tfs42O3Yuol265qrCKrPXbNMkwho2b8uwimcvBe8NtQarhKNREVdqro4+dOnwrHMT5Nu7j Z1VNchhvFLf0QIVaqWeXpTmZ3nc+p/2dK8Cja5zphoOtKGDqwEFxRgc4+T+svEDB7DHcoB mGVE1Qc9HBCyPq0jS9mhgdaqjU9wSv0LpNInFxpBdZl2eBiPFt9/Ma3bsPISeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691247817; a=rsa-sha256; cv=none; b=XnuWmesvtYU4XQrkKMSqPu3Wb7Z4kZ+WzMwUmWPkQIo3azYd6c+mpn4GMHJ+ILQ6/hnVBv KmygFAtpYqkfmRSRmGK2plSCzCzs4ZA5Cxu+MFlAyZhwuivzG161xUkn2SUUZzEDnGH/4Y eqBZYklQ6J5e4roEHt8gKr09mP9g4WhhwhG+SEDCCtia5/B59sjvb5Ba0y/7Jkfv+FJMEm Ge51hzuzReNI36blyUsOdhFJc3VZCE3qJzn6BYHiR+6rYFsavpKqMSu0V2lzZP7mmEa5nP 3USKElV9jn0VfXCw4EQ3fsGLTA1yB4tIeQsghYrGn5/W+pYdzdQu5lsKDTJpyg== 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 4RJ5SS6WTmzZ28; Sat, 5 Aug 2023 15:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 375F3aiD093038; Sat, 5 Aug 2023 15:03:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 375F3aQW093037; Sat, 5 Aug 2023 15:03:36 GMT (envelope-from git) Date: Sat, 5 Aug 2023 15:03:36 GMT Message-Id: <202308051503.375F3aQW093037@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Raphael Kubo da Costa Subject: git: 73b6e876a9d3 - main - multimedia/phonon: Switch to upstream's fix for clang 16 build issues 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: rakuco X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73b6e876a9d3bb44fb7560c5efd99f9fe5f334b7 Auto-Submitted: auto-generated The branch main has been updated by rakuco: URL: https://cgit.FreeBSD.org/ports/commit/?id=73b6e876a9d3bb44fb7560c5efd99f9fe5f334b7 commit 73b6e876a9d3bb44fb7560c5efd99f9fe5f334b7 Author: Raphael Kubo da Costa AuthorDate: 2023-08-05 15:01:50 +0000 Commit: Raphael Kubo da Costa CommitDate: 2023-08-05 15:03:07 +0000 multimedia/phonon: Switch to upstream's fix for clang 16 build issues Instead of passing a compiler flag to work around a clang 16 build issue, adopt the fix that dim@ landed upstream that fixes the code in question. PR: 272029 Approved by: kde (arrowd) Differential Revision: https://reviews.freebsd.org/D41307 --- multimedia/phonon/Makefile | 9 ++---- ...-069d5a3eb81bcbc730e44c27a0d060a85cf9213d.patch | 36 ++++++++++++++++++++++ 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile index d055f723c397..6c7421ffbb64 100644 --- a/multimedia/phonon/Makefile +++ b/multimedia/phonon/Makefile @@ -1,5 +1,6 @@ PORTNAME= phonon DISTVERSION= 4.11.1 +PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} DIST_SUBDIR= KDE/phonon @@ -32,10 +33,4 @@ PULSEAUDIO_USES= gnome PULSEAUDIO_USE= GNOME=glib20 PULSEAUDIO_CMAKE_BOOL= WITH_PulseAudio -.include - -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 -CXXFLAGS+= -Wno-error=enum-constexpr-conversion -.endif - -.include +.include diff --git a/multimedia/phonon/files/patch-069d5a3eb81bcbc730e44c27a0d060a85cf9213d.patch b/multimedia/phonon/files/patch-069d5a3eb81bcbc730e44c27a0d060a85cf9213d.patch new file mode 100644 index 000000000000..59cb1412f32c --- /dev/null +++ b/multimedia/phonon/files/patch-069d5a3eb81bcbc730e44c27a0d060a85cf9213d.patch @@ -0,0 +1,36 @@ +From 069d5a3eb81bcbc730e44c27a0d060a85cf9213d Mon Sep 17 00:00:00 2001 +From: Dimitry Andric +Date: Sun, 16 Jul 2023 15:17:39 +0200 +Subject: [PATCH] Future-proof build fix for clang > 16 + +Clang is intending to remove the `-Wno-enum-constexpr-conversion` flag +in the future, because it can invoke undefined behavior. + +To avoid the "integer value NNNN is outside the valid range of values +[0, 7] for the enumeration type 'ObjectDescriptionType'" warnings, +explicitly specify that the `ObjectDescriptionType` enum uses `unsigned` +as the underlying type. + +This also allows to remove the CMake patch that added the +`-Wno-enum-constexpr-conversion` flag. +--- + phonon/experimental/CMakeLists.txt | 4 ---- + phonon/objectdescription.h | 2 +- + 2 files changed, 1 insertion(+), 5 deletions(-) + +diff --git a/phonon/objectdescription.h b/phonon/objectdescription.h +index 97fec2e79..6ce92de54 100644 +--- phonon/objectdescription.h ++++ phonon/objectdescription.h +@@ -43,7 +43,7 @@ namespace Phonon + * + * \ingroup Backend + */ +- enum ObjectDescriptionType ++ enum ObjectDescriptionType : unsigned + { + /** + * Audio output devices. This can be soundcards (with different drivers), soundservers or +-- +GitLab +