On Sat, Nov 11 2023, Matthieu Herrb <matth...@openbsd.org> wrote:
> Hi,
>
> Not necessarly for immediate commit, but in combinaison with the gtk3
> patches from Landry/Ajacoutot, this new pgtk emacs flavor runins
> natively under Wayland.
>
> Thanks to jca@ for the clue about pgtk.
Pretty much the same diff but with DESCR amended. Good to know that it
runs properly.
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/emacs/Makefile,v
retrieving revision 1.114
diff -u -p -r1.114 Makefile
--- Makefile 21 Sep 2023 12:22:32 -0000 1.114
+++ Makefile 11 Nov 2023 11:34:30 -0000
@@ -21,7 +21,7 @@ EXTRACT_SUFX= .tar.xz
DEBUG_PACKAGES = ${BUILD_PACKAGES}
-FLAVORS= athena gtk2 gtk3 no_x11
+FLAVORS= athena gtk2 gtk3 pgtk no_x11
FLAVOR?= gtk3
GCCARCH= ${MACHINE_ARCH}-unknown-openbsd
@@ -98,6 +98,13 @@ WANTLIB += fontconfig freetype gdk-3 gdk
WANTLIB += glib-2.0 gobject-2.0 gtk-3 harfbuzz intl jpeg lcms2
WANTLIB += m17n-core m17n-flt otf pango-1.0 pangocairo-1.0 png
WANTLIB += rsvg-2 sharpyuv tiff webp webpdemux xcb xcb-shape xcb-util
+. elif ${FLAVOR} == "pgtk"
+CONFIGURE_ARGS+= --with-pgtk
+LIB_DEPENDS+= x11/gtk+3
+WANTLIB += atk-1.0 cairo cairo-gobject dbus-1 fontconfig freetype
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gtk-3 harfbuzz intl jpeg lcms2 otf pango-1.0 pangocairo-1.0
+WANTLIB += png rsvg-2 tiff webpdecoder webpdemux
. else
ERRORS+= "Fatal: Conflicting flavor: ${FLAVOR}"
. endif
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/editors/emacs/pkg/DESCR,v
retrieving revision 1.4
diff -u -p -r1.4 DESCR
--- pkg/DESCR 7 May 2013 07:06:42 -0000 1.4
+++ pkg/DESCR 11 Nov 2023 11:34:30 -0000
@@ -24,3 +24,4 @@ Flavors:
athena - build with athena toolkit instead of gtk3
gtk2 - build with gtk2 instead of gtk3
gtk3 - build with gtk3 (default)
+ pgtk - build with "pure" gtk3 (usable with wayland)
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
