Page MenuHomeFreeBSD
Files F151939113

D3137.id.diff
No OneTemporary
Actions

D3137.id.diff
View Options

Index: head/Mk/Uses/xfce.mk
===================================================================
--- head/Mk/Uses/xfce.mk
+++ head/Mk/Uses/xfce.mk
@@ -37,12 +37,16 @@
libgui_USE_XFCE_REQ= libutil
libmenu_LIB_DEPENDS= libxfce4ui-1.so:${PORTSDIR}/x11/libxfce4menu
+libmenu_DETECT= ${LOCALBASE}/lib/libxfce4ui-1.so
+libmenu_GTK3_DETECT= ${LOCALBASE}/lib/libxfce4ui-2.so
libmenu_USE_XFCE_REQ= xfconf
libutil_LIB_DEPENDS= libxfce4util.so:${PORTSDIR}/x11/libxfce4util
panel_LIB_DEPENDS= libxfce4panel-1.0.so:${PORTSDIR}/x11-wm/xfce4-panel
panel_RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+panel_DETECT= ${LOCALBASE}/lib/libxfce4panel-1.0.so
+panel_GTK3_DETECT= ${LOCALBASE}/lib/libxfce4panel-2.0.so
panel_USE_XFCE_REQ= garcon libexo xfconf
thunar_LIB_DEPENDS= libthunarx-2.so:${PORTSDIR}/x11-fm/thunar
@@ -72,6 +76,15 @@
USE_XFCE= ${_USE_XFCE:O:u}
.for comp in ${USE_XFCE}
+
+. if ${xfce_ARGS} == gtk3
+. if defined(${comp}_GTK3_DETECT)
+. if exists(${${comp}_DETECT}) && !exists(${${comp}_GTK3_DETECT})
+BROKEN+= GTK3 option needs to be set in ${comp}
+. endif
+. endif
+. endif
+
. if defined(${comp}_BUILD_DEPENDS)
BUILD_DEPENDS+= ${${comp}_BUILD_DEPENDS}
. endif
@@ -85,16 +98,10 @@
. endif
.endfor
-.if ${USE_XFCE:M*gui} == libgui
+. if ${USE_XFCE:M*gui} == libgui
DEPRECATED?= Depends on unmaintained x11-toolkits/libxfce4gui
. endif
-.if ${xfce_ARGS} == gtk3
-. if exists(${LOCALBASE}/lib/libxfce4ui-1.so) && !exists(${LOCALBASE}/lib/libxfce4ui-2.so)
-BROKEN= GTK3 option needs to be set in x11/libxfce4menu
-. endif
-.endif
-
.endif # end of defined(USE_XFCE)
.endif

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 12, 3:44 PM (18 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31356724
Default Alt Text
D3137.id.diff (1 KB)

Event Timeline