Page MenuHomeFreeBSD

x11-toolkits/libdecor: convert plugins to subpackages
Needs ReviewPublic

Authored by jbeich on Jan 24 2024, 3:32 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Nov 15, 10:49 PM
Unknown Object (File)
Nov 12 2024, 9:46 AM
Unknown Object (File)
Nov 12 2024, 2:01 AM
Unknown Object (File)
Nov 10 2024, 4:37 PM
Unknown Object (File)
Nov 10 2024, 2:01 PM
Unknown Object (File)
Nov 10 2024, 12:16 PM
Unknown Object (File)
Nov 10 2024, 2:21 AM
Unknown Object (File)
Nov 10 2024, 2:15 AM
Subscribers

Details

Summary

Avoid indirect Gtk3 dependency in xwayland-devel where libdecor is enabled by "batteries included" policy but in practice only useful for GNOME (see bug 258042).

Test Plan

Runtime is fine without pango and gtk3 subpackages:

$ pkg install xwayland-devel
$ Xwayland -decorate :3
Couldn't open plugin directory: No such file or directory
No plugins found, falling back on no decorations
[...]
$ poudriere testport -j 132i386 x11-toolkits/libdecor
[...]
===========================================================================
=>> Checking shared library dependencies
 0x00000001 NEEDED               Shared library: [libc.so.7]
 0x00000001 NEEDED               Shared library: [libdl.so.1]
 0x00000001 NEEDED               Shared library: [libwayland-client.so.0]

$ poudriere testport -j 132i386 x11-toolkits/libdecor~pango
[...]
===========================================================================
=>> Checking shared library dependencies
 0x00000001 NEEDED               Shared library: [libc.so.7]
 0x00000001 NEEDED               Shared library: [libcairo.so.2]
 0x00000001 NEEDED               Shared library: [libdbus-1.so.3]
 0x00000001 NEEDED               Shared library: [libdecor-0.so.0]
 0x00000001 NEEDED               Shared library: [libgobject-2.0.so.0]
 0x00000001 NEEDED               Shared library: [libm.so.5]
 0x00000001 NEEDED               Shared library: [libpango-1.0.so.0]
 0x00000001 NEEDED               Shared library: [libpangocairo-1.0.so.0]
 0x00000001 NEEDED               Shared library: [libwayland-client.so.0]
 0x00000001 NEEDED               Shared library: [libwayland-cursor.so.0]

$ poudriere testport -j 132i386 x11-toolkits/libdecor~gtk3
[...]
===========================================================================
=>> Checking shared library dependencies
 0x00000001 NEEDED               Shared library: [libc.so.7]
 0x00000001 NEEDED               Shared library: [libcairo.so.2]
 0x00000001 NEEDED               Shared library: [libdbus-1.so.3]
 0x00000001 NEEDED               Shared library: [libdecor-0.so.0]
 0x00000001 NEEDED               Shared library: [libgdk-3.so.0]
 0x00000001 NEEDED               Shared library: [libglib-2.0.so.0]
 0x00000001 NEEDED               Shared library: [libgobject-2.0.so.0]
 0x00000001 NEEDED               Shared library: [libgtk-3.so.0]
 0x00000001 NEEDED               Shared library: [libm.so.5]
 0x00000001 NEEDED               Shared library: [libwayland-client.so.0]
 0x00000001 NEEDED               Shared library: [libwayland-cursor.so.0]

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

jbeich created this revision.
pizzamig added inline comments.
x11-toolkits/libdecor/Makefile
49

It seems that you are overwriting LIB_DEPENDS.gtk3 from 5 lines above

  • Avoid losing pango dependency in pango and gtk3 subpackages (found by @pizzamig)

It would be preferable to have pkg-descr.gtk3 and pkg-descr.pango to provide an appropriate description for the subpackages.

Maybe there is room for improvement in the framework, to provide a more meaningful default (like for COMMENT.subpkg)

This revision is now accepted and ready to land.Jan 27 2024, 4:45 PM

Landed after cleanup: mixing subpackage-only with option + subpackage was too error-prone and facilitated messy style.