From nobody Thu Jun 13 12:49:19 2024 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 4W0Mg36dccz5NcKg; Thu, 13 Jun 2024 12:49:19 +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 4W0Mg338vkz43T1; Thu, 13 Jun 2024 12:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718282959; 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=wCLQvJN/DZD71HdCxG/nmnm5rLzpfTLqI3v5TU7wfM8=; b=VzQglMZI3aIfW1el5QrPihp7rpVPzsit+Py9RdX4leMsnKsznl8jJy4vmMQCFr07QRLUGy Su4AUFR+qNmA7qb4LaSS8JzsY/daDqLWuHCB+XY+2dW3/rMqEK8JW0v029GYycdUcnSaRN vP3ENSS8tM6WJLEIBkAdD4XFv+ZRtXT/w848FwzTZnlw3+DN7lIGB4FLz5sEvsZwxKctoV aUuYCLmH/zjuHTFSkYs4bbsvGZzhMv/UeB3Ys+Jn4S1PiAfF8mBK4wSbBWLRQQffSJklvC 8zBHRmm8KaHCcgr0Rlka0FGC9SnBXgscYlXUPBNLMrFUJ4MJM2C1L2GxSuai6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718282959; a=rsa-sha256; cv=none; b=VGHezQUOYn2bXinLNaVOP1VLESKRIql3KCdrZeB2ih2MILnKgpPqOErSIvVRQwOUo3tDDP MyPyM3FNr+mGhcBuJ2efPd1mB77tezHaRQbMpu+aFRZnRG2j9yJIPJiZqk1Y9WwEiZWIH6 dNbOh6qoursZuhlbI4p16Wl9520QdX/uyWZPmFU7qPo59i+IEBoFhFk+ewHewHrDKM3qPX 79dNA1C2TPloCR8zxraOxO4k4RLCoeU+TthicayJrDU8wlXeUhzzKrpCQeHcgnYO2MXBO1 Ob1zwbb9awbPkzn2al0VaFQTTG5MJ4v/Tp0lpNROZjPY1QNK21HAnTXyBOYAyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718282959; 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=wCLQvJN/DZD71HdCxG/nmnm5rLzpfTLqI3v5TU7wfM8=; b=qgAuenbze63cIHMxezWaRZUG3zQUPzH/FBuI2PTjVtvulrwKvOxkQ6MI0filk3x5gOlqO0 wzu4KPqevjYZtnS1EKLItlbzojMLf0q28tVWRcbEAa6GjkgxG5+2FJjF1H+0KNJtDbsx5n CfkMLYQ6BntD6pUkNT+ySZpbP+ol+NZbA39nvRT7jkrDvedaEEYiWWdJG1sizO7XtvoivH Bq50Aaw/nKjD16XOeuamm4hP/eWFHrWazvqJY2rFpU/0KwFQRkn7BmR7sp0Q2+q0RF0PHf rX1+dNoCAlF+LYxaeNMDOFiYkXUBIFre9oJjRQmCT5d2AZIj/rux8gg8bgvXMw== 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 4W0Mg32mkkzcr2; Thu, 13 Jun 2024 12:49:19 +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 45DCnJLN081713; Thu, 13 Jun 2024 12:49:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45DCnJG1081710; Thu, 13 Jun 2024 12:49:19 GMT (envelope-from git) Date: Thu, 13 Jun 2024 12:49:19 GMT Message-Id: <202406131249.45DCnJG1081710@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 7f3268508d7a - main - x11/xdg-desktop-portal-hyprland: drop -qt5 flavor after 6482a6db7b56 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f3268508d7a9134263debe66a3b8bf13ba43468 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f3268508d7a9134263debe66a3b8bf13ba43468 commit 7f3268508d7a9134263debe66a3b8bf13ba43468 Author: Jan Beich AuthorDate: 2024-06-13 12:44:30 +0000 Commit: Jan Beich CommitDate: 2024-06-13 12:47:12 +0000 x11/xdg-desktop-portal-hyprland: drop -qt5 flavor after 6482a6db7b56 --- x11/xdg-desktop-portal-hyprland/Makefile | 10 ---------- x11/xdg-desktop-portal-hyprland/files/patch-qt5 | 24 ------------------------ 2 files changed, 34 deletions(-) diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile index e2ea9df18f5f..62f7ce3cd02a 100644 --- a/x11/xdg-desktop-portal-hyprland/Makefile +++ b/x11/xdg-desktop-portal-hyprland/Makefile @@ -20,11 +20,6 @@ RUN_DEPENDS= xdg-desktop-portal>0:deskutils/xdg-desktop-portal \ grim:x11/grim \ slurp:x11/slurp -FLAVORS= qt6 qt5 -qt5_PKGNAMESUFFIX= -qt5 -qt5_CONFLICTS_INSTALL= ${PORTNAME} -qt6_CONFLICTS_INSTALL= ${PORTNAME}-qt5 - USES= cmake compiler:c++11-lib gl pkgconfig qt:6 USE_GITHUB= yes USE_GL= gbm @@ -38,11 +33,6 @@ PLIST_FILES= bin/hyprland-share-picker \ share/dbus-1/services/org.freedesktop.impl.portal.desktop.hyprland.service \ share/xdg-desktop-portal/portals/hyprland.portal -.if ${FLAVOR:U} == qt5 -USES:= ${USES:S/qt:6/qt:5/} -USE_QT= qmake:build buildtools:build core gui wayland:run widgets -.endif - # XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 .if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) CXXFLAGS+= -fexperimental-library diff --git a/x11/xdg-desktop-portal-hyprland/files/patch-qt5 b/x11/xdg-desktop-portal-hyprland/files/patch-qt5 deleted file mode 100644 index f95bd0b8d56b..000000000000 --- a/x11/xdg-desktop-portal-hyprland/files/patch-qt5 +++ /dev/null @@ -1,24 +0,0 @@ -Revert https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/2d2fb547178e - ---- hyprland-share-picker/CMakeLists.txt.orig 2024-06-13 09:48:34 UTC -+++ hyprland-share-picker/CMakeLists.txt -@@ -2,8 +2,6 @@ project(hyprland-share-picker VERSION 0.1 LANGUAGES CX - - project(hyprland-share-picker VERSION 0.1 LANGUAGES CXX) - --set(QT_VERSION_MAJOR 6) -- - set(CMAKE_AUTOUIC ON) - set(CMAKE_AUTOMOC ON) - set(CMAKE_AUTORCC ON) -@@ -11,8 +9,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - --find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets) --find_package(Qt6 REQUIRED COMPONENTS Widgets) -+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets) -+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) - - set(PROJECT_SOURCES - main.cpp