Emacs requires mutually exclusive build parameters depending on
whether the user is running on X11 or Wayland. Rather than require
either set of users to build a custom package, create a new Wayland
flavor.
Details
- Reviewers
ashish yasu jbeich - Commits
- R11:604adf973a51: Emacs: Add new wayland flavor
Test of editors/emacs@wayland: http://pkg.ftfl.ca/data/15amd64-default/2024-04-23_11h31m43s/logs/emacs-wayland-29.3,3.log / http://pkg.ftfl.ca/data/14amd64-default/2024-04-23_14h18m27s/logs/emacs-wayland-29.3,3.log
Test of USES=emacs ports with Wayland flavor: http://pkg.ftfl.ca/build.html?mastername=15amd64-default&build=2024-04-23_14h04m42s
Diff Detail
- Repository
- R11 FreeBSD ports repository
- Lint
No Lint Coverage - Unit
No Test Coverage - Build Status
Buildable 57306 Build 54194: arc lint + arc unit
Event Timeline
There is still a problem to be resolved. Even though we have OPTION_EXCLUDE=CAIRO... for the Wayland flavor, CAIRO_CONFIGURE_WITH=cairo is still adding --without-cairo to CONFIGURE_ARGS.
Add a few more tweaks mostly related to the change in D44929, which this revision depends on.
Why not use OPTIONS_SLAVE+=CAIRO? For example:
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index ab33440bf239..0542e5715e86 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -68,21 +68,9 @@ CONFIGURE_ARGS+= --with-sound=no \ --without-xpm \ --without-xwidgets .elif ${FLAVOR:U} == wayland -CATEGORIES+= wayland -CONFIGURE_ARGS+= --with-cairo \ - --with-pgtk \ - --with-png \ - --with-toolkit-scroll-bars \ - --with-x-toolkit=gtk3 \ - --without-m17n-flt \ - --without-x \ - --without-xft \ - --without-xim \ - --without-xpm -LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libpng.so:graphics/png -USE_GNOME+= cairo gtk30 +OPTIONS_SLAVE+= PGTK ${PGTK_IMPLIES} ${PGTK_IMPLIES:@i@${${i}_IMPLIES}@} +OPTIONS_EXCLUDE+= GTK2 MOTIF XAW XAW3D XIM ${PGTK_PREVENTS} ${PGTK_IMPLIES:@i@${${i}_PREVENTS}@} +CONFIGURE_ARGS+= --without-x .else # ${FLAVOR:U} == full CONFIGURE_ARGS+= --with-x .endif @@ -133,10 +121,6 @@ OPTIONS_EXCLUDE= ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \ PGTK PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \ XIM XPM XWIDGETS .endif -.if ${FLAVOR:U} == wayland -OPTIONS_EXCLUDE= CAIRO GTK2 GTK3 M17N MOTIF PGTK PNG SCROLLBARS \ - XAW XAW3D XFT XIM XPM -.endif OPTIONS_SUB= YES
Remove check for wayland flavor; it's no longer necessary with PGTK as a slave option.