Page MenuHomeFreeBSD
Files F109710330

D43576.id134795.diff
No OneTemporary
Actions

D43576.id134795.diff
View Options

diff --git a/x11-toolkits/libdecor/Makefile b/x11-toolkits/libdecor/Makefile
--- a/x11-toolkits/libdecor/Makefile
+++ b/x11-toolkits/libdecor/Makefile
@@ -1,6 +1,6 @@
PORTNAME= libdecor
DISTVERSION= 0.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MAINTAINER= jbeich@FreeBSD.org
@@ -22,23 +22,38 @@
OPTIONS_DEFAULT=CAIRO DBUS GTK3
OPTIONS_SUB= yes
+CAIRO_SUBPACKAGES= cairo
CAIRO_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto
-CAIRO_USES= gnome
-CAIRO_USE= GNOME=cairo,pango
+#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
# Unused by the main library
-DBUS_LIB_DEPENDS= ${"${PORT_OPTIONS:NDBUS}":?libdbus-1.so\:devel/dbus:}
+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_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
-GTK3_USES= gnome
-GTK3_USE= GNOME=cairo,gtk30
+#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_MESON_ENABLED= gtk
post-patch-CAIRO-off:
diff --git a/ b/
deleted file mode 100644
--- /dev/null
+++ /dev/null
@@ -0,0 +1,5 @@
+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/ b/
deleted file mode 100644
--- /dev/null
+++ /dev/null
@@ -0,0 +1,5 @@
+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/ b/
deleted file mode 100644
--- /dev/null
+++ /dev/null
@@ -0,0 +1,5 @@
+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/ b/
deleted file mode 100644
--- /dev/null
+++ /dev/null
@@ -0,0 +1,10 @@
+[
+{ 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
--- a/x11-toolkits/libdecor/pkg-plist
+++ b/x11-toolkits/libdecor/pkg-plist
@@ -1,10 +1,10 @@
-%%EXAMPLES%%bin/libdecor-c++-demo
-%%EXAMPLES%%bin/libdecor-demo
-%%EXAMPLES%%bin/libdecor-egl
+%%EXAMPLES%%@@examples@@bin/libdecor-c++-demo
+%%EXAMPLES%%@@examples@@bin/libdecor-demo
+%%EXAMPLES%%@@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%%lib/libdecor/plugins-1/libdecor-cairo.so
-%%GTK3%%lib/libdecor/plugins-1/libdecor-gtk.so
+%%CAIRO%%@@cairo@@lib/libdecor/plugins-1/libdecor-cairo.so
+%%GTK3%%@@gtk3@@lib/libdecor/plugins-1/libdecor-gtk.so
libdata/pkgconfig/libdecor-0.pc

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 9, 3:12 PM (11 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16556447
Default Alt Text
D43576.id134795.diff (3 KB)

Event Timeline