From nobody Wed Feb 21 14:28:04 2024 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 4TfzC91s54z59Xxt; Wed, 21 Feb 2024 14:28:05 +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 4TfzC85vtVz4mHS; Wed, 21 Feb 2024 14:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708525684; 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=0oglMeOmIOPElDiOHfq06D6irTozCIPBpa+0WtmbHDY=; b=TnAEQBIoqdpq1hdW+PLWAI6sjrdLzOgmopWTA8NgnWoOP6ylp3r9i8rdCtXtf1A1Dhd1AC o82XZjTqlnGrq/v9ar92MKxIP7iGugFX4AIlwj4EC7lHwqSeFJO42NrmGevXZ3BYYwbXP+ KryHKIK14VbCW+DgQESIR1QDpWihhknOA4/jn4W5fph16/LOAoUjKcsND/6WbtNA6RXdfm QCvLT5yc9PogZsMuzEpLbwogh/XqaRER4T8s4/ADBqPhZ5wWaOD/ETERqZdkkH0muxx0BK P9VUEbWqFtJ9sA//PYNHP7KkZhs/NfMGK36QBE6wWo67x/DV+GqCoIMCRPedgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708525684; 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=0oglMeOmIOPElDiOHfq06D6irTozCIPBpa+0WtmbHDY=; b=pqAX0CR+EczKhhE0lWKG0aUvCM2YPofUDOBsPfm2DU0SiW0o7h+VIaJ5qjmtfX94V+JdZs uIr+0NoJE64SfR96SzPVg1VGgRKA7lBiNp6qGAZOmXpOdjClR4oVy+hGrEHks1m8JHTYeo uRV3IUePvGgHqcRVg8zt4sUmln22ZMOmxaeejP38apgyRFi9ByMvoHLb7m/LQClLQwuVaT 6474Nex5QWR5mLtxJBhjEuiFTCtAG7c/FFxwcFZgRvvB3pf7BEs2NYtTAIbre8vqlLaiGZ x/ytW36hOoXl1VYs89kieMtDu1IKNv3vhVyPEP/fw5Hv/lIBURNen0hTNM/U4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708525684; a=rsa-sha256; cv=none; b=EyBUPySWAaWSsZ5VPu3rUdNmSUAjJuT1dcX3mrOP6J4O08mVXlKCCcVRGvSUqmImVQpmu1 v5i9OhmSAxpsn06HRoVZsMSQVMmyl5wiChDL2qK1y6I4F+/TWH904hT4xU1eTJvdkPWOQH /ji7GievjNQE+jfPZP43iy5l/8MyQ+cXaD+lFI1sqGU/B9oeyHTkb0FKrsV83aXLdasTAK MhO2SBoIcj+KEeRFF+is+bZCMS56MmoynJmP6Gb8WsAsVALBPfmI5NqHhM2M9t4Jr9T2zR qv+4VQPB3V9QMuUdKosBRxq9jofJVl7Vek7pnJjb3bbqHu+MHTYlCUuFMiSiSA== 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 4TfzC84WDLz15gX; Wed, 21 Feb 2024 14:28:04 +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 41LES4ld017751; Wed, 21 Feb 2024 14:28:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LES4QI017749; Wed, 21 Feb 2024 14:28:04 GMT (envelope-from git) Date: Wed, 21 Feb 2024 14:28:04 GMT Message-Id: <202402211428.41LES4QI017749@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: 975061d733c3 - main - x11-toolkits/libdecor: temporarily drop subpackages 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 975061d733c390e1d5d93c473bec31903d55f6b8 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=975061d733c390e1d5d93c473bec31903d55f6b8 commit 975061d733c390e1d5d93c473bec31903d55f6b8 Author: Jan Beich AuthorDate: 2024-02-20 20:21:14 +0000 Commit: Jan Beich CommitDate: 2024-02-21 14:27:20 +0000 x11-toolkits/libdecor: temporarily drop subpackages https://github.com/freebsd/poudriere/issues/1113 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276845 Requested by: makc (kde), bdrewery (pkgmgr) Suggested by: pizzamig (portmgr) This reverts commit bd94cb1ba7c16218a0b35638aa319b5f1d73e1e5. This reverts commit bb176de034ea795cfb1830588f5ac73a42ec0b70. This reverts commit 1a1e43198c5a1b80cab83b342793db74c23dad78. --- x11-toolkits/libdecor/Makefile | 37 ++++++++++---------------------- x11-toolkits/libdecor/pkg-descr.cairo | 5 ----- x11-toolkits/libdecor/pkg-descr.examples | 5 ----- x11-toolkits/libdecor/pkg-descr.gtk3 | 5 ----- x11-toolkits/libdecor/pkg-message | 10 --------- x11-toolkits/libdecor/pkg-plist | 10 ++++----- 6 files changed, 16 insertions(+), 56 deletions(-) diff --git a/x11-toolkits/libdecor/Makefile b/x11-toolkits/libdecor/Makefile index 4feb8f8045f1..84265654ff11 100644 --- a/x11-toolkits/libdecor/Makefile +++ b/x11-toolkits/libdecor/Makefile @@ -1,6 +1,6 @@ PORTNAME= libdecor DISTVERSION= 0.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MAINTAINER= jbeich@FreeBSD.org @@ -18,42 +18,27 @@ USE_GITLAB= yes USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org -OPTIONS_DEFINE= CAIRO DBUS EXAMPLES GTK3 +OPTIONS_DEFINE= EXAMPLES CAIRO DBUS GTK3 OPTIONS_DEFAULT=CAIRO DBUS GTK3 OPTIONS_SUB= yes -CAIRO_SUBPACKAGES= cairo CAIRO_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto -#USES.cairo= gnome -#USE_GNOME.cairo= cairo pango -LIB_DEPENDS.cairo= libgobject-2.0.so:devel/glib20 \ - libcairo.so:graphics/cairo \ - libpango-1.0.so:x11-toolkits/pango -SELF_DEPENDS.cairo= main +CAIRO_USES= gnome +CAIRO_USE= GNOME=cairo,pango # Unused by the main library -DBUS_LIB_DEPENDS.cairo= libdbus-1.so:devel/dbus -DBUS_LIB_DEPENDS.examples= libdbus-1.so:devel/dbus -DBUS_LIB_DEPENDS.gtk3= libdbus-1.so:devel/dbus +DBUS_LIB_DEPENDS= ${"${PORT_OPTIONS:NDBUS}":?libdbus-1.so\:devel/dbus:} DBUS_MESON_ENABLED= dbus -EXAMPLES_SUBPACKAGES= examples -EXAMPLES_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto -LIB_DEPENDS.examples+= libxkbcommon.so:x11/libxkbcommon -#USES.examples= gl -#USE_GL.examples= egl opengl -LIB_DEPENDS.examples+= libEGL.so:graphics/libglvnd -SELF_DEPENDS.examples= main EXAMPLES_MESON_TRUE= demo install_demo +EXAMPLES_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto +EXAMPLES_LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon +EXAMPLES_USES= gl +EXAMPLES_USE= GL=egl,opengl -GTK3_SUBPACKAGES= gtk3 GTK3_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto -#USES.gtk3= gnome -#USE_GNOME.gtk3= cairo gtk30 -LIB_DEPENDS.gtk3+= libglib-2.0.so:devel/glib20 \ - libcairo.so:graphics/cairo \ - libgtk-3.so:x11-toolkits/gtk30 -SELF_DEPENDS.gtk3= main +GTK3_USES= gnome +GTK3_USE= GNOME=cairo,gtk30 GTK3_MESON_ENABLED= gtk post-patch-CAIRO-off: diff --git a/x11-toolkits/libdecor/pkg-descr.cairo b/x11-toolkits/libdecor/pkg-descr.cairo deleted file mode 100644 index 75509dde1412..000000000000 --- a/x11-toolkits/libdecor/pkg-descr.cairo +++ /dev/null @@ -1,5 +0,0 @@ -libdecor is a library that can help Wayland clients draw window -decorations for them. It aims to provide multiple backends that -implements the decoration drawing. - -This package provides Cairo-based decoration plugin. diff --git a/x11-toolkits/libdecor/pkg-descr.examples b/x11-toolkits/libdecor/pkg-descr.examples deleted file mode 100644 index 05d84930c209..000000000000 --- a/x11-toolkits/libdecor/pkg-descr.examples +++ /dev/null @@ -1,5 +0,0 @@ -libdecor is a library that can help Wayland clients draw window -decorations for them. It aims to provide multiple backends that -implements the decoration drawing. - -This package provides libdecor demo programs. diff --git a/x11-toolkits/libdecor/pkg-descr.gtk3 b/x11-toolkits/libdecor/pkg-descr.gtk3 deleted file mode 100644 index 73bd9d44c5bc..000000000000 --- a/x11-toolkits/libdecor/pkg-descr.gtk3 +++ /dev/null @@ -1,5 +0,0 @@ -libdecor is a library that can help Wayland clients draw window -decorations for them. It aims to provide multiple backends that -implements the decoration drawing. - -This package provides GTK3-based decoration plugin. diff --git a/x11-toolkits/libdecor/pkg-message b/x11-toolkits/libdecor/pkg-message deleted file mode 100644 index 06c1742a1bdb..000000000000 --- a/x11-toolkits/libdecor/pkg-message +++ /dev/null @@ -1,10 +0,0 @@ -[ -{ type: upgrade - maximum_version: "0.2.2" - message: <