Date: Wed, 21 Feb 2024 14:28:04 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 975061d733c3 - main - x11-toolkits/libdecor: temporarily drop subpackages Message-ID: <202402211428.41LES4QI017749@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=975061d733c390e1d5d93c473bec31903d55f6b8 commit 975061d733c390e1d5d93c473bec31903d55f6b8 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-02-20 20:21:14 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> 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: <<EOD -Plugins with extra dependencies moved into subpackages: -- libdecor-cairo -- libdecor-gtk3 -EOD -} -] diff --git a/x11-toolkits/libdecor/pkg-plist b/x11-toolkits/libdecor/pkg-plist index 13954b500574..385862d39f0d 100644 --- a/x11-toolkits/libdecor/pkg-plist +++ b/x11-toolkits/libdecor/pkg-plist @@ -1,10 +1,10 @@ -%%EXAMPLES%%@@examples@@bin/libdecor-c++-demo -%%EXAMPLES%%@@examples@@bin/libdecor-demo -%%EXAMPLES%%@@examples@@bin/libdecor-egl +%%EXAMPLES%%bin/libdecor-c++-demo +%%EXAMPLES%%bin/libdecor-demo +%%EXAMPLES%%bin/libdecor-egl include/libdecor-0/libdecor.h lib/libdecor-0.so lib/libdecor-0.so.0 lib/libdecor-0.so.0.200.2 -%%CAIRO%%@@cairo@@lib/libdecor/plugins-1/libdecor-cairo.so -%%GTK3%%@@gtk3@@lib/libdecor/plugins-1/libdecor-gtk.so +%%CAIRO%%lib/libdecor/plugins-1/libdecor-cairo.so +%%GTK3%%lib/libdecor/plugins-1/libdecor-gtk.so libdata/pkgconfig/libdecor-0.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402211428.41LES4QI017749>