Index: x11-toolkits/Makefile =================================================================== --- x11-toolkits/Makefile +++ x11-toolkits/Makefile @@ -31,6 +31,7 @@ SUBDIR += gtk-sharp30 SUBDIR += gtk20 SUBDIR += gtk30 + SUBDIR += gtk40 SUBDIR += gtkada SUBDIR += gtkada3 SUBDIR += gtkd Index: x11-toolkits/gtk40/Makefile =================================================================== --- /dev/null +++ x11-toolkits/gtk40/Makefile @@ -0,0 +1,97 @@ +PORTNAME= gtk +PORTVERSION= 4.2.0 +CATEGORIES= x11-toolkits +MASTER_SITES= GNOME +PKGNAMESUFFIX= 4 +DIST_SUBDIR= gnome + +MAINTAINER= desktop@FreeBSD.org +COMMENT= Gimp Toolkit for X11 GUI (current stable version) + +LICENSE= LGPL20 + +PORTSCOUT= limit:1,even + +BUILD_DEPENDS= sassc>0:textproc/sassc +LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ + libfribidi.so:converters/fribidi \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libgraphene-1.0.so:graphics/graphene \ + libharfbuzz.so:print/harfbuzz +RUN_DEPENDS= hicolor-icon-theme>=0:misc/hicolor-icon-theme \ + adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme + +USES= compiler:c11 gettext gnome localbase meson ninja \ + pathfix perl5 python:3.7+ pkgconfig tar:bzip2 +USE_PERL5= build +BINARY_ALIAS= python3=${PYTHON_CMD} +USE_GNOME= atk cairo gdkpixbuf2 introspection:build pango \ + librsvg2:run +LDFLAGS= -lexecinfo + +LIBVERSION= 0.2404.23 +PLIST_SUB+= LIBVERSION=${LIBVERSION} + +GLIB_SCHEMAS= org.gtk.Demo4.gschema.xml \ + org.gtk.gtk4.Settings.ColorChooser.gschema.xml \ + org.gtk.gtk4.Settings.Debug.gschema.xml \ + org.gtk.gtk4.Settings.EmojiChooser.gschema.xml \ + org.gtk.gtk4.Settings.FileChooser.gschema.xml + +OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY FFMPEG \ + GSTREAMER WAYLAND X11 +OPTIONS_DEFAULT=CUPS COLORD BROADWAY WAYLAND X11 +OPTIONS_SUB= yes + +BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets. +BROADWAY_MESON_TRUE= broadway-backend + +COLORD_DESC= Color profile support +COLORD_LIB_DEPENDS= libcolord.so:graphics/colord +COLORD_MESON_ENABLED= colord + +CUPS_LIB_DEPENDS= libcups.so:print/cups +CUPS_MESON_ENABLED= cups + +CLOUDPRINT_DESC= Cloud printing support +CLOUDPRINT_MESON_ENABLED= cloudprint +CLOUDPRINT_USE= gnome=libxml2 +CLOUDPRINT_LIB_DEPENDS= librest-0.7.so:devel/librest \ + libsoup-2.4.so:devel/libsoup \ + libjson-glib-1.0.so:devel/json-glib + +FFMPEG_DESC= FFmpeg multimedia backend +FFMPEG_MESON_ENABLED= media-ffmpeg +FFMPEG_RUN_DEPENDS= ffmpeg>0:multimedia/ffmpeg +FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg + +GSTREAMER_DESC= GStreamer multimedia backend +GSTREAMER_MESON_ENABLED=media-gstreamer +GSTREAMER_RUN_DEPENDS= gstreamer1>0:multimedia/gstreamer1 +GSTREAMER_LIB_DEPENDS= libgstreamer-1.0.so:multimedia/gstreamer1 + +WAYLAND_DESC= GDK Wayland backend +WAYLAND_MESON_TRUE= wayland-backend +WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols +WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \ + libxkbcommon.so:x11/libxkbcommon +WAYLAND_RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ + wayland-protocols>=0:graphics/wayland-protocols +WAYLAND_USES= gl +WAYLAND_USE= GL=egl + +X11_DESC= GDK X11 backend +X11_MESON_TRUE= x11-backend +X11_USES= xorg +X11_USE= XORG=x11,xcomposite,xcursor,xdamage,xext,xfixes,xi,xinerama,xrandr,xrender + +pre-build: + @${RM} -r ${WRKSRC}/docs/gtk.info* + +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-4.0/modules + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-4.0/${GTK4_VERSION}/engines + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-4.0/${GTK4_VERSION}/loaders + +.include Index: x11-toolkits/gtk40/distinfo =================================================================== --- /dev/null +++ x11-toolkits/gtk40/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1618462784 +SHA256 (gnome/gtk-4.2.0.tar.bz2) = ea817483d35cd5f5d949a61b15c904ee3157fe5befb98e084a241921562f1838 +SIZE (gnome/gtk-4.2.0.tar.bz2) = 22749660 Index: x11-toolkits/gtk40/files/patch-gdk_wayland_cursor_os-compatibility.c =================================================================== --- /dev/null +++ x11-toolkits/gtk40/files/patch-gdk_wayland_cursor_os-compatibility.c @@ -0,0 +1,14 @@ +--- gdk/wayland/cursor/os-compatibility.c.orig 2021-04-15 16:00:27 UTC ++++ gdk/wayland/cursor/os-compatibility.c +@@ -31,11 +31,7 @@ + #include + #include + #include +- +-#define HAVE_MEMFD_CREATE +-#ifdef HAVE_MEMFD_CREATE + #include +-#endif + + #include "os-compatibility.h" + Index: x11-toolkits/gtk40/pkg-descr =================================================================== --- /dev/null +++ x11-toolkits/gtk40/pkg-descr @@ -0,0 +1,5 @@ +GTK+ is a collection of GUI widgets. GTK+ essentially provides the +building blocks from which GUIs can be built. It is highly themable, +and its functionality is highly extensible. + +WWW: https://www.gtk.org/ Index: x11-toolkits/gtk40/pkg-plist =================================================================== --- /dev/null +++ x11-toolkits/gtk40/pkg-plist @@ -0,0 +1,653 @@ +bin/gtk4-broadwayd +bin/gtk4-builder-tool +bin/gtk4-demo +bin/gtk4-demo-application +bin/gtk4-encode-symbolic-svg +bin/gtk4-icon-browser +bin/gtk4-launch +bin/gtk4-print-editor +bin/gtk4-query-settings +bin/gtk4-update-icon-cache +bin/gtk4-widget-factory +include/gtk-4.0/gdk/broadway/gdkbroadway.h +include/gtk-4.0/gdk/broadway/gdkbroadwaycursor.h +include/gtk-4.0/gdk/broadway/gdkbroadwaydisplay.h +include/gtk-4.0/gdk/broadway/gdkbroadwaymonitor.h +include/gtk-4.0/gdk/broadway/gdkbroadwaysurface.h +include/gtk-4.0/gdk/gdk-autocleanup.h +include/gtk-4.0/gdk/gdk.h +include/gtk-4.0/gdk/gdkapplaunchcontext.h +include/gtk-4.0/gdk/gdkcairo.h +include/gtk-4.0/gdk/gdkcairocontext.h +include/gtk-4.0/gdk/gdkclipboard.h +include/gtk-4.0/gdk/gdkconfig.h +include/gtk-4.0/gdk/gdkcontentdeserializer.h +include/gtk-4.0/gdk/gdkcontentformats.h +include/gtk-4.0/gdk/gdkcontentprovider.h +include/gtk-4.0/gdk/gdkcontentproviderimpl.h +include/gtk-4.0/gdk/gdkcontentserializer.h +include/gtk-4.0/gdk/gdkcursor.h +include/gtk-4.0/gdk/gdkdevice.h +include/gtk-4.0/gdk/gdkdevicepad.h +include/gtk-4.0/gdk/gdkdevicetool.h +include/gtk-4.0/gdk/gdkdisplay.h +include/gtk-4.0/gdk/gdkdisplaymanager.h +include/gtk-4.0/gdk/gdkdrag.h +include/gtk-4.0/gdk/gdkdragsurface.h +include/gtk-4.0/gdk/gdkdrawcontext.h +include/gtk-4.0/gdk/gdkdrop.h +include/gtk-4.0/gdk/gdkenumtypes.h +include/gtk-4.0/gdk/gdkevents.h +include/gtk-4.0/gdk/gdkframeclock.h +include/gtk-4.0/gdk/gdkframetimings.h +include/gtk-4.0/gdk/gdkglcontext.h +include/gtk-4.0/gdk/gdkgltexture.h +include/gtk-4.0/gdk/gdkkeys.h +include/gtk-4.0/gdk/gdkkeysyms.h +include/gtk-4.0/gdk/gdkmemorytexture.h +include/gtk-4.0/gdk/gdkmonitor.h +include/gtk-4.0/gdk/gdkpaintable.h +include/gtk-4.0/gdk/gdkpango.h +include/gtk-4.0/gdk/gdkpixbuf.h +include/gtk-4.0/gdk/gdkpopup.h +include/gtk-4.0/gdk/gdkpopuplayout.h +include/gtk-4.0/gdk/gdkrectangle.h +include/gtk-4.0/gdk/gdkrgba.h +include/gtk-4.0/gdk/gdkseat.h +include/gtk-4.0/gdk/gdksnapshot.h +include/gtk-4.0/gdk/gdksurface.h +include/gtk-4.0/gdk/gdktexture.h +include/gtk-4.0/gdk/gdktoplevel.h +include/gtk-4.0/gdk/gdktoplevellayout.h +include/gtk-4.0/gdk/gdktoplevelsize.h +include/gtk-4.0/gdk/gdktypes.h +include/gtk-4.0/gdk/gdkversionmacros.h +include/gtk-4.0/gdk/gdkvulkancontext.h +include/gtk-4.0/gdk/wayland/gdkwayland.h +include/gtk-4.0/gdk/wayland/gdkwaylanddevice.h +include/gtk-4.0/gdk/wayland/gdkwaylanddisplay.h +include/gtk-4.0/gdk/wayland/gdkwaylandglcontext.h +include/gtk-4.0/gdk/wayland/gdkwaylandmonitor.h +include/gtk-4.0/gdk/wayland/gdkwaylandseat.h +include/gtk-4.0/gdk/wayland/gdkwaylandsurface.h +include/gtk-4.0/gdk/x11/gdkx-autocleanups.h +include/gtk-4.0/gdk/x11/gdkx.h +include/gtk-4.0/gdk/x11/gdkx11applaunchcontext.h +include/gtk-4.0/gdk/x11/gdkx11device-xi2.h +include/gtk-4.0/gdk/x11/gdkx11device.h +include/gtk-4.0/gdk/x11/gdkx11devicemanager-xi2.h +include/gtk-4.0/gdk/x11/gdkx11devicemanager.h +include/gtk-4.0/gdk/x11/gdkx11display.h +include/gtk-4.0/gdk/x11/gdkx11dnd.h +include/gtk-4.0/gdk/x11/gdkx11glcontext.h +include/gtk-4.0/gdk/x11/gdkx11monitor.h +include/gtk-4.0/gdk/x11/gdkx11property.h +include/gtk-4.0/gdk/x11/gdkx11screen.h +include/gtk-4.0/gdk/x11/gdkx11selection.h +include/gtk-4.0/gdk/x11/gdkx11surface.h +include/gtk-4.0/gdk/x11/gdkx11utils.h +include/gtk-4.0/gsk/broadway/gskbroadwayrenderer.h +include/gtk-4.0/gsk/gl/gskglrenderer.h +include/gtk-4.0/gsk/gl/gsknglrenderer.h +include/gtk-4.0/gsk/gsk-autocleanup.h +include/gtk-4.0/gsk/gsk.h +include/gtk-4.0/gsk/gskcairorenderer.h +include/gtk-4.0/gsk/gskenums.h +include/gtk-4.0/gsk/gskenumtypes.h +include/gtk-4.0/gsk/gskglshader.h +include/gtk-4.0/gsk/gskrenderer.h +include/gtk-4.0/gsk/gskrendernode.h +include/gtk-4.0/gsk/gskroundedrect.h +include/gtk-4.0/gsk/gsktransform.h +include/gtk-4.0/gsk/gsktypes.h +include/gtk-4.0/gtk/css/gtkcss.h +include/gtk-4.0/gtk/css/gtkcssenums.h +include/gtk-4.0/gtk/css/gtkcssenumtypes.h +include/gtk-4.0/gtk/css/gtkcsserror.h +include/gtk-4.0/gtk/css/gtkcsslocation.h +include/gtk-4.0/gtk/css/gtkcsssection.h +include/gtk-4.0/gtk/gtk-autocleanups.h +include/gtk-4.0/gtk/gtk.h +include/gtk-4.0/gtk/gtkaboutdialog.h +include/gtk-4.0/gtk/gtkaccelgroup.h +include/gtk-4.0/gtk/gtkaccessible.h +include/gtk-4.0/gtk/gtkactionable.h +include/gtk-4.0/gtk/gtkactionbar.h +include/gtk-4.0/gtk/gtkadjustment.h +include/gtk-4.0/gtk/gtkappchooser.h +include/gtk-4.0/gtk/gtkappchooserbutton.h +include/gtk-4.0/gtk/gtkappchooserdialog.h +include/gtk-4.0/gtk/gtkappchooserwidget.h +include/gtk-4.0/gtk/gtkapplication.h +include/gtk-4.0/gtk/gtkapplicationwindow.h +include/gtk-4.0/gtk/gtkaspectframe.h +include/gtk-4.0/gtk/gtkassistant.h +include/gtk-4.0/gtk/gtkatcontext.h +include/gtk-4.0/gtk/gtkbinlayout.h +include/gtk-4.0/gtk/gtkbitset.h +include/gtk-4.0/gtk/gtkbookmarklist.h +include/gtk-4.0/gtk/gtkboolfilter.h +include/gtk-4.0/gtk/gtkborder.h +include/gtk-4.0/gtk/gtkbox.h +include/gtk-4.0/gtk/gtkboxlayout.h +include/gtk-4.0/gtk/gtkbuildable.h +include/gtk-4.0/gtk/gtkbuilder.h +include/gtk-4.0/gtk/gtkbuilderlistitemfactory.h +include/gtk-4.0/gtk/gtkbuilderscope.h +include/gtk-4.0/gtk/gtkbutton.h +include/gtk-4.0/gtk/gtkcalendar.h +include/gtk-4.0/gtk/gtkcellarea.h +include/gtk-4.0/gtk/gtkcellareabox.h +include/gtk-4.0/gtk/gtkcellareacontext.h +include/gtk-4.0/gtk/gtkcelleditable.h +include/gtk-4.0/gtk/gtkcelllayout.h +include/gtk-4.0/gtk/gtkcellrenderer.h +include/gtk-4.0/gtk/gtkcellrendereraccel.h +include/gtk-4.0/gtk/gtkcellrenderercombo.h +include/gtk-4.0/gtk/gtkcellrendererpixbuf.h +include/gtk-4.0/gtk/gtkcellrendererprogress.h +include/gtk-4.0/gtk/gtkcellrendererspin.h +include/gtk-4.0/gtk/gtkcellrendererspinner.h +include/gtk-4.0/gtk/gtkcellrenderertext.h +include/gtk-4.0/gtk/gtkcellrenderertoggle.h +include/gtk-4.0/gtk/gtkcellview.h +include/gtk-4.0/gtk/gtkcenterbox.h +include/gtk-4.0/gtk/gtkcenterlayout.h +include/gtk-4.0/gtk/gtkcheckbutton.h +include/gtk-4.0/gtk/gtkcolorbutton.h +include/gtk-4.0/gtk/gtkcolorchooser.h +include/gtk-4.0/gtk/gtkcolorchooserdialog.h +include/gtk-4.0/gtk/gtkcolorchooserwidget.h +include/gtk-4.0/gtk/gtkcolorutils.h +include/gtk-4.0/gtk/gtkcolumnview.h +include/gtk-4.0/gtk/gtkcolumnviewcolumn.h +include/gtk-4.0/gtk/gtkcombobox.h +include/gtk-4.0/gtk/gtkcomboboxtext.h +include/gtk-4.0/gtk/gtkconstraint.h +include/gtk-4.0/gtk/gtkconstraintguide.h +include/gtk-4.0/gtk/gtkconstraintlayout.h +include/gtk-4.0/gtk/gtkcssprovider.h +include/gtk-4.0/gtk/gtkcustomfilter.h +include/gtk-4.0/gtk/gtkcustomlayout.h +include/gtk-4.0/gtk/gtkcustomsorter.h +include/gtk-4.0/gtk/gtkdebug.h +include/gtk-4.0/gtk/gtkdialog.h +include/gtk-4.0/gtk/gtkdirectorylist.h +include/gtk-4.0/gtk/gtkdragicon.h +include/gtk-4.0/gtk/gtkdragsource.h +include/gtk-4.0/gtk/gtkdrawingarea.h +include/gtk-4.0/gtk/gtkdropcontrollermotion.h +include/gtk-4.0/gtk/gtkdropdown.h +include/gtk-4.0/gtk/gtkdroptarget.h +include/gtk-4.0/gtk/gtkdroptargetasync.h +include/gtk-4.0/gtk/gtkeditable.h +include/gtk-4.0/gtk/gtkeditablelabel.h +include/gtk-4.0/gtk/gtkemojichooser.h +include/gtk-4.0/gtk/gtkentry.h +include/gtk-4.0/gtk/gtkentrybuffer.h +include/gtk-4.0/gtk/gtkentrycompletion.h +include/gtk-4.0/gtk/gtkenums.h +include/gtk-4.0/gtk/gtkeventcontroller.h +include/gtk-4.0/gtk/gtkeventcontrollerfocus.h +include/gtk-4.0/gtk/gtkeventcontrollerkey.h +include/gtk-4.0/gtk/gtkeventcontrollerlegacy.h +include/gtk-4.0/gtk/gtkeventcontrollermotion.h +include/gtk-4.0/gtk/gtkeventcontrollerscroll.h +include/gtk-4.0/gtk/gtkexpander.h +include/gtk-4.0/gtk/gtkexpression.h +include/gtk-4.0/gtk/gtkfilechooser.h +include/gtk-4.0/gtk/gtkfilechooserdialog.h +include/gtk-4.0/gtk/gtkfilechoosernative.h +include/gtk-4.0/gtk/gtkfilechooserwidget.h +include/gtk-4.0/gtk/gtkfilefilter.h +include/gtk-4.0/gtk/gtkfilter.h +include/gtk-4.0/gtk/gtkfilterlistmodel.h +include/gtk-4.0/gtk/gtkfixed.h +include/gtk-4.0/gtk/gtkfixedlayout.h +include/gtk-4.0/gtk/gtkflattenlistmodel.h +include/gtk-4.0/gtk/gtkflowbox.h +include/gtk-4.0/gtk/gtkfontbutton.h +include/gtk-4.0/gtk/gtkfontchooser.h +include/gtk-4.0/gtk/gtkfontchooserdialog.h +include/gtk-4.0/gtk/gtkfontchooserwidget.h +include/gtk-4.0/gtk/gtkframe.h +include/gtk-4.0/gtk/gtkgesture.h +include/gtk-4.0/gtk/gtkgestureclick.h +include/gtk-4.0/gtk/gtkgesturedrag.h +include/gtk-4.0/gtk/gtkgesturelongpress.h +include/gtk-4.0/gtk/gtkgesturepan.h +include/gtk-4.0/gtk/gtkgesturerotate.h +include/gtk-4.0/gtk/gtkgesturesingle.h +include/gtk-4.0/gtk/gtkgesturestylus.h +include/gtk-4.0/gtk/gtkgestureswipe.h +include/gtk-4.0/gtk/gtkgesturezoom.h +include/gtk-4.0/gtk/gtkglarea.h +include/gtk-4.0/gtk/gtkgrid.h +include/gtk-4.0/gtk/gtkgridlayout.h +include/gtk-4.0/gtk/gtkgridview.h +include/gtk-4.0/gtk/gtkheaderbar.h +include/gtk-4.0/gtk/gtkicontheme.h +include/gtk-4.0/gtk/gtkiconview.h +include/gtk-4.0/gtk/gtkimage.h +include/gtk-4.0/gtk/gtkimcontext.h +include/gtk-4.0/gtk/gtkimcontextsimple.h +include/gtk-4.0/gtk/gtkimmodule.h +include/gtk-4.0/gtk/gtkimmulticontext.h +include/gtk-4.0/gtk/gtkinfobar.h +include/gtk-4.0/gtk/gtklabel.h +include/gtk-4.0/gtk/gtklayoutchild.h +include/gtk-4.0/gtk/gtklayoutmanager.h +include/gtk-4.0/gtk/gtklevelbar.h +include/gtk-4.0/gtk/gtklinkbutton.h +include/gtk-4.0/gtk/gtklistbase.h +include/gtk-4.0/gtk/gtklistbox.h +include/gtk-4.0/gtk/gtklistitem.h +include/gtk-4.0/gtk/gtklistitemfactory.h +include/gtk-4.0/gtk/gtkliststore.h +include/gtk-4.0/gtk/gtklistview.h +include/gtk-4.0/gtk/gtklockbutton.h +include/gtk-4.0/gtk/gtkmain.h +include/gtk-4.0/gtk/gtkmaplistmodel.h +include/gtk-4.0/gtk/gtkmediacontrols.h +include/gtk-4.0/gtk/gtkmediafile.h +include/gtk-4.0/gtk/gtkmediastream.h +include/gtk-4.0/gtk/gtkmenubutton.h +include/gtk-4.0/gtk/gtkmessagedialog.h +include/gtk-4.0/gtk/gtkmountoperation.h +include/gtk-4.0/gtk/gtkmultifilter.h +include/gtk-4.0/gtk/gtkmultiselection.h +include/gtk-4.0/gtk/gtkmultisorter.h +include/gtk-4.0/gtk/gtknative.h +include/gtk-4.0/gtk/gtknativedialog.h +include/gtk-4.0/gtk/gtknoselection.h +include/gtk-4.0/gtk/gtknotebook.h +include/gtk-4.0/gtk/gtknumericsorter.h +include/gtk-4.0/gtk/gtkorientable.h +include/gtk-4.0/gtk/gtkoverlay.h +include/gtk-4.0/gtk/gtkoverlaylayout.h +include/gtk-4.0/gtk/gtkpadcontroller.h +include/gtk-4.0/gtk/gtkpagesetup.h +include/gtk-4.0/gtk/gtkpaned.h +include/gtk-4.0/gtk/gtkpapersize.h +include/gtk-4.0/gtk/gtkpasswordentry.h +include/gtk-4.0/gtk/gtkpicture.h +include/gtk-4.0/gtk/gtkpopover.h +include/gtk-4.0/gtk/gtkpopovermenu.h +include/gtk-4.0/gtk/gtkpopovermenubar.h +include/gtk-4.0/gtk/gtkprintcontext.h +include/gtk-4.0/gtk/gtkprintoperation.h +include/gtk-4.0/gtk/gtkprintoperationpreview.h +include/gtk-4.0/gtk/gtkprintsettings.h +include/gtk-4.0/gtk/gtkprogressbar.h +include/gtk-4.0/gtk/gtkrange.h +include/gtk-4.0/gtk/gtkrecentmanager.h +include/gtk-4.0/gtk/gtkrender.h +include/gtk-4.0/gtk/gtkrevealer.h +include/gtk-4.0/gtk/gtkroot.h +include/gtk-4.0/gtk/gtkscale.h +include/gtk-4.0/gtk/gtkscalebutton.h +include/gtk-4.0/gtk/gtkscrollable.h +include/gtk-4.0/gtk/gtkscrollbar.h +include/gtk-4.0/gtk/gtkscrolledwindow.h +include/gtk-4.0/gtk/gtksearchbar.h +include/gtk-4.0/gtk/gtksearchentry.h +include/gtk-4.0/gtk/gtkselectionfiltermodel.h +include/gtk-4.0/gtk/gtkselectionmodel.h +include/gtk-4.0/gtk/gtkseparator.h +include/gtk-4.0/gtk/gtksettings.h +include/gtk-4.0/gtk/gtkshortcut.h +include/gtk-4.0/gtk/gtkshortcutaction.h +include/gtk-4.0/gtk/gtkshortcutcontroller.h +include/gtk-4.0/gtk/gtkshortcutlabel.h +include/gtk-4.0/gtk/gtkshortcutmanager.h +include/gtk-4.0/gtk/gtkshortcutsgroup.h +include/gtk-4.0/gtk/gtkshortcutssection.h +include/gtk-4.0/gtk/gtkshortcutsshortcut.h +include/gtk-4.0/gtk/gtkshortcutswindow.h +include/gtk-4.0/gtk/gtkshortcuttrigger.h +include/gtk-4.0/gtk/gtkshow.h +include/gtk-4.0/gtk/gtksignallistitemfactory.h +include/gtk-4.0/gtk/gtksingleselection.h +include/gtk-4.0/gtk/gtksizegroup.h +include/gtk-4.0/gtk/gtksizerequest.h +include/gtk-4.0/gtk/gtkslicelistmodel.h +include/gtk-4.0/gtk/gtksnapshot.h +include/gtk-4.0/gtk/gtksorter.h +include/gtk-4.0/gtk/gtksortlistmodel.h +include/gtk-4.0/gtk/gtkspinbutton.h +include/gtk-4.0/gtk/gtkspinner.h +include/gtk-4.0/gtk/gtkstack.h +include/gtk-4.0/gtk/gtkstacksidebar.h +include/gtk-4.0/gtk/gtkstackswitcher.h +include/gtk-4.0/gtk/gtkstatusbar.h +include/gtk-4.0/gtk/gtkstringfilter.h +include/gtk-4.0/gtk/gtkstringlist.h +include/gtk-4.0/gtk/gtkstringsorter.h +include/gtk-4.0/gtk/gtkstylecontext.h +include/gtk-4.0/gtk/gtkstyleprovider.h +include/gtk-4.0/gtk/gtkswitch.h +include/gtk-4.0/gtk/gtktestatcontext.h +include/gtk-4.0/gtk/gtktestutils.h +include/gtk-4.0/gtk/gtktext.h +include/gtk-4.0/gtk/gtktextbuffer.h +include/gtk-4.0/gtk/gtktextchild.h +include/gtk-4.0/gtk/gtktextiter.h +include/gtk-4.0/gtk/gtktextmark.h +include/gtk-4.0/gtk/gtktexttag.h +include/gtk-4.0/gtk/gtktexttagtable.h +include/gtk-4.0/gtk/gtktextview.h +include/gtk-4.0/gtk/gtktogglebutton.h +include/gtk-4.0/gtk/gtktooltip.h +include/gtk-4.0/gtk/gtktreednd.h +include/gtk-4.0/gtk/gtktreeexpander.h +include/gtk-4.0/gtk/gtktreelistmodel.h +include/gtk-4.0/gtk/gtktreelistrowsorter.h +include/gtk-4.0/gtk/gtktreemodel.h +include/gtk-4.0/gtk/gtktreemodelfilter.h +include/gtk-4.0/gtk/gtktreemodelsort.h +include/gtk-4.0/gtk/gtktreeselection.h +include/gtk-4.0/gtk/gtktreesortable.h +include/gtk-4.0/gtk/gtktreestore.h +include/gtk-4.0/gtk/gtktreeview.h +include/gtk-4.0/gtk/gtktreeviewcolumn.h +include/gtk-4.0/gtk/gtktypebuiltins.h +include/gtk-4.0/gtk/gtktypes.h +include/gtk-4.0/gtk/gtkversion.h +include/gtk-4.0/gtk/gtkvideo.h +include/gtk-4.0/gtk/gtkviewport.h +include/gtk-4.0/gtk/gtkvolumebutton.h +include/gtk-4.0/gtk/gtkwidget.h +include/gtk-4.0/gtk/gtkwidgetpaintable.h +include/gtk-4.0/gtk/gtkwindow.h +include/gtk-4.0/gtk/gtkwindowcontrols.h +include/gtk-4.0/gtk/gtkwindowgroup.h +include/gtk-4.0/gtk/gtkwindowhandle.h +include/gtk-4.0/unix-print/gtk/gtkpagesetupunixdialog.h +include/gtk-4.0/unix-print/gtk/gtkprinter.h +include/gtk-4.0/unix-print/gtk/gtkprintjob.h +include/gtk-4.0/unix-print/gtk/gtkprintunixdialog.h +include/gtk-4.0/unix-print/gtk/gtkunixprint-autocleanups.h +include/gtk-4.0/unix-print/gtk/gtkunixprint.h +lib/girepository-1.0/Gdk-4.0.typelib +lib/girepository-1.0/GdkWayland-4.0.typelib +lib/girepository-1.0/GdkX11-4.0.typelib +lib/girepository-1.0/Gsk-4.0.typelib +lib/girepository-1.0/Gtk-4.0.typelib +%%FFMPEG%%lib/gtk-4.0/4.0.0/media/libmedia-ffmpeg.so +%%GSTREAMER%%lib/gtk-4.0/4.0.0/media/libmedia-gstreamer.so +%%CLOUDPRINT%%lib/gtk-4.0/4.0.0/printbackends/libprintbackend-cloudprint.so +lib/gtk-4.0/4.0.0/printbackends/libprintbackend-cups.so +lib/gtk-4.0/4.0.0/printbackends/libprintbackend-file.so +lib/libgtk-4.so +lib/libgtk-4.so.1 +lib/libgtk-4.so.1.200.0 +libdata/pkgconfig/gtk4-broadway.pc +libdata/pkgconfig/gtk4-unix-print.pc +libdata/pkgconfig/gtk4-wayland.pc +libdata/pkgconfig/gtk4-x11.pc +libdata/pkgconfig/gtk4.pc +share/applications/org.gtk.Demo4.desktop +share/applications/org.gtk.IconBrowser4.desktop +share/applications/org.gtk.PrintEditor4.desktop +share/applications/org.gtk.WidgetFactory4.desktop +share/gettext/its/gtk4builder.its +share/gettext/its/gtk4builder.loc +share/gir-1.0/Gdk-4.0.gir +share/gir-1.0/GdkWayland-4.0.gir +share/gir-1.0/GdkX11-4.0.gir +share/gir-1.0/Gsk-4.0.gir +share/gir-1.0/Gtk-4.0.gir +%%DATADIR%%-4.0/emoji/de.gresource +%%DATADIR%%-4.0/emoji/es.gresource +%%DATADIR%%-4.0/emoji/fr.gresource +%%DATADIR%%-4.0/emoji/zh.gresource +%%DATADIR%%-4.0/gtk4builder.rng +%%DATADIR%%-4.0/valgrind/gtk.supp +share/icons/hicolor/scalable/apps/org.gtk.Demo4.svg +share/icons/hicolor/scalable/apps/org.gtk.IconBrowser4.svg +share/icons/hicolor/scalable/apps/org.gtk.PrintEditor4.Devel.svg +share/icons/hicolor/scalable/apps/org.gtk.PrintEditor4.svg +share/icons/hicolor/scalable/apps/org.gtk.WidgetFactory4.svg +share/icons/hicolor/symbolic/apps/org.gtk.Demo4-symbolic.svg +share/icons/hicolor/symbolic/apps/org.gtk.IconBrowser4-symbolic.svg +share/icons/hicolor/symbolic/apps/org.gtk.PrintEditor4-symbolic.svg +share/icons/hicolor/symbolic/apps/org.gtk.WidgetFactory4-symbolic.svg +share/locale/af/LC_MESSAGES/gtk40-properties.mo +share/locale/af/LC_MESSAGES/gtk40.mo +share/locale/am/LC_MESSAGES/gtk40-properties.mo +share/locale/am/LC_MESSAGES/gtk40.mo +share/locale/an/LC_MESSAGES/gtk40-properties.mo +share/locale/an/LC_MESSAGES/gtk40.mo +share/locale/ang/LC_MESSAGES/gtk40-properties.mo +share/locale/ang/LC_MESSAGES/gtk40.mo +share/locale/ar/LC_MESSAGES/gtk40-properties.mo +share/locale/ar/LC_MESSAGES/gtk40.mo +share/locale/as/LC_MESSAGES/gtk40-properties.mo +share/locale/as/LC_MESSAGES/gtk40.mo +share/locale/ast/LC_MESSAGES/gtk40-properties.mo +share/locale/ast/LC_MESSAGES/gtk40.mo +share/locale/az/LC_MESSAGES/gtk40-properties.mo +share/locale/az/LC_MESSAGES/gtk40.mo +share/locale/az_IR/LC_MESSAGES/gtk40-properties.mo +share/locale/az_IR/LC_MESSAGES/gtk40.mo +share/locale/be/LC_MESSAGES/gtk40-properties.mo +share/locale/be/LC_MESSAGES/gtk40.mo +share/locale/be@latin/LC_MESSAGES/gtk40-properties.mo +share/locale/be@latin/LC_MESSAGES/gtk40.mo +share/locale/bg/LC_MESSAGES/gtk40-properties.mo +share/locale/bg/LC_MESSAGES/gtk40.mo +share/locale/bn/LC_MESSAGES/gtk40-properties.mo +share/locale/bn/LC_MESSAGES/gtk40.mo +share/locale/bn_IN/LC_MESSAGES/gtk40-properties.mo +share/locale/bn_IN/LC_MESSAGES/gtk40.mo +share/locale/br/LC_MESSAGES/gtk40-properties.mo +share/locale/br/LC_MESSAGES/gtk40.mo +share/locale/bs/LC_MESSAGES/gtk40-properties.mo +share/locale/bs/LC_MESSAGES/gtk40.mo +share/locale/ca/LC_MESSAGES/gtk40-properties.mo +share/locale/ca/LC_MESSAGES/gtk40.mo +share/locale/ca@valencia/LC_MESSAGES/gtk40-properties.mo +share/locale/ca@valencia/LC_MESSAGES/gtk40.mo +share/locale/crh/LC_MESSAGES/gtk40-properties.mo +share/locale/crh/LC_MESSAGES/gtk40.mo +share/locale/cs/LC_MESSAGES/gtk40-properties.mo +share/locale/cs/LC_MESSAGES/gtk40.mo +share/locale/cy/LC_MESSAGES/gtk40-properties.mo +share/locale/cy/LC_MESSAGES/gtk40.mo +share/locale/da/LC_MESSAGES/gtk40-properties.mo +share/locale/da/LC_MESSAGES/gtk40.mo +share/locale/de/LC_MESSAGES/gtk40-properties.mo +share/locale/de/LC_MESSAGES/gtk40.mo +share/locale/dz/LC_MESSAGES/gtk40-properties.mo +share/locale/dz/LC_MESSAGES/gtk40.mo +share/locale/el/LC_MESSAGES/gtk40-properties.mo +share/locale/el/LC_MESSAGES/gtk40.mo +share/locale/en/LC_MESSAGES/gtk40-properties.mo +share/locale/en/LC_MESSAGES/gtk40.mo +share/locale/en@shaw/LC_MESSAGES/gtk40-properties.mo +share/locale/en@shaw/LC_MESSAGES/gtk40.mo +share/locale/en_CA/LC_MESSAGES/gtk40-properties.mo +share/locale/en_CA/LC_MESSAGES/gtk40.mo +share/locale/en_GB/LC_MESSAGES/gtk40-properties.mo +share/locale/en_GB/LC_MESSAGES/gtk40.mo +share/locale/eo/LC_MESSAGES/gtk40-properties.mo +share/locale/eo/LC_MESSAGES/gtk40.mo +share/locale/es/LC_MESSAGES/gtk40-properties.mo +share/locale/es/LC_MESSAGES/gtk40.mo +share/locale/et/LC_MESSAGES/gtk40-properties.mo +share/locale/et/LC_MESSAGES/gtk40.mo +share/locale/eu/LC_MESSAGES/gtk40-properties.mo +share/locale/eu/LC_MESSAGES/gtk40.mo +share/locale/fa/LC_MESSAGES/gtk40-properties.mo +share/locale/fa/LC_MESSAGES/gtk40.mo +share/locale/fi/LC_MESSAGES/gtk40-properties.mo +share/locale/fi/LC_MESSAGES/gtk40.mo +share/locale/fr/LC_MESSAGES/gtk40-properties.mo +share/locale/fr/LC_MESSAGES/gtk40.mo +share/locale/fur/LC_MESSAGES/gtk40-properties.mo +share/locale/fur/LC_MESSAGES/gtk40.mo +share/locale/ga/LC_MESSAGES/gtk40-properties.mo +share/locale/ga/LC_MESSAGES/gtk40.mo +share/locale/gd/LC_MESSAGES/gtk40-properties.mo +share/locale/gd/LC_MESSAGES/gtk40.mo +share/locale/gl/LC_MESSAGES/gtk40-properties.mo +share/locale/gl/LC_MESSAGES/gtk40.mo +share/locale/gu/LC_MESSAGES/gtk40-properties.mo +share/locale/gu/LC_MESSAGES/gtk40.mo +share/locale/he/LC_MESSAGES/gtk40-properties.mo +share/locale/he/LC_MESSAGES/gtk40.mo +share/locale/hi/LC_MESSAGES/gtk40-properties.mo +share/locale/hi/LC_MESSAGES/gtk40.mo +share/locale/hr/LC_MESSAGES/gtk40-properties.mo +share/locale/hr/LC_MESSAGES/gtk40.mo +share/locale/hu/LC_MESSAGES/gtk40-properties.mo +share/locale/hu/LC_MESSAGES/gtk40.mo +share/locale/hy/LC_MESSAGES/gtk40-properties.mo +share/locale/hy/LC_MESSAGES/gtk40.mo +share/locale/ia/LC_MESSAGES/gtk40-properties.mo +share/locale/ia/LC_MESSAGES/gtk40.mo +share/locale/id/LC_MESSAGES/gtk40-properties.mo +share/locale/id/LC_MESSAGES/gtk40.mo +share/locale/io/LC_MESSAGES/gtk40-properties.mo +share/locale/io/LC_MESSAGES/gtk40.mo +share/locale/is/LC_MESSAGES/gtk40-properties.mo +share/locale/is/LC_MESSAGES/gtk40.mo +share/locale/it/LC_MESSAGES/gtk40-properties.mo +share/locale/it/LC_MESSAGES/gtk40.mo +share/locale/ja/LC_MESSAGES/gtk40-properties.mo +share/locale/ja/LC_MESSAGES/gtk40.mo +share/locale/ka/LC_MESSAGES/gtk40-properties.mo +share/locale/ka/LC_MESSAGES/gtk40.mo +share/locale/kg/LC_MESSAGES/gtk40-properties.mo +share/locale/kg/LC_MESSAGES/gtk40.mo +share/locale/kk/LC_MESSAGES/gtk40-properties.mo +share/locale/kk/LC_MESSAGES/gtk40.mo +share/locale/km/LC_MESSAGES/gtk40-properties.mo +share/locale/km/LC_MESSAGES/gtk40.mo +share/locale/kn/LC_MESSAGES/gtk40-properties.mo +share/locale/kn/LC_MESSAGES/gtk40.mo +share/locale/ko/LC_MESSAGES/gtk40-properties.mo +share/locale/ko/LC_MESSAGES/gtk40.mo +share/locale/ku/LC_MESSAGES/gtk40-properties.mo +share/locale/ku/LC_MESSAGES/gtk40.mo +share/locale/ky/LC_MESSAGES/gtk40-properties.mo +share/locale/ky/LC_MESSAGES/gtk40.mo +share/locale/lg/LC_MESSAGES/gtk40-properties.mo +share/locale/lg/LC_MESSAGES/gtk40.mo +share/locale/li/LC_MESSAGES/gtk40-properties.mo +share/locale/li/LC_MESSAGES/gtk40.mo +share/locale/lt/LC_MESSAGES/gtk40-properties.mo +share/locale/lt/LC_MESSAGES/gtk40.mo +share/locale/lv/LC_MESSAGES/gtk40-properties.mo +share/locale/lv/LC_MESSAGES/gtk40.mo +share/locale/mai/LC_MESSAGES/gtk40-properties.mo +share/locale/mai/LC_MESSAGES/gtk40.mo +share/locale/mi/LC_MESSAGES/gtk40-properties.mo +share/locale/mi/LC_MESSAGES/gtk40.mo +share/locale/mjw/LC_MESSAGES/gtk40-properties.mo +share/locale/mjw/LC_MESSAGES/gtk40.mo +share/locale/mk/LC_MESSAGES/gtk40-properties.mo +share/locale/mk/LC_MESSAGES/gtk40.mo +share/locale/ml/LC_MESSAGES/gtk40-properties.mo +share/locale/ml/LC_MESSAGES/gtk40.mo +share/locale/mn/LC_MESSAGES/gtk40-properties.mo +share/locale/mn/LC_MESSAGES/gtk40.mo +share/locale/mr/LC_MESSAGES/gtk40-properties.mo +share/locale/mr/LC_MESSAGES/gtk40.mo +share/locale/ms/LC_MESSAGES/gtk40-properties.mo +share/locale/ms/LC_MESSAGES/gtk40.mo +share/locale/my/LC_MESSAGES/gtk40-properties.mo +share/locale/my/LC_MESSAGES/gtk40.mo +share/locale/nb/LC_MESSAGES/gtk40-properties.mo +share/locale/nb/LC_MESSAGES/gtk40.mo +share/locale/nds/LC_MESSAGES/gtk40-properties.mo +share/locale/nds/LC_MESSAGES/gtk40.mo +share/locale/ne/LC_MESSAGES/gtk40-properties.mo +share/locale/ne/LC_MESSAGES/gtk40.mo +share/locale/nl/LC_MESSAGES/gtk40-properties.mo +share/locale/nl/LC_MESSAGES/gtk40.mo +share/locale/nn/LC_MESSAGES/gtk40-properties.mo +share/locale/nn/LC_MESSAGES/gtk40.mo +share/locale/nso/LC_MESSAGES/gtk40-properties.mo +share/locale/nso/LC_MESSAGES/gtk40.mo +share/locale/oc/LC_MESSAGES/gtk40-properties.mo +share/locale/oc/LC_MESSAGES/gtk40.mo +share/locale/or/LC_MESSAGES/gtk40-properties.mo +share/locale/or/LC_MESSAGES/gtk40.mo +share/locale/pa/LC_MESSAGES/gtk40-properties.mo +share/locale/pa/LC_MESSAGES/gtk40.mo +share/locale/pl/LC_MESSAGES/gtk40-properties.mo +share/locale/pl/LC_MESSAGES/gtk40.mo +share/locale/ps/LC_MESSAGES/gtk40-properties.mo +share/locale/ps/LC_MESSAGES/gtk40.mo +share/locale/pt/LC_MESSAGES/gtk40-properties.mo +share/locale/pt/LC_MESSAGES/gtk40.mo +share/locale/pt_BR/LC_MESSAGES/gtk40-properties.mo +share/locale/pt_BR/LC_MESSAGES/gtk40.mo +share/locale/ro/LC_MESSAGES/gtk40-properties.mo +share/locale/ro/LC_MESSAGES/gtk40.mo +share/locale/ru/LC_MESSAGES/gtk40-properties.mo +share/locale/ru/LC_MESSAGES/gtk40.mo +share/locale/rw/LC_MESSAGES/gtk40-properties.mo +share/locale/rw/LC_MESSAGES/gtk40.mo +share/locale/si/LC_MESSAGES/gtk40-properties.mo +share/locale/si/LC_MESSAGES/gtk40.mo +share/locale/sk/LC_MESSAGES/gtk40-properties.mo +share/locale/sk/LC_MESSAGES/gtk40.mo +share/locale/sl/LC_MESSAGES/gtk40-properties.mo +share/locale/sl/LC_MESSAGES/gtk40.mo +share/locale/sq/LC_MESSAGES/gtk40-properties.mo +share/locale/sq/LC_MESSAGES/gtk40.mo +share/locale/sr/LC_MESSAGES/gtk40-properties.mo +share/locale/sr/LC_MESSAGES/gtk40.mo +share/locale/sr@ije/LC_MESSAGES/gtk40-properties.mo +share/locale/sr@ije/LC_MESSAGES/gtk40.mo +share/locale/sr@latin/LC_MESSAGES/gtk40-properties.mo +share/locale/sr@latin/LC_MESSAGES/gtk40.mo +share/locale/sv/LC_MESSAGES/gtk40-properties.mo +share/locale/sv/LC_MESSAGES/gtk40.mo +share/locale/ta/LC_MESSAGES/gtk40-properties.mo +share/locale/ta/LC_MESSAGES/gtk40.mo +share/locale/te/LC_MESSAGES/gtk40-properties.mo +share/locale/te/LC_MESSAGES/gtk40.mo +share/locale/tg/LC_MESSAGES/gtk40-properties.mo +share/locale/tg/LC_MESSAGES/gtk40.mo +share/locale/th/LC_MESSAGES/gtk40-properties.mo +share/locale/th/LC_MESSAGES/gtk40.mo +share/locale/tk/LC_MESSAGES/gtk40-properties.mo +share/locale/tk/LC_MESSAGES/gtk40.mo +share/locale/tr/LC_MESSAGES/gtk40-properties.mo +share/locale/tr/LC_MESSAGES/gtk40.mo +share/locale/tt/LC_MESSAGES/gtk40-properties.mo +share/locale/tt/LC_MESSAGES/gtk40.mo +share/locale/ug/LC_MESSAGES/gtk40-properties.mo +share/locale/ug/LC_MESSAGES/gtk40.mo +share/locale/uk/LC_MESSAGES/gtk40-properties.mo +share/locale/uk/LC_MESSAGES/gtk40.mo +share/locale/ur/LC_MESSAGES/gtk40-properties.mo +share/locale/ur/LC_MESSAGES/gtk40.mo +share/locale/uz/LC_MESSAGES/gtk40-properties.mo +share/locale/uz/LC_MESSAGES/gtk40.mo +share/locale/uz@cyrillic/LC_MESSAGES/gtk40-properties.mo +share/locale/uz@cyrillic/LC_MESSAGES/gtk40.mo +share/locale/vi/LC_MESSAGES/gtk40-properties.mo +share/locale/vi/LC_MESSAGES/gtk40.mo +share/locale/wa/LC_MESSAGES/gtk40-properties.mo +share/locale/wa/LC_MESSAGES/gtk40.mo +share/locale/xh/LC_MESSAGES/gtk40-properties.mo +share/locale/xh/LC_MESSAGES/gtk40.mo +share/locale/yi/LC_MESSAGES/gtk40-properties.mo +share/locale/yi/LC_MESSAGES/gtk40.mo +share/locale/zh_CN/LC_MESSAGES/gtk40-properties.mo +share/locale/zh_CN/LC_MESSAGES/gtk40.mo +share/locale/zh_HK/LC_MESSAGES/gtk40-properties.mo +share/locale/zh_HK/LC_MESSAGES/gtk40.mo +share/locale/zh_TW/LC_MESSAGES/gtk40-properties.mo +share/locale/zh_TW/LC_MESSAGES/gtk40.mo +share/metainfo/org.gtk.Demo4.appdata.xml +share/metainfo/org.gtk.IconBrowser4.appdata.xml +share/metainfo/org.gtk.PrintEditor4.appdata.xml +share/metainfo/org.gtk.WidgetFactory4.appdata.xml +@dir lib/gtk-4.0/engines +@dir lib/gtk-4.0/loaders +@dir lib/gtk-4.0/modules Index: x11-toolkits/pango/Makefile =================================================================== --- x11-toolkits/pango/Makefile +++ x11-toolkits/pango/Makefile @@ -1,8 +1,7 @@ # Created by: Maxim Sobolev PORTNAME= pango -PORTVERSION= 1.42.4 -PORTREVISION= 5 +PORTVERSION= 1.48.4 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -28,20 +27,17 @@ USE_GNOME= cairo glib20 introspection:build VERSION= 1.8.0 -LIBVERSION= 0.4200.3 +LIBVERSION= 0.4800.4 PLIST_SUB+= VERSION=${VERSION} LIBVERSION=${LIBVERSION} FONTSCALE= ${LOCALBASE}/share/fonts/TTF/luximb.ttf FONTENCOD= ${LOCALBASE}/share/fonts/encodings/encodings.dir OPTIONS_SUB= yes -OPTIONS_DEFINE= X11 DOCS +OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 -DOCS_MESON_TRUE= enable_docs -DOCS_BUILD_DEPENDS= gtk-doc>=0:textproc/gtk-doc - -X11_MESON_TRUE= xft +X11_MESON_ENABLED= xft X11_USES= xorg X11_USE= XORG=x11,xft,xrender Index: x11-toolkits/pango/distinfo =================================================================== --- x11-toolkits/pango/distinfo +++ x11-toolkits/pango/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536530045 -SHA256 (gnome2/pango-1.42.4.tar.xz) = 1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d -SIZE (gnome2/pango-1.42.4.tar.xz) = 833876 +TIMESTAMP = 1618463221 +SHA256 (gnome2/pango-1.48.4.tar.xz) = 418913fb062071a075846244989d4a67aa5c80bf0eae8ee4555a092fd566a37a +SIZE (gnome2/pango-1.48.4.tar.xz) = 1791332 Index: x11-toolkits/pango/files/patch-CVE-20191010238.c =================================================================== --- x11-toolkits/pango/files/patch-CVE-20191010238.c +++ /dev/null @@ -1,16 +0,0 @@ ---- pango/pango-bidi-type.c.orig 2018-07-28 15:15:28 UTC -+++ pango/pango-bidi-type.c -@@ -179,8 +179,11 @@ pango_log2vis_get_embedding_levels (const gchar *te - for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++) - { - gunichar ch = g_utf8_get_char (p); -- FriBidiCharType char_type; -- char_type = fribidi_get_bidi_type (ch); -+ FriBidiCharType char_type = fribidi_get_bidi_type (ch); -+ -+ if (i == n_chars) -+ break; -+ - bidi_types[i] = char_type; - ored_types |= char_type; - if (FRIBIDI_IS_STRONG (char_type)) Index: x11-toolkits/pango/files/patch-docs-meson.build =================================================================== --- x11-toolkits/pango/files/patch-docs-meson.build +++ /dev/null @@ -1,40 +0,0 @@ ---- docs/meson.build.orig 2018-04-24 19:46:15 UTC -+++ docs/meson.build -@@ -40,16 +40,20 @@ if host_system != 'darwin' - ] - endif - -+xft_private_headers = [ -+ 'pangoxft.h', -+ 'pangoxft-render.h', -+] - if host_system != 'windows' - private_headers += [ - 'pangocairo-win32.h', - 'pangowin32.h', - ] -+ if not get_option('xft') -+ private_headers += xft_private_headers -+ endif - else -- private_headers += [ -- 'pangoxft.h', -- 'pangoxft-render.h', -- ] -+ private_headers += xft_private_headers - endif - - content_files = [ -@@ -68,8 +72,10 @@ if build_pangoft2 - docdeps += libpangoft2_dep - endif - --if xft_dep.found() -- docdeps += libpangoxft_dep -+if get_option('xft') -+ if xft_dep.found() -+ docdeps += libpangoxft_dep -+ endif - endif - - if cairo_dep.found() Index: x11-toolkits/pango/files/patch-meson.build =================================================================== --- x11-toolkits/pango/files/patch-meson.build +++ /dev/null @@ -1,35 +0,0 @@ ---- meson.build.orig 2018-04-07 12:06:28.000000000 +0200 -+++ meson.build 2018-05-08 15:01:59.098440000 +0200 -@@ -297,11 +297,13 @@ - pango_deps += freetype_dep - endif - --xft_dep = dependency('xft', version: xft_req_version, required: false) --if xft_dep.found() -- pango_conf.set('HAVE_XFT', 1) -- pango_deps += dependency('xrender', required: false) -- pango_deps += xft_dep -+if get_option('xft') -+ xft_dep = dependency('xft', version: xft_req_version, required: false) -+ if xft_dep.found() -+ pango_conf.set('HAVE_XFT', 1) -+ pango_deps += dependency('xrender', required: false) -+ pango_deps += xft_dep -+ endif - endif - - if host_system == 'darwin' -@@ -481,9 +483,12 @@ - [ 'pango.pc' ], - [ 'pangowin32.pc', host_system == 'windows' ], - [ 'pangoft2.pc', build_pangoft2 ], -- [ 'pangoxft.pc', xft_dep.found() ], - [ 'pangocairo.pc', cairo_dep.found() ], - ] -+ -+if get_option('xft') -+ pkgconf_files += [[ 'pangoxft.pc', xft_dep.found() ]] -+endif - - foreach pkg: pkgconf_files - pkg_name = pkg[0] Index: x11-toolkits/pango/files/patch-meson_options.txt =================================================================== --- x11-toolkits/pango/files/patch-meson_options.txt +++ /dev/null @@ -1,18 +0,0 @@ ---- meson_options.txt.orig 2018-05-10 12:18:01.824158000 +0200 -+++ meson_options.txt 2018-05-10 12:18:30.158458000 +0200 -@@ -2,7 +2,15 @@ - description: 'Build API reference for Pango using GTK-Doc', - type: 'boolean', - value: false) -+option('enable_installed_tests', -+ description: 'Install test programs', -+ type: 'boolean', -+ value: false) - option('gir', - description: 'Build the GObject introspection data for Pango', -+ type: 'boolean', -+ value: true) -+option('xft', -+ description: 'Build Xft/XRender support', - type: 'boolean', - value: true) Index: x11-toolkits/pango/files/patch-pango_meson.build =================================================================== --- x11-toolkits/pango/files/patch-pango_meson.build +++ /dev/null @@ -1,111 +0,0 @@ ---- pango/meson.build.orig 2018-07-17 19:43:45.000000000 -0400 -+++ pango/meson.build 2018-09-03 14:20:00.192740000 -0400 -@@ -239,59 +239,62 @@ - endif - - # Xft --if xft_dep.found() -- pangoxft_headers = [ -- 'pangoxft.h', -- 'pangoxft-render.h', -- ] -+if get_option('xft') -+ if xft_dep.found() -+ pangoxft_headers = [ -+ 'pangoxft.h', -+ 'pangoxft-render.h', -+ ] - -- pangoxft_sources = [ -- 'pangoxft-font.c', -- 'pangoxft-fontmap.c', -- 'pangoxft-render.c', -- ] -+ pangoxft_sources = [ -+ 'pangoxft-font.c', -+ 'pangoxft-fontmap.c', -+ 'pangoxft-render.c', -+ ] - - install_headers(pangoxft_headers, subdir: pango_api_path) -+ install_headers(pangoxft_headers, subdir: pango_api_path) - -- libpangoxft = library( -- 'pangoxft-@0@'.format(pango_api_version), -- sources: pangoxft_sources, -- version: pango_libversion, -- soversion: pango_soversion, -- install: true, -- dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ], -- include_directories: [ root_inc, pango_inc ], -- c_args: common_cflags + pango_debug_cflags + pango_cflags + [ -- '-DPANGO_DISABLE_DEPRECATION_WARNINGS', -- ], -- link_args: common_ldflags, -- ) -- pangoxft_dep_sources = [] -- -- if build_gir -- pangoxft_gir = gnome.generate_gir( -- libpangoxft, -- sources: pangoxft_headers + pangoxft_sources, -- dependencies: [ libpango_dep, libpangoft2_dep, pango_gir_dep, pangoft2_gir_dep ], -- namespace: 'PangoXft', -- nsversion: pango_api_version, -- identifier_prefix: 'PangoXft', -- symbol_prefix: 'pango_xft', -- export_packages: 'pangoxft', -- includes: [ pango_gir[0], pangoft2_gir[0], 'GObject-2.0', 'xft-2.0', 'xlib-2.0' ], -- header: 'pango/pangoxft.h', -+ libpangoxft = library( -+ 'pangoxft-@0@'.format(pango_api_version), -+ sources: pangoxft_sources, -+ version: pango_libversion, -+ soversion: pango_soversion, - install: true, -- extra_args: gir_args, -+ dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ], -+ include_directories: [ root_inc, pango_inc ], -+ c_args: common_cflags + pango_debug_cflags + pango_cflags + [ -+ '-DPANGO_DISABLE_DEPRECATION_WARNINGS', -+ ], -+ link_args: common_ldflags, - ) -- pangoxft_dep_sources += pangoxft_gir -- endif -+ pangoxft_dep_sources = [] - -- libpangoxft_dep = declare_dependency( -- link_with: libpangoxft, -- include_directories: root_inc, -- dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ], -- sources: pangoxft_dep_sources, -- ) -+ if build_gir -+ pangoxft_gir = gnome.generate_gir( -+ libpangoxft, -+ sources: pangoxft_headers + pangoxft_sources, -+ dependencies: [ libpango_dep, libpangoft2_dep, pango_gir_dep, pangoft2_gir_dep ], -+ namespace: 'PangoXft', -+ nsversion: pango_api_version, -+ identifier_prefix: 'PangoXft', -+ symbol_prefix: 'pango_xft', -+ export_packages: 'pangoxft', -+ includes: [ pango_gir[0], pangoft2_gir[0], 'GObject-2.0', 'xft-2.0', 'xlib-2.0' ], -+ header: 'pango/pangoxft.h', -+ install: true, -+ extra_args: gir_args, -+ ) -+ pangoxft_dep_sources += pangoxft_gir -+ endif -+ -+ libpangoxft_dep = declare_dependency( -+ link_with: libpangoxft, -+ include_directories: root_inc, -+ dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ], -+ sources: pangoxft_dep_sources, -+ ) -+ endif - else - # For usage as a subproject - libpangoxft_dep = dependency('', required: false) Index: x11-toolkits/pango/files/patch-tests_meson.build =================================================================== --- x11-toolkits/pango/files/patch-tests_meson.build +++ /dev/null @@ -1,92 +0,0 @@ ---- tests/meson.build.orig 2018-04-07 12:00:40.000000000 +0200 -+++ tests/meson.build 2018-05-10 12:09:26.358132000 +0200 -@@ -2,8 +2,10 @@ - '-DSRCDIR=@0@'.format(meson.current_source_dir()), - ] - --if xft_dep.found() -- test_cflags += [ '-DHAVE_X', '-DHAVE_XFT' ] -+if get_option('xft') -+ if xft_dep.found() -+ test_cflags += [ '-DHAVE_X', '-DHAVE_XFT' ] -+ endif - endif - - if host_system == 'windows' -@@ -85,15 +87,18 @@ - installed_test_datadir = join_paths(pango_datadir, 'installed-tests', 'pango') - installed_test_bindir = join_paths(pango_libexecdir, 'installed-tests', 'pango') - --install_data(installed_test_data, install_dir: installed_test_bindir) --install_data(installed_test_layouts_data, install_dir: join_paths(installed_test_bindir, 'layouts')) --install_data(installed_test_markups_data, install_dir: join_paths(installed_test_bindir, 'markups')) -+if get_option('enable_installed_tests') -+ install_data(installed_test_data, install_dir: installed_test_bindir) -+ install_data(installed_test_layouts_data, install_dir: join_paths(installed_test_bindir, 'layouts')) -+ install_data(installed_test_markups_data, install_dir: join_paths(installed_test_bindir, 'markups')) -+endif - - python = import('python3').find_python() - gen_installed_test = files([ 'gen-installed-test.py' ]) - gen_all_unicode = files([ 'gen-all-unicode.py' ]) - --custom_target('all-unicode', -+if get_option('enable_installed_tests') -+ custom_target('all-unicode', - output: 'all-unicode.txt', - command: [ - python, gen_all_unicode, '@OUTPUT@' -@@ -101,29 +106,30 @@ - install: true, - install_dir: installed_test_bindir) - --foreach t: tests -- name = t[0] -- src = t.get(1, [ '@0@.c'.format(name) ]) -- deps = t.get(2, [ libpango_dep ]) -+ foreach t: tests -+ name = t[0] -+ src = t.get(1, [ '@0@.c'.format(name) ]) -+ deps = t.get(2, [ libpango_dep ]) - -- custom_target(name + '.test', -- output: name + '.test', -- command: [ -- python, gen_installed_test, -- installed_test_bindir, -- name, -- '@OUTDIR@', -- ], -- install: true, -- install_dir: installed_test_datadir) -+ custom_target(name + '.test', -+ output: name + '.test', -+ command: [ -+ python, gen_installed_test, -+ installed_test_bindir, -+ name, -+ '@OUTDIR@', -+ ], -+ install: true, -+ install_dir: installed_test_datadir) - -- bin = executable(name, src, -- dependencies: deps, -- include_directories: root_inc, -- c_args: common_cflags + pango_debug_cflags + test_cflags, -- cpp_args: common_cppflags + pango_debug_cflags + test_cflags, -- install: true, -- install_dir: installed_test_bindir) -+ bin = executable(name, src, -+ dependencies: deps, -+ include_directories: root_inc, -+ c_args: common_cflags + pango_debug_cflags + test_cflags, -+ cpp_args: common_cppflags + pango_debug_cflags + test_cflags, -+ install: true, -+ install_dir: installed_test_bindir) - -- test(name, bin, env: test_env) --endforeach -+ test(name, bin, env: test_env) -+ endforeach -+endif Index: x11-toolkits/pango/files/patch-utils_meson.build =================================================================== --- x11-toolkits/pango/files/patch-utils_meson.build +++ /dev/null @@ -1,32 +0,0 @@ ---- utils/meson.build.orig 2018-09-09 23:55:54.363487000 +0200 -+++ utils/meson.build 2018-09-09 23:56:55.810617000 +0200 -@@ -14,12 +14,14 @@ - pango_view_deps += libpangoft2_dep - endif - --if xft_dep.found() and build_pangoft2 -- pango_view_sources += [ -- 'viewer-pangoxft.c', -- 'viewer-x.c', -- ] -- pango_view_deps += [ libpangoft2_dep, libpangoxft_dep, ] -+if get_option('xft') -+ if xft_dep.found() and build_pangoft2 -+ pango_view_sources += [ -+ 'viewer-pangoxft.c', -+ 'viewer-x.c', -+ ] -+ pango_view_deps += [ libpangoft2_dep, libpangoxft_dep, ] -+ endif - endif - - if cairo_dep.found() -@@ -54,7 +56,7 @@ - help2man, help2man_opts, '--output=@OUTPUT@', pango_view - ], - install: true, -- install_dir: join_paths(pango_datadir, 'man/man1')) -+ install_dir: join_paths(pango_prefix, 'man/man1')) - endif - - if cairo_dep.found() Index: x11-toolkits/pango/pkg-plist =================================================================== --- x11-toolkits/pango/pkg-plist +++ x11-toolkits/pango/pkg-plist @@ -5,6 +5,7 @@ include/pango-1.0/pango/pango-break.h include/pango-1.0/pango/pango-context.h include/pango-1.0/pango/pango-coverage.h +include/pango-1.0/pango/pango-direction.h include/pango-1.0/pango/pango-engine.h include/pango-1.0/pango/pango-enum-types.h include/pango-1.0/pango/pango-features.h @@ -37,6 +38,8 @@ lib/girepository-1.0/Pango-1.0.typelib lib/girepository-1.0/PangoCairo-1.0.typelib lib/girepository-1.0/PangoFT2-1.0.typelib +lib/girepository-1.0/PangoFc-1.0.typelib +lib/girepository-1.0/PangoOT-1.0.typelib %%X11%%lib/girepository-1.0/PangoXft-1.0.typelib lib/libpango-1.0.so lib/libpango-1.0.so.0 @@ -52,76 +55,15 @@ %%X11%%lib/libpangoxft-1.0.so.%%LIBVERSION%% libdata/pkgconfig/pango.pc libdata/pkgconfig/pangocairo.pc +libdata/pkgconfig/pangofc.pc libdata/pkgconfig/pangoft2.pc +libdata/pkgconfig/pangoot.pc %%X11%%libdata/pkgconfig/pangoxft.pc -man/man1/pango-view.1.gz share/gir-1.0/Pango-1.0.gir share/gir-1.0/PangoCairo-1.0.gir share/gir-1.0/PangoFT2-1.0.gir +share/gir-1.0/PangoFc-1.0.gir +share/gir-1.0/PangoOT-1.0.gir %%X11%%share/gir-1.0/PangoXft-1.0.gir -%%PORTDOCS%%share/gtk-doc/html/pango/PangoEngineLang.html -%%PORTDOCS%%share/gtk-doc/html/pango/PangoEngineShape.html -%%PORTDOCS%%share/gtk-doc/html/pango/PangoFcDecoder.html -%%PORTDOCS%%share/gtk-doc/html/pango/PangoFcFont.html -%%PORTDOCS%%share/gtk-doc/html/pango/PangoFcFontMap.html -%%PORTDOCS%%share/gtk-doc/html/pango/PangoMarkupFormat.html -%%PORTDOCS%%share/gtk-doc/html/pango/PangoRenderer.html -%%PORTDOCS%%share/gtk-doc/html/pango/annotation-glossary.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-10.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-12.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-14.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-16.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-18.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-2.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-20.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-22.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-24.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-26.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-30.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-31-0.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-32-4.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-32.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-34.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-38.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-4.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-40.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-6.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-8.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-deprecated.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-full.html -%%PORTDOCS%%share/gtk-doc/html/pango/home.png -%%PORTDOCS%%share/gtk-doc/html/pango/index.html -%%PORTDOCS%%share/gtk-doc/html/pango/layout.gif -%%PORTDOCS%%share/gtk-doc/html/pango/left-insensitive.png -%%PORTDOCS%%share/gtk-doc/html/pango/left.png -%%PORTDOCS%%share/gtk-doc/html/pango/lowlevel.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Bidirectional-Text.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Cairo-Rendering.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-CoreText-Fonts.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Coverage-Maps.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Engines.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Fonts.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Glyph-Storage.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Layout-Objects.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Modules.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Scripts-and-Languages.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Tab-Stops.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Text-Attributes.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Text-Processing.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Version-Checking.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Vertical-Text.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango-hierarchy.html -%%PORTDOCS%%share/gtk-doc/html/pango/pango.devhelp2 -%%PORTDOCS%%share/gtk-doc/html/pango/pango.html -%%PORTDOCS%%share/gtk-doc/html/pango/rendering.html -%%PORTDOCS%%share/gtk-doc/html/pango/right-insensitive.png -%%PORTDOCS%%share/gtk-doc/html/pango/right.png -%%PORTDOCS%%share/gtk-doc/html/pango/rotated-text.png -%%PORTDOCS%%share/gtk-doc/html/pango/style.css -%%PORTDOCS%%share/gtk-doc/html/pango/up-insensitive.png -%%PORTDOCS%%share/gtk-doc/html/pango/up.png +share/man/man1/pango-view.1.gz +