From 31ec4d522f286b361eeaa081824db2eb754b61f7 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 18 Nov 2019 19:57:43 +0000 Subject: [PATCH] Regent WANTLIB after recent librsvg update (lost its croco dependency). --- devel/goffice/Makefile | 5 ++-- editors/abiword/Makefile | 4 ++-- games/gcompris/Makefile | 6 ++--- graphics/gegl/Makefile | 6 ++--- graphics/gegl03/Makefile | 22 +++++++++--------- graphics/gegl04/Makefile | 5 ++-- graphics/gimp/stable/Makefile | 8 +++---- mail/claws-mail/Makefile | 9 +++++--- math/gnumeric/Makefile | 5 ++-- math/graphviz/Makefile | 7 +++--- .../gstreamer-0.10/plugins-bad/Makefile | 6 ++--- productivity/glabels/Makefile | 6 ++--- x11/compiz/core/Makefile | 23 ++++++++++--------- x11/gnome/aisleriot/Makefile | 5 ++-- x11/gnome/eog-plugins/Makefile | 13 ++++++----- x11/mate/control-center/Makefile | 5 ++-- x11/mate/eom/Makefile | 7 +++--- x11/mate/panel/Makefile | 5 ++-- x11/mate/system-monitor/Makefile | 5 ++-- x11/openbox/Makefile | 6 ++--- x11/vlc/Makefile | 12 ++++++---- x11/xfce4/xfce4-xkb/Makefile | 6 ++--- 22 files changed, 95 insertions(+), 81 deletions(-) diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile index e839035b4f8..982d3d3be46 100644 --- a/devel/goffice/Makefile +++ b/devel/goffice/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.105 2019/11/07 12:15:57 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.106 2019/11/18 19:57:43 ajacoutot Exp $ COMMENT= document centric objects and utilities GNOME_PROJECT= goffice GNOME_VERSION= 0.10.46 +REVISION= 0 # NOTE: when GNOME_VERSION changes, increment GOFFICE_VERSION and # GOFFICE_API_VERSION accordingly and bump: @@ -22,7 +23,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 avahi-common -WANTLIB += bz2 cairo cairo-gobject croco-0.6 dbus-1 epoxy expat +WANTLIB += bz2 cairo cairo-gobject dbus-1 epoxy expat WANTLIB += ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gmp gobject-2.0 graphite2 WANTLIB += gs gsf-1 gthread-2.0 gtk-3 harfbuzz hogweed iconv idn2 diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index dd328002865..d6782747583 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.127 2019/07/12 20:46:04 sthen Exp $ +# $OpenBSD: Makefile,v 1.128 2019/11/18 19:57:43 ajacoutot Exp $ BROKEN= Abort trap on startup (pango related?) @@ -28,7 +28,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 -WANTLIB += avahi-common bz2 c cairo cairo-gobject croco-0.6 crypto +WANTLIB += avahi-common bz2 c cairo cairo-gobject crypto WANTLIB += curl dbus-1 enchant epoxy expat ffi fontconfig freetype WANTLIB += fribidi gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gmp gobject-2.0 goffice-0.10 gpg-error diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index 7dd60148ab4..3481cfa6ab4 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.70 2019/07/12 20:46:18 sthen Exp $ +# $OpenBSD: Makefile,v 1.71 2019/11/18 19:57:44 ajacoutot Exp $ COMMENT= educational game for children DISTNAME= gcompris-17.05 EXTRACT_SUFX= .tar.bz2 -REVISION= 2 +REVISION= 3 CATEGORIES= games education @@ -18,7 +18,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ${MODPY_WANTLIB} WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr -WANTLIB += Xrender atk-1.0 c cairo croco-0.6 expat ffi fontconfig +WANTLIB += Xrender atk-1.0 c cairo cairo-gobject expat ffi fontconfig WANTLIB += freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gstreamer-0.10 gthread-2.0 WANTLIB += gtk-x11-2.0 harfbuzz iconv intl lzma m pango-1.0 diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index 72f4e0f7ce6..c53a98c7044 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.70 2019/11/10 15:32:55 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.71 2019/11/18 19:57:44 ajacoutot Exp $ PORTROACH= limit:^0\.2 @@ -17,7 +17,7 @@ CATEGORIES= graphics devel PKGNAME-main= gegl-${V} PKGNAME-plugins= gegl-plugins-${V} -REVISION-main= 3 +REVISION-main= 4 REVISION-plugins= 4 SHARED_LIBS += gegl-0.2 0.0 # 201.1 @@ -40,7 +40,7 @@ WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 WANTLIB += gthread-2.0 iconv intl m pcre z WANTLIB-main += ${WANTLIB} -WANTLIB-main += X11 Xext Xrender babl-0.1 c cairo croco-0.6 expat fontconfig +WANTLIB-main += X11 Xext Xrender babl-0.1 c cairo expat fontconfig WANTLIB-main += freetype fribidi gdk_pixbuf-2.0 graphite2 harfbuzz WANTLIB-main += jasper jpeg lzma pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB-main += pixman-1 png pthread rsvg-2 xcb xcb-render xcb-shm diff --git a/graphics/gegl03/Makefile b/graphics/gegl03/Makefile index 8bcdd0f0712..46a7557185f 100644 --- a/graphics/gegl03/Makefile +++ b/graphics/gegl03/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.36 2019/07/12 20:46:59 sthen Exp $ +# $OpenBSD: Makefile,v 1.37 2019/11/18 19:57:44 ajacoutot Exp $ PORTROACH= limit:^0\.3 @@ -8,7 +8,7 @@ V= 0.3.34 DISTNAME= gegl-${V} PKGNAME= gegl03-${V} EXTRACT_SUFX= .tar.bz2 -REVISION= 2 +REVISION= 3 SHARED_LIBS += gegl-0.3 0.6 # 332.0 @@ -22,17 +22,17 @@ HOMEPAGE= http://gegl.org/ MAINTAINER= Antoine Jacoutot # GPLv3/LGPLv3 -PERMIT_PACKAGE= Yes +PERMIT_PACKAGE= Yes -WANTLIB += X11 Xext Xrender babl-0.1 cairo croco-0.6 expat ffi -WANTLIB += fontconfig freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0 -WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz -WANTLIB += iconv intl jasper jpeg json-glib-1.0 lcms2 lzma m pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread -WANTLIB += raw rsvg-2 ${COMPILER_LIBCXX} tiff webp xcb xcb-render -WANTLIB += xcb-shm xml2 z fribidi +WANTLIB += X11 Xext Xrender babl-0.1 cairo cairo-gobject expat +WANTLIB += ffi fontconfig freetype fribidi gdk_pixbuf-2.0 gio-2.0 +WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 +WANTLIB += harfbuzz iconv intl jasper jpeg json-glib-1.0 lcms2 +WANTLIB += lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 +WANTLIB += png pthread raw rsvg-2 tiff webp xcb xcb-render xcb-shm +WANTLIB += xml2 z -COMPILER = base-clang ports-gcc base-gcc +COMPILER= base-clang ports-gcc base-gcc MASTER_SITES= http://download.gimp.org/pub/gegl/${API_VERSION}/ diff --git a/graphics/gegl04/Makefile b/graphics/gegl04/Makefile index 196b6de8583..756195be119 100644 --- a/graphics/gegl04/Makefile +++ b/graphics/gegl04/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2019/07/12 20:46:59 sthen Exp $ +# $OpenBSD: Makefile,v 1.13 2019/11/18 19:57:44 ajacoutot Exp $ COMMENT= graph based image processing framework (API version 0.4) @@ -6,6 +6,7 @@ V= 0.4.16 DISTNAME= gegl-${V} PKGNAME= gegl04-${V} EXTRACT_SUFX= .tar.bz2 +REVISION= 0 SHARED_LIBS += gegl-0.4 0.2 # 416.0 @@ -22,7 +23,7 @@ MAINTAINER= Antoine Jacoutot PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} X11 Xext Xrender babl-0.1 cairo -WANTLIB += croco-0.6 expat ffi fontconfig freetype fribidi gdk_pixbuf-2.0 +WANTLIB += cairo-gobject expat ffi fontconfig freetype fribidi gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 WANTLIB += gthread-2.0 harfbuzz iconv intl jasper jpeg json-glib-1.0 WANTLIB += lcms2 lzma m openjp2 pango-1.0 pangocairo-1.0 pangoft2-1.0 diff --git a/graphics/gimp/stable/Makefile b/graphics/gimp/stable/Makefile index 754185a74fa..4d6ad2e21b1 100644 --- a/graphics/gimp/stable/Makefile +++ b/graphics/gimp/stable/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.124 2019/07/12 20:46:59 sthen Exp $ +# $OpenBSD: Makefile,v 1.125 2019/11/18 19:57:44 ajacoutot Exp $ COMMENT= GNU Image Manipulation Program DISTNAME= gimp-2.8.22 -REVISION= 5 +REVISION= 6 SHARED_LIBS+= gimp-2.0 272.0 # 800.0 SHARED_LIBS+= gimpbase-2.0 272.0 # 800.0 @@ -51,8 +51,8 @@ PERMIT_PACKAGE= Yes WANTLIB = ${COMPILER_LIBCXX} WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama WANTLIB += Xmu Xpm Xrandr Xrender Xt aa atk-1.0 avahi-client -WANTLIB += avahi-common babl-0.1 bz2 c cairo croco-0.6 crypto cups -WANTLIB += cupsimage curl dbus-1 dbus-glib-1 execinfo exif expat ffi +WANTLIB += avahi-common babl-0.1 bz2 c cairo cairo-gobject crypto cups +WANTLIB += curl dbus-1 dbus-glib-1 execinfo exif expat ffi WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gegl-0.2 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0 graphite2 WANTLIB += gs gthread-2.0 gtk-x11-2.0 harfbuzz hogweed iconv idn2 ijs diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index 39bb6b9ff77..809b92fc207 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.122 2019/09/25 00:33:55 danj Exp $ +# $OpenBSD: Makefile,v 1.123 2019/11/18 19:57:44 ajacoutot Exp $ COMMENT-main= mail and news client COMMENT-bogofilter= bogofilter plugin @@ -14,6 +14,9 @@ PKGNAME-spamassassin= claws-mail-spamassassin-${V} PKGNAME-pdfviewer= claws-mail-pdfviewer-${V} PKGNAME-gdata= claws-mail-gdata-${V} +REVISION-main= 0 +REVISION-gdata= 0 + CATEGORIES= mail news HOMEPAGE= https://www.claws-mail.org/ @@ -49,7 +52,7 @@ WANTLIB += sasl2 ssl xcb xcb-render xcb-shm z WANTLIB-main = ${WANTLIB} WANTLIB-main += ICE SM X11-xcb archive assuan b2 bz2 c canberra canberra-gtk -WANTLIB-main += charset croco-0.6 db dbus-1 dbus-glib-1 enchant gmp gnutls gpg-error +WANTLIB-main += charset cairo-gobject db dbus-1 dbus-glib-1 enchant gmp gnutls gpg-error WANTLIB-main += gpgme hogweed ical icalss icalvcal icudata icui18n icuuc idn2 WANTLIB-main += ltdl lz4 lzma nettle notify ogg p11-kit perl rsvg-2 WANTLIB-main += startup-notification-1 ${COMPILER_LIBCXX} tasn1 unistring vorbis @@ -58,7 +61,7 @@ WANTLIB-main += vorbisfile xcb-util xml2 zstd WANTLIB-gdata = ${WANTLIB} WANTLIB-gdata += gck-1 gcr-base-3 gcrypt gdata goa-1.0 gpg-error idn2 json-glib-1.0 WANTLIB-gdata += lzma nspr4 nss3 oauth p11-kit plc4 plds4 smime3 nssutil3 -WANTLIB-gdata += psl soup-2.4 sqlite3 ssl3 unistring xml2 +WANTLIB-gdata += psl soup-2.4 sqlite3 ssl3 unistring xml2 brotlicommon brotlidec WANTLIB-pdfviewer = ${WANTLIB} WANTLIB-pdfviewer += jpeg lcms2 openjp2 png poppler poppler-glib tiff diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 03b02a604c9..3da49e91be5 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.142 2019/11/07 12:16:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.143 2019/11/18 19:57:44 ajacoutot Exp $ GOFFICE_API_VERSION= 0.10 GOFFICE_VERSION= 0.10.46 @@ -7,6 +7,7 @@ COMMENT= spreadsheet application for GNOME GNOME_PROJECT= gnumeric GNOME_VERSION= 1.12.46 +REVISION= 0 GNUMERIC_API_VERSION= ${GNOME_VERSION:R} SUBST_VARS= GNOME_VERSION GOFFICE_GNOME_VERSION GOFFICE_API_VERSION GNUMERIC_API_VERSION @@ -20,7 +21,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 avahi-common -WANTLIB += bz2 c cairo cairo-gobject croco-0.6 dbus-1 epoxy expat +WANTLIB += bz2 c cairo cairo-gobject dbus-1 epoxy expat WANTLIB += ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gmp gobject-2.0 goffice-0.10 WANTLIB += graphite2 gs gsf-1 gthread-2.0 gtk-3 harfbuzz hogweed diff --git a/math/graphviz/Makefile b/math/graphviz/Makefile index 079b29c7a68..48e59996718 100644 --- a/math/graphviz/Makefile +++ b/math/graphviz/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.75 2019/07/12 20:47:41 sthen Exp $ +# $OpenBSD: Makefile,v 1.76 2019/11/18 19:57:44 ajacoutot Exp $ COMMENT-main= graph drawing software DISTNAME= graphviz-2.36.0 -REVISION= 13 +REVISION= 14 PKGNAME-main= ${DISTNAME} CATEGORIES= math devel graphics @@ -48,7 +48,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ICE SM X11 Xau Xaw Xcomposite Xcursor Xdamage Xdmcp WANTLIB += Xext Xfixes Xft Xi Xinerama Xmu Xpm Xrandr Xrender -WANTLIB += Xss Xt atk-1.0 c cairo croco-0.6 expat ffi fontconfig +WANTLIB += Xss Xt atk-1.0 c cairo cairo-gobject expat ffi fontconfig WANTLIB += freetype gd gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gmp gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 WANTLIB += guile harfbuzz iconv intl jpeg lcms2 ltdl lzma m openjp2 pango-1.0 @@ -65,7 +65,6 @@ LIB_DEPENDS = graphics/jpeg \ devel/libtool,-ltdl \ graphics/gd>=2.0.34 \ x11/gtk+2 \ - www/libcroco \ x11/gnome/librsvg \ graphics/graphite2 \ devel/harfbuzz \ diff --git a/multimedia/gstreamer-0.10/plugins-bad/Makefile b/multimedia/gstreamer-0.10/plugins-bad/Makefile index 3de70d067fd..8d94e59d205 100644 --- a/multimedia/gstreamer-0.10/plugins-bad/Makefile +++ b/multimedia/gstreamer-0.10/plugins-bad/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.103 2018/11/07 11:07:34 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.104 2019/11/18 19:57:44 ajacoutot Exp $ COMMENT-main= bad elements for GStreamer COMMENT-neon= neon element for GStreamer (plugins-bad) @@ -12,7 +12,7 @@ PKGNAME-main= gstreamer-plugins-bad-${V} PKGNAME-neon= gstreamer-neon-${V} PKGNAME-mjpeg= gstreamer-mjpeg-${V} -REVISION-main= 31 +REVISION-main= 32 REVISION-mjpeg= 14 REVISION-neon= 15 @@ -33,7 +33,7 @@ WANTLIB += lzma pthread z m pcre gstreamer-0.10 ffi WANTLIB-main += ${WANTLIB} WANTLIB-main += SDL SoundTouch X11 Xext Xrender -WANTLIB-main += ass bz2 cairo cdaudio croco-0.6 crypto +WANTLIB-main += ass bz2 cairo cdaudio cairo-gobject crypto WANTLIB-main += curl dca dvdnav dvdread expat fontconfig freetype WANTLIB-main += fribidi gdk_pixbuf-2.0 gio-2.0 gsm gstapp-0.10 gstaudio-0.10 WANTLIB-main += gstbase-0.10 gstcontroller-0.10 gstfft-0.10 gstinterfaces-0.10 diff --git a/productivity/glabels/Makefile b/productivity/glabels/Makefile index 5c851c779fd..245f46e2018 100644 --- a/productivity/glabels/Makefile +++ b/productivity/glabels/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.68 2019/11/02 10:00:11 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.69 2019/11/18 19:57:45 ajacoutot Exp $ COMMENT = labels and business card designer GNOME_PROJECT = glabels GNOME_VERSION = 3.4.1 -REVISION = 7 +REVISION = 8 CATEGORIES = productivity graphics @@ -20,7 +20,7 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 WANTLIB += brotlicommon brotlidec c cairo cairo-gobject camel-1.2 -WANTLIB += croco-0.6 crypto curl db ebackend-1.2 ebook-1.2 ebook-contacts-1.2 +WANTLIB += crypto curl db ebackend-1.2 ebook-1.2 ebook-contacts-1.2 WANTLIB += edata-book-1.2 edataserver-1.2 epoxy expat ffi fontconfig WANTLIB += freetype fribidi gck-1 gcr-base-3 gcrypt gdata gdk-3 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 goa-1.0 diff --git a/x11/compiz/core/Makefile b/x11/compiz/core/Makefile index b9d7869eb79..e43328edf6a 100644 --- a/x11/compiz/core/Makefile +++ b/x11/compiz/core/Makefile @@ -1,25 +1,26 @@ -# $OpenBSD: Makefile,v 1.37 2019/07/12 20:51:09 sthen Exp $ +# $OpenBSD: Makefile,v 1.38 2019/11/18 19:57:45 ajacoutot Exp $ COMMENT = OpenGL window and compositing manager V = 0.8.8 DISTNAME = compiz-${V} -REVISION = 7 +REVISION = 8 SHARED_LIBS = decoration 1.0 # MIT, GPL and LGPL PERMIT_PACKAGE = Yes -WANTLIB += GL GLU ICE SM X11 X11-xcb XRes Xau Xcomposite Xcursor Xdamage -WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 -WANTLIB += c cairo croco-0.6 dbus-1 dbus-glib-1 drm expat ffi fontconfig -WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glapi glib-2.0 -WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 -WANTLIB += harfbuzz iconv intl lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pcre pixman-1 png pthread rsvg-2 -WANTLIB += startup-notification-1 ${COMPILER_LIBCXX} wnck-1 xcb xcb-dri2 xcb-glx -WANTLIB += xcb-render xcb-shm xcb-util xml2 xslt z +WANTLIB += GL GLU ICE SM X11 X11-xcb XRes Xcomposite Xcursor Xdamage +WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 +WANTLIB += c cairo cairo-gobject dbus-1 dbus-glib-1 drm expat +WANTLIB += ffi fontconfig freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0 +WANTLIB += gio-2.0 glapi glib-2.0 gmodule-2.0 gobject-2.0 graphite2 +WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl lzma m +WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 +WANTLIB += png pthread rsvg-2 startup-notification-1 wnck-1 xcb +WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-render xcb-shm +WANTLIB += xcb-sync xcb-util xcb-xfixes xml2 xshmfence xslt z COMPILER = base-clang ports-gcc base-gcc diff --git a/x11/gnome/aisleriot/Makefile b/x11/gnome/aisleriot/Makefile index f8fed0bbe82..4bbb914fb50 100644 --- a/x11/gnome/aisleriot/Makefile +++ b/x11/gnome/aisleriot/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.38 2019/09/15 13:04:56 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.39 2019/11/18 19:57:45 ajacoutot Exp $ COMMENT = suite of solitaire card games GNOME_PROJECT = aisleriot GNOME_VERSION = 3.22.9 +REVISION = 0 CATEGORIES = games @@ -12,7 +13,7 @@ PERMIT_PACKAGE = Yes WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr WANTLIB += Xrender atk-1.0 atk-bridge-2.0 c cairo cairo-gobject canberra -WANTLIB += canberra-gtk3 croco-0.6 dbus-1 dbus-glib-1 epoxy expat ffi +WANTLIB += canberra-gtk3 dbus-1 dbus-glib-1 epoxy expat ffi WANTLIB += fontconfig freetype fribidi gc gdk-3 gdk_pixbuf-2.0 gio-2.0 WANTLIB += glib-2.0 gmodule-2.0 gmp gobject-2.0 graphite2 gthread-2.0 WANTLIB += gtk-3 guile-2.2 harfbuzz iconv intl ltdl lzma m ogg pango-1.0 diff --git a/x11/gnome/eog-plugins/Makefile b/x11/gnome/eog-plugins/Makefile index 024816f84c2..b2cd1aa9fe7 100644 --- a/x11/gnome/eog-plugins/Makefile +++ b/x11/gnome/eog-plugins/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.83 2019/09/15 13:43:00 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.84 2019/11/18 19:57:45 ajacoutot Exp $ # XXX the "postr" plugin needs postr which hasn't been ported yet @@ -6,6 +6,7 @@ COMMENT= plugins for EOG GNOME_PROJECT= eog-plugins GNOME_VERSION= 3.26.4 +REVISION= 0 CATEGORIES= graphics @@ -15,7 +16,7 @@ PERMIT_PACKAGE= Yes WANTLIB += EGL X11 X11-xcb Xcomposite Xcursor Xdamage Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 cairo WANTLIB += cairo-gobject champlain-0.12 champlain-gtk-0.12 clutter-1.0 -WANTLIB += clutter-gtk-1.0 cogl cogl-pango cogl-path croco-0.6 +WANTLIB += clutter-gtk-1.0 cogl cogl-pango cogl-path WANTLIB += crypto curl drm epoxy exempi exif expat ffi fontconfig WANTLIB += freetype fribidi gbm gck-1 gcr-base-3 gcrypt gdata WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 girepository-1.0 glapi @@ -27,7 +28,7 @@ WANTLIB += pangoft2-1.0 pcre peas-1.0 peas-gtk-1.0 pixman-1 plc4 WANTLIB += plds4 png psl pthread rsvg-2 smime3 soup-2.4 sqlite3 WANTLIB += ssl ssl3 unistring xcb xcb-dri2 xcb-dri3 xcb-present WANTLIB += xcb-render xcb-shm xcb-sync xcb-xfixes xml2 xshmfence -WANTLIB += z +WANTLIB += z brotlicommon brotlidec MODULES= devel/dconf \ lang/python \ @@ -35,17 +36,17 @@ MODULES= devel/dconf \ LIB_DEPENDS= devel/libgdata \ devel/libpeas \ - geo/libchamplain>=0.12.2 \ + geo/libchamplain \ graphics/libexif \ x11/gnome/online-accounts BUILD_DEPENDS= devel/gsettings-desktop-schemas \ devel/py-gobject3${MODPY_FLAVOR} \ - x11/gnome/eog>=3.26.0 + x11/gnome/eog RUN_DEPENDS= devel/gsettings-desktop-schemas \ devel/py-gobject3${MODPY_FLAVOR} \ - x11/gnome/eog>=3.26.0 + x11/gnome/eog MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3} diff --git a/x11/mate/control-center/Makefile b/x11/mate/control-center/Makefile index 323a4725faf..55146eb4da0 100644 --- a/x11/mate/control-center/Makefile +++ b/x11/mate/control-center/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2019/07/12 20:51:16 sthen Exp $ +# $OpenBSD: Makefile,v 1.19 2019/11/18 19:57:45 ajacoutot Exp $ COMMENT= MATE control center REVISION= 1 @@ -8,6 +8,7 @@ SHARED_LIBS += mate-window-settings 1.0 # 1.0 MATE_PROJECT= mate-control-center MATE_VERSION= 1.22.1 +REVISION= 0 CATEGORIES= x11 @@ -16,7 +17,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage Xext Xfixes Xi WANTLIB += Xinerama Xrandr Xrender Xss atk-1.0 atk-bridge-2.0 c cairo -WANTLIB += cairo-gobject canberra canberra-gtk3 croco-0.6 dbus-1 +WANTLIB += cairo-gobject canberra canberra-gtk3 dbus-1 WANTLIB += dbus-glib-1 dconf epoxy expat ffi fontconfig freetype fribidi WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 WANTLIB += graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl ltdl lzma m diff --git a/x11/mate/eom/Makefile b/x11/mate/eom/Makefile index cfc86cf3534..9dc9328bcb9 100644 --- a/x11/mate/eom/Makefile +++ b/x11/mate/eom/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2019/10/03 14:36:12 robert Exp $ +# $OpenBSD: Makefile,v 1.19 2019/11/18 19:57:45 ajacoutot Exp $ USE_WXNEEDED= Yes @@ -9,6 +9,8 @@ CATEGORIES= graphics MATE_PROJECT= eom MATE_VERSION= 1.22.2 +REVISION= 0 + # GPLv2 PERMIT_PACKAGE= Yes @@ -19,11 +21,10 @@ WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 iconv intl jpeg WANTLIB += lzma m pcre pixman-1 png pthread xcb WANTLIB += xcb-render xcb-shm xcb-util xml2 z WANTLIB += atk-1.0 atk-bridge-2.0 cairo-gobject cairo -WANTLIB += croco-0.6 exempi exif gdk-3 +WANTLIB += exempi exif gdk-3 fribidi WANTLIB += girepository-1.0 graphite2 gtk-3 harfbuzz lcms2 WANTLIB += mate-desktop-2 pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += peas-1.0 peas-gtk-1.0 rsvg-2 startup-notification-1 -WANTLIB += fribidi MODULES= devel/dconf \ x11/gnome diff --git a/x11/mate/panel/Makefile b/x11/mate/panel/Makefile index aae4a268aa4..bfced53d483 100644 --- a/x11/mate/panel/Makefile +++ b/x11/mate/panel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2019/10/03 14:36:48 robert Exp $ +# $OpenBSD: Makefile,v 1.21 2019/11/18 19:57:45 ajacoutot Exp $ COMMENT= panel component for MATE @@ -6,6 +6,7 @@ SHARED_LIBS += mate-panel-applet-4 1.1 # 1.1 MATE_PROJECT= mate-panel MATE_VERSION= 1.22.2 +REVISION= 0 CATEGORIES= x11 @@ -14,7 +15,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ICE SM X11 X11-xcb XRes Xau Xcomposite Xcursor Xdamage Xext WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 c -WANTLIB += cairo cairo-gobject croco-0.6 dconf epoxy expat ffi +WANTLIB += cairo cairo-gobject dconf epoxy expat ffi WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3 WANTLIB += harfbuzz iconv idn2 intl lzma m mate-desktop-2 mate-menu diff --git a/x11/mate/system-monitor/Makefile b/x11/mate/system-monitor/Makefile index 065b70f16b2..6225a899da6 100644 --- a/x11/mate/system-monitor/Makefile +++ b/x11/mate/system-monitor/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.11 2019/10/03 14:37:24 robert Exp $ +# $OpenBSD: Makefile,v 1.12 2019/11/18 19:57:45 ajacoutot Exp $ COMMENT= MATE system monitor MATE_PROJECT= mate-system-monitor MATE_VERSION= 1.22.2 +REVISION= 0 CATEGORIES= sysutils @@ -13,7 +14,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} X11 XRes Xau Xcomposite Xcursor WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 WANTLIB += atk-bridge-2.0 atkmm-1.6 c cairo cairo-gobject cairomm-1.0 -WANTLIB += croco-0.6 epoxy expat ffi fontconfig freetype fribidi +WANTLIB += epoxy expat ffi fontconfig freetype fribidi WANTLIB += gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0 WANTLIB += glibmm-2.4 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 WANTLIB += gtk-3 gtkmm-3.0 gtop-2.0 harfbuzz iconv intl kvm lzma diff --git a/x11/openbox/Makefile b/x11/openbox/Makefile index 0540d95a6d3..3efbb802ebf 100644 --- a/x11/openbox/Makefile +++ b/x11/openbox/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.83 2019/07/12 20:51:18 sthen Exp $ +# $OpenBSD: Makefile,v 1.84 2019/11/18 19:57:45 ajacoutot Exp $ COMMENT = small, fast & usable window manager V = 3.6.1 -REVISION = 6 +REVISION = 7 DISTNAME = openbox-${V} SHARED_LIBS += obrender 12.0 # 32.0 SHARED_LIBS += obt 1.1 # 2.2 @@ -18,7 +18,7 @@ MAINTAINER = Benoit Lecocq PERMIT_PACKAGE = Yes WANTLIB += ICE Imlib2 SM X11 X11-xcb Xau Xcursor Xext Xfixes Xft -WANTLIB += Xinerama Xrandr Xrender c cairo croco-0.6 expat ffi +WANTLIB += Xinerama Xrandr Xrender c cairo cairo-gobject expat ffi WANTLIB += fontconfig freetype fribidi gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz iconv WANTLIB += intl lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile index 230d876a660..9fc42bc4c22 100644 --- a/x11/vlc/Makefile +++ b/x11/vlc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.230 2019/11/11 19:10:45 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.231 2019/11/18 19:57:45 ajacoutot Exp $ COMMENT-main= VideoLAN client; multimedia player COMMENT-jack= JACK audio output module for VLC @@ -10,7 +10,8 @@ PKGNAME-jack= vlc-jack-${V} CATEGORIES= x11 MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${V}/ EXTRACT_SUFX= .tar.xz -REVISION= 9 +REVISION-main= 10 +REVISION-jack= 10 SHARED_LIBS= vlc 3.0 \ vlccore 3.0 @@ -22,21 +23,22 @@ MAINTAINER= Brad Smith # LGPLv2.1+ and GPLv2+ PERMIT_PACKAGE= Yes -WANTLIB-common= c dbus-1 iconv idn intl m pthread +WANTLIB-common= dbus-1 iconv idn intl m pthread WANTLIB-main= EGL GL ICE lib/qt4/QtGui QtCore SM SDL SDL_image X11 \ Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xpm \ Xrender Xrandr ass atk-1.0 avcodec avformat avutil bluray \ - cairo cddb croco-0.6 dvbpsi dvdnav dvdread ebml expat \ + c cairo cddb dvbpsi dvdnav dvdread ebml expat \ ffi fontconfig freetype fribidi gcrypt gdk-x11-2.0 \ gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls \ gobject-2.0 gpg-error graphite2 gthread-2.0 gtk-x11-2.0 \ harfbuzz hogweed idn2 jpeg lzma matroska nettle notify opus \ - ogg p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \ + ogg p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 \ pixman-1 png postproc rsvg-2 samplerate sndio \ speex speexdsp swscale tag tar tasn1 tiff unistring usbhid \ vorbis vorbisenc webp x264 x265 xcb-composite xcb-keysyms \ xcb-randr xcb-render xcb-shm xcb-xfixes xcb-xv xcb xml2 z \ X11-xcb Xxf86vm drm gbm glapi xcb-dri2 xcb-glx \ + cairo-gobject xcb-dri3 xcb-present xcb-sync xshmfence \ ${WANTLIB-common} # v4l2 is dlopen'd WANTLIB-main += v4l2 diff --git a/x11/xfce4/xfce4-xkb/Makefile b/x11/xfce4/xfce4-xkb/Makefile index 32433ebd13e..cad4df38548 100644 --- a/x11/xfce4/xfce4-xkb/Makefile +++ b/x11/xfce4/xfce4-xkb/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.44 2019/08/15 07:10:28 landry Exp $ +# $OpenBSD: Makefile,v 1.45 2019/11/18 19:57:46 ajacoutot Exp $ COMMENT= Xfce4 xkb layout switcher panel plugin XFCE_VERSION= 0.8.1 XFCE_PLUGIN= xkb -REVISION= 4 +REVISION= 5 # BSD PERMIT_PACKAGE= Yes @@ -16,7 +16,7 @@ LIB_DEPENDS = x11/gnome/librsvg \ WANTLIB += ICE SM X11 X11-xcb XRes Xcomposite Xcursor Xdamage Xext WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 -WANTLIB += cairo cairo-gobject croco-0.6 epoxy expat +WANTLIB += cairo cairo-gobject epoxy expat WANTLIB += ffi fontconfig freetype fribidi garcon-1 gdk-3 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 WANTLIB += gthread-2.0 gtk-3 harfbuzz iconv intl lzma m pango-1.0