git: 308d6f8c550e - main - */*: bump all consumes of deprecated GDK-Pixbuf-Xlib library

From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Thu, 28 Jul 2022 19:55:51 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=308d6f8c550e4590a03e82c00069aa4b08f4ca18

commit 308d6f8c550e4590a03e82c00069aa4b08f4ca18
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-07-28 19:54:24 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2022-07-28 19:55:41 +0000

    */*: bump all consumes of deprecated GDK-Pixbuf-Xlib library
    
    With hat:       desktop
---
 emulators/open-vm-tools/Makefile | 3 ++-
 games/xqf/Makefile               | 4 ++--
 www/w3m/Makefile                 | 3 ++-
 x11-wm/sawfish/Makefile          | 3 ++-
 x11/fbpanel/Makefile             | 4 ++--
 x11/lxpanel/Makefile             | 4 ++--
 x11/sbxkb/Makefile               | 4 ++--
 x11/wmdrawer/Makefile            | 4 ++--
 x11/xscreensaver/Makefile        | 4 ++--
 9 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 3d626f0a84af..3838c637558e 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	open-vm-tools
 PORTVERSION=	12.0.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	stable-
 PORTEPOCH=	2
 CATEGORIES=	emulators
@@ -63,7 +64,7 @@ OPENSSL_CONFIGURE_WITH=	ssl
 X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 X11_USES=		xorg
-X11_USE=		GNOME=gdkpixbuf2,gtk30,gtkmm30 \
+X11_USE=		GNOME=gdkpixbuf2,gdkpixbuf2xlib,gtk30,gtkmm30 \
 			XORG=ice,sm,x11,xext,xi,xinerama,xorgproto,xrandr,xrender,xtst
 X11_CONFIGURE_WITH=	gtk3 gtkmm3 x
 
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index c52745e23225..a1c97c5f8e01 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xqf
 PORTVERSION=	1.0.6.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	games
 
@@ -9,7 +10,7 @@ COMMENT=	Server browser for many popular 3D action games
 RUN_DEPENDS=	qstat:games/qstat
 
 USES=		autoreconf gettext gmake gnome pkgconfig xorg
-USE_GNOME=	intlhack
+USE_GNOME=	intlhack gdkpixbuf2 gdkpixbuf2xlib
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
@@ -26,7 +27,6 @@ OPTIONS_DEFINE=	GTK2 BZIP2 DOCS
 OPTIONS_DEFAULT=GTK2 BZIP2
 
 GTK2_USE=		GNOME=gtk20
-GTK2_USE_OFF=		GNOME=gdkpixbuf
 GTK2_CONFIGURE_ENABLE=	gtk2
 
 BZIP2_CONFIGURE_ENABLE=	bzip2
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index a3ae373a9cf2..236e3bc45b9e 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	w3m
 PORTVERSION=	0.5.3.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	www
 
 MAINTAINER?=	nobutaka@FreeBSD.org
@@ -49,7 +50,7 @@ KEY_LYNX_DESC=		Keymap like lynx browser
 OPTIONS_SUB=	yes
 
 INLINE_IMAGE_USES=	gnome xorg
-INLINE_IMAGE_USE=	xorg=x11 gnome=gtk20,gdkpixbuf2
+INLINE_IMAGE_USE=	xorg=x11 gnome=gtk20,gdkpixbuf2,gdkpixbuf2xlib
 INLINE_IMAGE_CONFIGURE_ON=	--with-imagelib=gtk2 --enable-image=fb,x11
 INLINE_IMAGE_CONFIGURE_OFF=	--enable-image=fb
 
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 16ea389b754c..fd83c2117150 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	sawfish
 DISTVERSION=	1.13.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://download.tuxfamily.org/sawfish/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -22,7 +23,7 @@ RUN_DEPENDS=	rep-gtk2>=0.90:x11-toolkits/rep-gtk2
 USES=		autoreconf gmake gnome libtool localbase makeinfo pathfix \
 		pkgconfig tar:xz xorg
 USE_XORG=	ice sm x11 xft xinerama xrandr xtst xrender xext
-USE_GNOME=	cairo gdkpixbuf2 gtk20
+USE_GNOME=	cairo gdkpixbuf2 gdkpixbuf2xlib gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share
diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile
index 2a90b2c96a54..9c49e07a1425 100644
--- a/x11/fbpanel/Makefile
+++ b/x11/fbpanel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fbpanel
 PORTVERSION=	6.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	SF
 
@@ -11,7 +11,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		alias gmake gnome pkgconfig tar:tbz2 xorg
-USE_GNOME=	gtk20
+USE_GNOME=	gdkpixbuf2 gdkpixbuf2xlib gtk20
 USE_XORG=	x11
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index ed687238a5f1..9aac2c1667b5 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	lxpanel
 PORTVERSION=	0.9.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	SF/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PORTVERSION:R}.x/
 
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libmenu-cache.so:x11/menu-cache \
 RUN_DEPENDS=	${LOCALBASE}/etc/xdg/menus/lxde-applications.menu:x11/lxmenu-data
 
 USES=		gmake gnome libtool localbase pathfix pkgconfig tar:xz xorg
-USE_GNOME=	glib20 gtk20 cairo gdkpixbuf2 libwnck intltool
+USE_GNOME=	glib20 gtk20 cairo gdkpixbuf2 gdkpixbuf2xlib libwnck intltool
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
diff --git a/x11/sbxkb/Makefile b/x11/sbxkb/Makefile
index 97bee5710a7b..ee9b54be5b28 100644
--- a/x11/sbxkb/Makefile
+++ b/x11/sbxkb/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sbxkb
 PORTVERSION=	0.7.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	SF/staybox
 
@@ -12,7 +12,7 @@ LICENSE=	GPLv3
 GNU_CONFIGURE=	yes
 LIBS+=		-L${LOCALBASE}/lib -lX11
 USES=		gnome pkgconfig xorg
-USE_GNOME=	gtk20
+USE_GNOME=	gdkpixbuf2 gdkpixbuf2xlib gtk20
 USE_XORG=	x11
 
 post-patch:
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index 246fd6f61847..eab36ed86b86 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	wmdrawer
 PORTVERSION=	0.10.5
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://people.easter-eggs.org/~valos/wmdrawer/ \
 		http://www.sourcefiles.org/Utilities/Desktops/
@@ -11,7 +11,7 @@ COMMENT=	Dockapp which provides a drawer to launch applications
 LICENSE=	GPLv2+
 
 USES=		gmake gnome pkgconfig xorg
-USE_GNOME=	gdkpixbuf2
+USE_GNOME=	gdkpixbuf2 gdkpixbuf2xlib
 USE_XORG=	x11 xext xi
 MAKE_ENV=	USE_GDKPIXBUF2=1
 
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 17570e56696e..2191da6ab6fb 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xscreensaver
 PORTVERSION=	6.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 USES=		autoreconf cpe gettext gl gmake gnome jpeg localbase:ldflags perl5 \
 		pkgconfig xorg
 USE_GL=		gl glu
-USE_GNOME=	cairo gdkpixbuf2 gtk20 intltool libglade2 libxml2
+USE_GNOME=	cairo gdkpixbuf2 gdkpixbuf2xlib gtk20 intltool libglade2 libxml2
 USE_PERL5=	run
 USE_XORG=	ice sm x11 xext xft xi xinerama xmu xrandr xrender xt xxf86vm
 CPE_VENDOR=	xscreensaver_project