Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Jun 2020 13:10:49 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r540061 - head/x11/mate-panel
Message-ID:  <202006241310.05ODAnxv015325@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Jun 24 13:10:49 2020
New Revision: 540061
URL: https://svnweb.freebsd.org/changeset/ports/540061

Log:
  x11/mate-panel: make X11/Wayland optional

Modified:
  head/x11/mate-panel/Makefile   (contents, props changed)
  head/x11/mate-panel/distinfo   (contents, props changed)
  head/x11/mate-panel/pkg-plist   (contents, props changed)

Modified: head/x11/mate-panel/Makefile
==============================================================================
--- head/x11/mate-panel/Makefile	Wed Jun 24 13:01:26 2020	(r540060)
+++ head/x11/mate-panel/Makefile	Wed Jun 24 13:10:49 2020	(r540061)
@@ -7,6 +7,9 @@ CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
 
+PATCH_SITES=	https://github.com/mate-desktop/${PORTNAME}/commit/
+PATCHFILES+=	f4c44ad563ff.patch:-p1 # https://github.com/mate-desktop/mate-panel/pull/1104
+
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Panel component for the MATE Desktop
 
@@ -19,17 +22,16 @@ LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
-		libstartup-notification-1.so:x11/startup-notification \
-		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
+		libstartup-notification-1.so:x11/startup-notification
 
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gmake gnome libtool localbase mate pathfix pkgconfig \
 		tar:xz xorg
 USE_MATE=	desktop libmateweather menus
-USE_XORG=	ice sm x11 xau xrandr
+USE_XORG=	ice sm
 USE_GNOME=	cairo dconf gnomeprefix gtk30 intltool \
-		introspection:build librsvg2 libwnck3
+		introspection:build librsvg2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -37,9 +39,6 @@ INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.mate.panel.applet.clock.gschema.xml \
 		org.mate.panel.applet.fish.gschema.xml \
-		org.mate.panel.applet.notification-area.gschema.xml \
-		org.mate.panel.applet.window-list.gschema.xml \
-		org.mate.panel.applet.workspace-switcher.gschema.xml \
 		org.mate.panel.enums.xml \
 		org.mate.panel.gschema.xml \
 		org.mate.panel.menubar.gschema.xml \
@@ -47,5 +46,20 @@ GLIB_SCHEMAS=	org.mate.panel.applet.clock.gschema.xml 
 		org.mate.panel.toplevel.gschema.xml
 
 OPTIONS_DEFINE=	DOCS
+OPTIONS_MULTI=	GUI
+OPTIONS_MULTI_GUI=	WAYLAND X11
+OPTIONS_DEFAULT=	WAYLAND X11
+OPTIONS_SUB=	yes
+
+WAYLAND_LIB_DEPENDS=		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
+WAYLAND_CONFIGURE_ENABLE=	wayland
+
+X11_USE= 			GNOME=libwnck3 XORG=x11,xau,xrandr
+X11_CONFIGURE_ENABLE=		x11
+X11_VARS=			GLIB_SCHEMAS+=org.mate.panel.applet.notification-area.gschema.xml \
+				GLIB_SCHEMAS+=org.mate.panel.applet.window-list.gschema.xml \
+				GLIB_SCHEMAS+=org.mate.panel.applet.workspace-switcher.gschema.xml
+X11_CONFIGURE_ENV_OFF=		WNCKLET_CFLAGS=" " WNCKLET_LIBS=" " \
+				XRANDR_CFLAGS=" " XRANDR_LIBS=" "
 
 .include <bsd.port.mk>

Modified: head/x11/mate-panel/distinfo
==============================================================================
--- head/x11/mate-panel/distinfo	Wed Jun 24 13:01:26 2020	(r540060)
+++ head/x11/mate-panel/distinfo	Wed Jun 24 13:10:49 2020	(r540061)
@@ -1,3 +1,5 @@
 TIMESTAMP = 1591974472
 SHA256 (mate/mate-panel-1.24.0.tar.xz) = 369e088806b72c4035c4342de0f16301d9b5d8b8ba5ad16350bba2892f0830c3
 SIZE (mate/mate-panel-1.24.0.tar.xz) = 3040068
+SHA256 (mate/f4c44ad563ff.patch) = b1a985e32adb1605414962381a11aab1255d3dbfec14f7c1edaf5846f91d2d0d
+SIZE (mate/f4c44ad563ff.patch) = 768

Modified: head/x11/mate-panel/pkg-plist
==============================================================================
--- head/x11/mate-panel/pkg-plist	Wed Jun 24 13:01:26 2020	(r540060)
+++ head/x11/mate-panel/pkg-plist	Wed Jun 24 13:10:49 2020	(r540061)
@@ -12,16 +12,16 @@ lib/libmate-panel-applet-4.so.1.0.1
 libdata/pkgconfig/libmatepanelapplet-4.0.pc
 libexec/clock-applet
 libexec/fish-applet
-libexec/notification-area-applet
-libexec/wnck-applet
+%%X11%%libexec/notification-area-applet
+%%X11%%libexec/wnck-applet
 man/man1/mate-desktop-item-edit.1.gz
 man/man1/mate-panel-test-applets.1.gz
 man/man1/mate-panel.1.gz
 share/applications/mate-panel.desktop
 share/dbus-1/services/org.mate.panel.applet.ClockAppletFactory.service
 share/dbus-1/services/org.mate.panel.applet.FishAppletFactory.service
-share/dbus-1/services/org.mate.panel.applet.NotificationAreaAppletFactory.service
-share/dbus-1/services/org.mate.panel.applet.WnckletFactory.service
+%%X11%%share/dbus-1/services/org.mate.panel.applet.NotificationAreaAppletFactory.service
+%%X11%%share/dbus-1/services/org.mate.panel.applet.WnckletFactory.service
 %%PORTDOCS%%%%DOCSDIR%%-applet/applet-popups.html
 %%PORTDOCS%%%%DOCSDIR%%-applet/applet-porting.html
 %%PORTDOCS%%%%DOCSDIR%%-applet/applet-writing.html
@@ -1022,8 +1022,8 @@ share/locale/zh_TW/LC_MESSAGES/mate-panel.mo
 share/locale/zu/LC_MESSAGES/mate-panel.mo
 %%DATADIR%%/applets/org.mate.panel.ClockApplet.mate-panel-applet
 %%DATADIR%%/applets/org.mate.panel.FishApplet.mate-panel-applet
-%%DATADIR%%/applets/org.mate.panel.NotificationAreaApplet.mate-panel-applet
-%%DATADIR%%/applets/org.mate.panel.Wncklet.mate-panel-applet
+%%X11%%%%DATADIR%%/applets/org.mate.panel.NotificationAreaApplet.mate-panel-applet
+%%X11%%%%DATADIR%%/applets/org.mate.panel.Wncklet.mate-panel-applet
 %%DATADIR%%/fish/fishanim.png
 %%DATADIR%%/fish/footguy.png
 %%DATADIR%%/fish/monkey.png



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006241310.05ODAnxv015325>